From 7eec9c7e5c2219bc7d51655e5ddcf302692f0922 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 26 Apr 2023 17:10:50 +0200 Subject: [PATCH] overlay profiles: Do not install eselect stuff into generic images --- .../profiles/coreos/targets/generic/oem-aci/make.defaults | 1 + .../profiles/coreos/targets/generic/package.provided | 3 +++ .../profiles/coreos/targets/generic/prod/make.defaults | 1 + 3 files changed, 5 insertions(+) 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 index cc26153410..e8cb561b71 100644 --- 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 @@ -11,6 +11,7 @@ INSTALL_MASK="${INSTALL_MASK} /usr/lib*/pkgconfig /usr/share/aclocal* /usr/share/awk + /usr/share/eselect /usr/share/gdb /usr/share/gettext /usr/share/gobject-introspection-1.0 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided index 0d639114c7..20d0765699 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided @@ -15,3 +15,6 @@ app-eselect/eselect-iptables-20200508 # pulled in by app-admin/sudo app-misc/editor-wrapper-4 + +# pulled in by dev-lang/lua +app-eselect/eselect-lua-4 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults index c7961639cb..6a34f638ba 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults @@ -15,6 +15,7 @@ INSTALL_MASK="${INSTALL_MASK} /usr/lib*/rpm /usr/share/aclocal* /usr/share/awk + /usr/share/eselect /usr/share/gdb /usr/share/gettext /usr/share/gobject-introspection-1.0