From a038fcf482a874507e2ebb0ad9d23e25e9a906e8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 28 Feb 2024 11:33:59 +0100 Subject: [PATCH] overlay coreos/config: Drop overrides for packages we do not have --- .../coreos-overlay/coreos/config/env/app-admin/setools | 2 -- .../coreos-overlay/coreos/config/env/app-emulation/xen | 5 ----- .../coreos/config/env/app-emulation/xen-tools | 6 ------ .../coreos-overlay/coreos/config/env/sys-apps/busybox | 5 ----- .../coreos-overlay/coreos/config/env/sys-apps/efunctions | 3 --- 5 files changed, 21 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/setools delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-emulation/xen delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-emulation/xen-tools delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/busybox delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/efunctions diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/setools b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/setools deleted file mode 100644 index 882a117cd1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/setools +++ /dev/null @@ -1,2 +0,0 @@ -export ac_cv_file__build_amd64_usr__usr_lib64_libsepol_a=yes - diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-emulation/xen b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-emulation/xen deleted file mode 100644 index 60101e0239..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-emulation/xen +++ /dev/null @@ -1,5 +0,0 @@ -# Creating symlinks on FAT doesn't work, so don't do that -INSTALL_MASK="${INSTALL_MASK} - /boot/xen-?.?.gz - /boot/xen-?.gz - /boot/xen.gz" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-emulation/xen-tools b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-emulation/xen-tools deleted file mode 100644 index 422b8b0eda..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-emulation/xen-tools +++ /dev/null @@ -1,6 +0,0 @@ -# We provide xenstore as a standalone package -INSTALL_MASK="${INSTALL_MASK} - /usr/bin/xenstore - /usr/lib/debug/usr/bin/xenstore.debug - /usr/lib/debug/usr/lib*/libxenstore.so* - /usr/lib*/libxenstore.so*" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/busybox b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/busybox deleted file mode 100644 index e02063bc6f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/busybox +++ /dev/null @@ -1,5 +0,0 @@ -# savedconfig by default saves the currently generated config into -# /etc/portage/savedconfig. However we want to avoid placing it here -# so that every re-emerge will pick up the configs from -# chromeos-base/busybox-config -INSTALL_MASK+=" /etc/portage/savedconfig" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/efunctions b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/efunctions deleted file mode 100644 index 14e19ac0dc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/efunctions +++ /dev/null @@ -1,3 +0,0 @@ -# Don't filter out /etc/init.d/functions.sh -PKG_INSTALL_MASK="${PKG_INSTALL_MASK/\/etc\/init.d}" -INSTALL_MASK="${INSTALL_MASK/\/etc\/init.d}"