mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-03-04 21:11:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

overlay coreos/config, profiles: Drop PKG_INSTALL_MASK

Browse Source 
PKG_INSTALL_MASK is for binary packages like INSTALL_MASK is for
${ROOT} - whatever is added to PKG_INSTALL_MASK will be absent from
binary packages. But we may want to install different content to
different kind of images using the same binary packages. For example,
we may want to install some python selinux scripts to developer
container, but not to production image.

I started adding PKG_INSTALL_MASK before, because of a
misunderstanding - I thought that PKG_INSTALL_MASK is about filtering
files that are installed to ${ROOT} from binary packages. So in
reality, PKG_INSTALL_MASK is really unnecessary.

Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
This commit is contained in:
Krzesimir Nowak 2025-08-21 16:57:19 +02:00
parent c651c5f39a
commit 298fc4e974
11 changed files with 23 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/sudo vendored
View File

@ -11,7 +11,4 @@ cros_post_src_install_flatcar_modifications() {
# We don't ship OpenLDAP schemas (why?) and we provide sudo.conf
# through baselayout.
sudo_install_mask='/etc/openldap/schema /etc/sudo.conf'
INSTALL_MASK+=" ${sudo_install_mask}"
PKG_INSTALL_MASK+=" ${sudo_install_mask}"
unset sudo_install_mask
INSTALL_MASK+=' /etc/openldap/schema /etc/sudo.conf '

5
sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-containers/syft vendored
View File

@ -1,5 +1,2 @@
# there are only examples installed
syft_install_mask=" /usr/share/syft/examples "
INSTALL_MASK+="${syft_install_mask}"
PKG_INSTALL_MASK+="${syft_install_mask}"
unset syft_install_mask
INSTALL_MASK+=' /usr/share/syft/examples '

5
sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-libs/glib vendored
View File

@ -1,7 +1,4 @@
# Do not install gobject-introspection binaries in production images.
if [[ $(flatcar_target) != 'sdk' ]] ; then
glib_mask="/usr/bin/gi-* /usr/lib*/libgirepository-2.0*"
PKG_INSTALL_MASK+=" ${glib_mask}"
INSTALL_MASK+=" ${glib_mask}"
unset glib_mask
INSTALL_MASK+=" /usr/bin/gi-* /usr/lib*/libgirepository-2.0* "
fi

7
sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-dns/bind vendored
View File

@ -1,5 +1,5 @@
# Keep only tool binaries and libraries those binaries need.
ndb_install_mask="
INSTALL_MASK+="
/etc
/var
/usr/bin/arpaname
@ -13,11 +13,6 @@ ndb_install_mask="
/usr/sbin
"
INSTALL_MASK+="${ndb_install_mask}"
PKG_INSTALL_MASK+="${ndb_install_mask}"
unset ndb_install_mask
# Override fowners to ignore changing owner or group to named. The
# only files that this happens for are files that we have put into
# {PKG_,}INSTALL_MASK. This will help us avoid installing

5
sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-fs/nfs-utils vendored
View File

@ -1,7 +1,4 @@
nfs_utils_install_mask=" /etc/exports /etc/exports.d "
INSTALL_MASK+=${nfs_utils_install_mask}
PKG_INSTALL_MASK+=${nfs_utils_install_mask}
unset nfs_utils_install_mask
INSTALL_MASK+=" /etc/exports /etc/exports.d "
cros_post_src_install_nfs_utils_flatcar_modifications() {
(

27
sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-misc/ntp vendored
View File

@ -1,15 +1,12 @@
ntp_install_mask=''
# Do not install ntpdate or sntp systemd files in /etc.
ntp_install_mask+=" /etc/systemd"
# Do not install the default ntp.conf, we provide our own in
# coreos-base/misc-files.
ntp_install_mask+=" /etc/ntp.conf"
# Do not install perl scripts to /usr/bin.
ntp_install_mask+=" /usr/bin/calc_tickadj /usr/bin/ntp-wait /usr/bin/ntptrace /usr/bin/update-leap"
# Do not install perl package to /usr/share/ntp.
ntp_install_mask+=" /usr/share/ntp"
ntp_install_mask+=' '
INSTALL_MASK+=${ntp_install_mask}
PKG_INSTALL_MASK+=${ntp_install_mask}
unset ntp_install_mask
# Do not install:
#
# - ntpdate or sntp systemd files in /etc,
# - the default ntp.conf, we provide our own in coreos-base/misc-files,
# - perl scripts to /usr/bin,
# - perl package to /usr/share/ntp
INSTALL_MASK+="
/etc/systemd
/etc/ntp.conf
/usr/bin/calc_tickadj /usr/bin/ntp-wait /usr/bin/ntptrace /usr/bin/update-leap
/usr/share/ntp
"

5
sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-misc/openssh vendored
View File

@ -3,10 +3,7 @@
# Do not install the config snippet that defines a subsystem. We have
# our own definition in coreos-init.
if [[ $(flatcar_target) != 'sdk' ]] ; then
openssh_mask=" /usr/lib*/misc/ssh-keysign /etc/ssh/sshd_config.d/*gentoo-subsystem.conf "
PKG_INSTALL_MASK+="${openssh_mask}"
INSTALL_MASK+="${openssh_mask}"
unset openssh_mask
INSTALL_MASK+=" /usr/lib*/misc/ssh-keysign /etc/ssh/sshd_config.d/*gentoo-subsystem.conf "
fi
cros_post_src_install_vendorize_pam() {

5
sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/lsb-release vendored
View File

@ -1,4 +1 @@
lsb_release_install_mask=" /etc/lsb-release "
INSTALL_MASK+="${lsb_release_install_mask}"
PKG_INSTALL_MASK+="${lsb_release_install_mask}"
unset lsb_release_install_mask
INSTALL_MASK+=" /etc/lsb-release "

9
sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-boot/grub vendored
View File

@ -48,9 +48,6 @@ cros_post_src_install_sbat() {
EOF
}
# Flatcar does not use grub-install or grub-mkconfig. All the files under /etc
# relate to grub-mkconfig.
grub_install_mask=" ${EPREFIX}/etc/ *grub-install* *mkconfig* "
INSTALL_MASK+="${grub_install_mask}"
PKG_INSTALL_MASK+="${grub_install_mask}"
unset grub_install_mask
# Flatcar does not use grub-install or grub-mkconfig. All the files
# under /etc relate to grub-mkconfig.
INSTALL_MASK+=" ${EPREFIX}/etc/ *grub-install* *mkconfig* "

5
sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-process/audit vendored
View File

@ -1,7 +1,4 @@
# Do not install Gentoo-provided audit rules, we will install our own
# in coreos-base/misc-files. Also skip installing legacy initscripts
# stuff in /usr/libexec.
audit_install_mask=" /etc/audit/audit.rules* /usr/libexec "
INSTALL_MASK+="${audit_install_mask}"
PKG_INSTALL_MASK+="${audit_install_mask}"
unset audit_install_mask
INSTALL_MASK+=" /etc/audit/audit.rules* /usr/libexec "

4
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults vendored
View File

@ -94,10 +94,6 @@ INSTALL_MASK="
/usr/share/portage/config/repos.conf
"
# Prevent binaries from being installed to rootfs from binary packages
PKG_INSTALL_MASK="
"
# Keep the default languages small.
# (not many things respect this though)
LINGUAS="en"