projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 18fc6a9)
ci: Update versions of packages to remove from rootfses.
authorEric Anholt <eric@anholt.net>
Wed, 13 May 2020 23:58:26 +0000 (16:58 -0700)
committerMarge Bot <eric+marge@anholt.net>
Mon, 18 May 2020 19:39:46 +0000 (19:39 +0000)
testing's versions have updated, and the apt one was pretty big in the
stripped rootfs.

Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5033>

.gitlab-ci.yml patch | blob | history
.gitlab-ci/create-rootfs.sh patch | blob | history

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e1bfea8ed83acec017c66c887ff292ba4ac1505..6e1ff7d2b108bfce71bcfb4a494f4ec86046599d 100644 (file)
--- 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 ac2f94bb38625f51f22fdcf2036332e73cc94d92..6399a88ce3ee42d6e2d8bc4e2f83554af0e4aec1 100644 (file)
--- 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 "\