summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2022-08-23 23:27:35 +0200
committerFelix Singer <felixsinger@posteo.net>2022-09-27 13:49:57 +0000
commitd3b112032eccb5680dc2e61658adbf0d3aeabff2 (patch)
tree07ca2fa237282c3dfa60b0155eb2bb6f7bc4f21e /util
parentf9ea15c487c794e75c85324d96301f9f6a952f4a (diff)
downloadflashrom-d3b112032eccb5680dc2e61658adbf0d3aeabff2.tar.gz
flashrom-d3b112032eccb5680dc2e61658adbf0d3aeabff2.tar.bz2
flashrom-d3b112032eccb5680dc2e61658adbf0d3aeabff2.zip
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>
Diffstat (limited to 'util')
-rw-r--r--util/manibuilder/Dockerfile.alpine4
-rw-r--r--util/manibuilder/Makefile.targets2
2 files changed, 5 insertions, 1 deletions
diff --git a/util/manibuilder/Dockerfile.alpine b/util/manibuilder/Dockerfile.alpine
index 35d787af6..91b880659 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 13b050399..d24c3c02a 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