Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66995 )
Change subject: manibuilder/alpine: Add newer image tags ......................................................................
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 nico.h@gmx.de Reviewed-on: https://review.coreboot.org/c/flashrom/+/66995 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Felix Singer felixsinger@posteo.net --- M util/manibuilder/Dockerfile.alpine M util/manibuilder/Makefile.targets 2 files changed, 22 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/util/manibuilder/Dockerfile.alpine b/util/manibuilder/Dockerfile.alpine index 35d787a..91b8806 100644 --- a/util/manibuilder/Dockerfile.alpine +++ b/util/manibuilder/Dockerfile.alpine @@ -6,6 +6,10 @@ 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 13b0503..d24c3c0 100644 --- a/util/manibuilder/Makefile.targets +++ b/util/manibuilder/Makefile.targets @@ -21,7 +21,7 @@ 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