From 6aa303515feb2e205a7c8b9e67a7e35adc3817b8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 2 Dec 2024 14:19:13 +0100 Subject: [PATCH] overlay profiles: Drop oem-aci leftovers Spotted when dealing with updating sys-auth/sssd. --- .../coreos/amd64/generic/oem-aci/parent | 2 - .../coreos/arm64/generic/oem-aci/parent | 2 - .../coreos/targets/generic/oem-aci/README | 7 --- .../targets/generic/oem-aci/make.defaults | 47 ------------------- .../targets/generic/oem-aci/package.provided | 2 - 5 files changed, 60 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/oem-aci/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/README delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/package.provided diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/oem-aci/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/oem-aci/parent deleted file mode 100644 index cfacbaa8c8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/oem-aci/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/generic/oem-aci diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent deleted file mode 100644 index cfacbaa8c8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/oem-aci/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -:coreos/targets/generic/oem-aci diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/README b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/README deleted file mode 100644 index 74dbd3ea6a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/README +++ /dev/null @@ -1,7 +0,0 @@ -Profile settings specific to "oem-aci" images. - -Settings here must *ONLY* influence installing binary packages and never -change build time settings like USE or CFLAGS because binary packages -are shared between dev and prod, dev just includes more stuff. - -For example INSTALL_MASK, package.mask, and package.provided are ok. diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults deleted file mode 100644 index 24138b6f58..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (c) 2016 The CoreOS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# Restrictive mask for OEM ACIs. -INSTALL_MASK="${INSTALL_MASK} - *.a *.la *.hpp *.o - /etc/sandbox.d - /usr/include - /usr/lib*/*/include - /usr/lib/debug - /usr/lib*/pkgconfig - /usr/share/aclocal* - /usr/share/awk - /usr/share/eselect - /usr/share/gdb - /usr/share/gettext - /usr/share/gobject-introspection-1.0 - /usr/share/pkgconfig - /usr/share/readline - /usr/src -" - -# Remove files which depend on interpreters not present in boards. -INSTALL_MASK="${INSTALL_MASK} - /usr/share/git/contrib/* - /usr/bin/diff-highlight - /usr/bin/autoscan-2.13 - /usr/bin/autoupdate-2.69 - /usr/bin/autoreconf-2.69 - /usr/bin/automake-1.14 - /usr/bin/autom4te-2.69 - /usr/bin/autoheader-2.69 - /usr/bin/aclocal-1.14 - /usr/bin/aclocal-1.15 - /usr/bin/automake-1.15 - /usr/bin/ifnames-2.69 - /usr/bin/intltool-update - /usr/bin/intltool-merge - /usr/bin/intltool-prepare - /usr/bin/intltool-extract - /usr/bin/autoscan-2.69 -" - -# There is no need to have boot stuff in a container. -INSTALL_MASK="${INSTALL_MASK} - /boot -" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/package.provided deleted file mode 100644 index 92c93c6fea..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/package.provided +++ /dev/null @@ -1,2 +0,0 @@ -# Do not install SSSD in the container. -sys-auth/sssd-1.13.1