From d3b112032eccb5680dc2e61658adbf0d3aeabff2 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Tue, 23 Aug 2022 23:27:35 +0200 Subject: manibuilder/alpine: Add newer image tags Most of the images built out of the box. Only `alpine:armhf-v3.11` needs a little workaround for wrong filesystem permissions. Change-Id: Iac5fea993e6345c7507bd381550f3fbfe55341f9 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/flashrom/+/66995 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Felix Singer --- util/manibuilder/Dockerfile.alpine | 4 ++++ util/manibuilder/Makefile.targets | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'util/manibuilder') diff --git a/util/manibuilder/Dockerfile.alpine b/util/manibuilder/Dockerfile.alpine index 35d787af..91b88065 100644 --- a/util/manibuilder/Dockerfile.alpine +++ b/util/manibuilder/Dockerfile.alpine @@ -6,6 +6,10 @@ RUN \ apk add ca-certificates build-base linux-headers git ccache \ pciutils-dev libusb-compat-dev libusb-dev +# fix weird permissions in armhf-v3.11 +RUN [ -d /usr/share/git-core/templates ] && \ + chmod -R a+r /usr/share/git-core/templates + ENV GIT_SSL_NO_VERIFY=1 USER mani RUN \ diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets index 13b05039..d24c3c02 100644 --- a/util/manibuilder/Makefile.targets +++ b/util/manibuilder/Makefile.targets @@ -21,7 +21,7 @@ MULTIARCH_TAGS := \ ubuntu-debootstrap\:$(a)-$(v))) \ ubuntu-debootstrap\:powerpc-xenial \ $(foreach a,aarch64 armhf amd64 i386, \ - $(foreach v,v3.9 v3.8 v3.7 v3.6, \ + $(foreach v,v3.14 v3.13 v3.12 v3.11 v3.10 v3.9 v3.8 v3.7 v3.6, \ alpine\:$(a)-$(v))) \ OTHER_TAGS := djgpp\:6.1.0 -- cgit v1.2.3