From 18fc6a95b672eaa331425538416f035786a1092d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 13 May 2020 14:36:36 -0700 Subject: [PATCH] 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 Reviewed-by: Tomeu Vizoso Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/create-rootfs.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb21ecddc06..1e1bfea8ed8 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-3" + FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal-4" .use-arm_build: variables: diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/create-rootfs.sh index aa6449e097e..ac2f94bb386 100644 --- a/.gitlab-ci/create-rootfs.sh +++ b/.gitlab-ci/create-rootfs.sh @@ -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* -- 2.30.2