aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-02-08 01:05:05 +0000
committerJohn Helmert III <ajak@gentoo.org>2024-02-07 19:16:39 -0800
commit4f11bfd241fc1681b7bde2aae3e05dd21a779907 (patch)
tree05873249e10d8b47e1becfad78b2fe8548019bfe /deploy.sh
parentRevert "deploy.sh: add amd64-systemd-mergedusr, amd64-desktop-systemd, amd64-... (diff)
downloaddocker-images-4f11bfd241fc1681b7bde2aae3e05dd21a779907.tar.gz
docker-images-4f11bfd241fc1681b7bde2aae3e05dd21a779907.tar.bz2
docker-images-4f11bfd241fc1681b7bde2aae3e05dd21a779907.zip
Switch systemd images to mergedusr
In bug #917143, we stopped building non-merged-usr stage3s following the 2022-12-01-systemd-usrmerge news item a while prior, as upstream systemd no longer support non-merged-usr. The stages for systemd w/ non-merged-usr are no being built, so the last one we picked up was stage3-amd64-systemd-20231210T170356Z.tar.xz (and so on). Switch all systemd images accordingly to merged-usr. Bug: https://bugs.gentoo.org/915958 Bug: https://bugs.gentoo.org/917143 Closes: https://github.com/gentoo/gentoo-docker-images/issues/136 Signed-off-by: Sam James <sam@gentoo.org> Signed-off-by: John Helmert III <ajak@gentoo.org>
Diffstat (limited to 'deploy.sh')
-rwxr-xr-xdeploy.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/deploy.sh b/deploy.sh
index 71d5d90..89e9bc3 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -23,8 +23,8 @@ declare -A MANIFEST_TAGS=(
[stage3:musl]="amd64-musl;armv7a_hardfp_musl-openrc;arm64-musl;i686-musl"
[stage3:musl-hardened]="amd64-musl-hardened;arm64-musl-hardened;ppc64le-musl-hardened-openrc"
[stage3:nomultilib]="amd64-nomultilib-openrc"
- [stage3:nomultilib-systemd]="amd64-nomultilib-systemd"
- [stage3:systemd]="amd64-systemd;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd;rv64_lp64d-systemd"
+ [stage3:nomultilib-systemd]="amd64-nomultilib-systemd-mergedusr"
+ [stage3:systemd]="amd64-systemd-mergedusr;armv5tel-systemd-mergedusr;armv6j_hardfp-systemd-mergedusr;armv7a_hardfp-systemd-mergedusr;arm64-systemd-mergedusr;i686-systemd-mergedusr;ppc64le-systemd-mergedusr;rv64_lp64d-systemd-mergedusr"
)
# Find latest manifest