aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2020-05-13 16:58:26 -0700
committerMarge Bot <[email protected]>2020-05-18 19:39:46 +0000
commit8094a9ab685b67ce5bd54b3f7a2a7b22795f5420 (patch)
tree1ef1f20a14686ccc4e44ad4f69ce00c2a4aa1489
parent18fc6a95b672eaa331425538416f035786a1092d (diff)
ci: Update versions of packages to remove from rootfses.
testing's versions have updated, and the apt one was pretty big in the stripped rootfs. Reviewed-by: Christian Gmeiner <[email protected]> Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5033>
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.gitlab-ci/create-rootfs.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e1bfea8ed8..6e1ff7d2b10 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -177,7 +177,7 @@ arm_build:
- .fdo.container-build@debian@arm64v8
- .container
variables:
- FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal-4"
+ FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal-5"
.use-arm_build:
variables:
diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/create-rootfs.sh
index ac2f94bb386..6399a88ce3e 100644
--- a/.gitlab-ci/create-rootfs.sh
+++ b/.gitlab-ci/create-rootfs.sh
@@ -96,8 +96,8 @@ rm -rf usr/share/misc/usb.ids
# IMPORTANT: The Debian system is not longer functional at this point,
# for example, apt and dpkg will stop working
-UNNEEDED_PACKAGES="apt libapt-pkg5.0 "\
-"ncurses-bin ncurses-base libncursesw5 libncurses5 "\
+UNNEEDED_PACKAGES="apt libapt-pkg6.0 "\
+"ncurses-bin ncurses-base libncursesw6 libncurses6 "\
"perl-base "\
"debconf libdebconfclient0 "\
"e2fsprogs e2fslibs libfdisk1 "\