ci: Make the create-rootfs more resilient.

If the file doesn't exist, fine.  We didn't happen to get that package
dragged in.

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>
This commit is contained in:
Eric Anholt 2020-05-13 14:36:36 -07:00 committed by Marge Bot
parent 588ea3184c
commit 18fc6a95b6
2 changed files with 8 additions and 8 deletions

View File

@ -177,7 +177,7 @@ arm_build:
- .fdo.container-build@debian@arm64v8
- .container
variables:
FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal-3"
FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal-4"
.use-arm_build:
variables:

View File

@ -167,10 +167,10 @@ rm -rf usr/lib/xtables
rm -rf usr/lib/locale/*
# partition helpers
rm usr/sbin/*fdisk
rm -rf usr/sbin/*fdisk
# local compiler
rm usr/bin/localedef
rm -rf usr/bin/localedef
# Systemd dns resolver
find usr etc -name '*systemd-resolve*' -prune -exec rm -r {} \;
@ -191,16 +191,16 @@ find usr etc -name '*fuse*' -prune -exec rm -r {} \;
rm -rf usr/lib/lsb
# Only needed when adding libraries
rm usr/sbin/ldconfig*
rm -rf usr/sbin/ldconfig*
# Games, unused
rmdir usr/games
# Remove pam module to authenticate against a DB
# plus libdb-5.3.so that is only used by this pam module
rm usr/lib/*/security/pam_userdb.so
rm usr/lib/*/libdb-5.3.so
rm -rf usr/lib/*/security/pam_userdb.so
rm -rf usr/lib/*/libdb-5.3.so
# remove NSS support for nis, nisplus and hesiod
rm usr/lib/*/libnss_hesiod*
rm usr/lib/*/libnss_nis*
rm -rf usr/lib/*/libnss_hesiod*
rm -rf usr/lib/*/libnss_nis*