mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-25 07:31:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

overlay profiles: Some cleanups

Browse Source 
Mask split-usr globally, not only for generic images. Move some SDK
only USE flags to SDK target profile (cros_host, expat). Drop
duplicated disabling of cups USE flag.
This commit is contained in:
Krzesimir Nowak 2024-06-28 12:21:33 +02:00
parent c1c162e523
commit c8500797ea
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,8 +8,7 @@ USE_EXPAND="${USE_EXPAND} TESTS"
# For now this is only informational and set by coreos-go.eclass # For now this is only informational and set by coreos-go.eclass
USE_EXPAND="${USE_EXPAND} GO_VERSION" USE_EXPAND="${USE_EXPAND} GO_VERSION"
# Extra use flags for CoreOS SDK USE="${USE} -cracklib -introspection -cups -tcpd -berkdb"
USE="${USE} cros_host expat -cracklib -introspection -cups -tcpd -berkdb"
# Use Python 3 as the default version # Use Python 3 as the default version
USE="${USE} -python_single_target_python2_7 python_single_target_python3_11" USE="${USE} -python_single_target_python2_7 python_single_target_python3_11"

3
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/use.force → sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.force vendored
View File

@ -1,4 +1,7 @@
# We don't have a separate /{bin,lib} and /usr/{bin,lib}. But the base # We don't have a separate /{bin,lib} and /usr/{bin,lib}. But the base
# profile in portage-stable forces split-usr, so here we unforce it # profile in portage-stable forces split-usr, so here we unforce it
# and in use.mask we mask it. # and in use.mask we mask it.
#
# TODO: Drop it when we move to
# default/linux/{amd64,arm64}/23.0/hardened/selinux/systemd profile
-split-usr -split-usr

8
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask vendored
View File

@ -21,3 +21,11 @@ python_single_target_python3_13
# We don't care about i10n, takes too much space, pulls in too many # We don't care about i10n, takes too much space, pulls in too many
# extra dependencies. # extra dependencies.
nls nls
# We don't have a separate /{bin,lib} and /usr/{bin,lib}. But the base
# profile in portage-stable forces split-usr, so in use.force we
# unforce it and here we mask it.
#
# TODO: Drop it when we move to
# default/linux/{amd64,arm64}/23.0/hardened/selinux/systemd profile
split-usr

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

@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
USE="acpi usb cryptsetup policykit" USE="acpi usb cryptsetup policykit"
USE="${USE} -split-usr -cros_host -expat -cairo -X -man" USE="${USE} -cros_host -expat -cairo -X -man"
USE="${USE} -acl -gpm -python" USE="${USE} -acl -gpm -python"
USE="${USE} -fortran -abiword -perl -cups -poppler-data" USE="${USE} -fortran -abiword -perl -poppler-data"
# Exclude documentation # Exclude documentation
FEATURES="nodoc noinfo noman" FEATURES="nodoc noinfo noman"

4
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/use.mask vendored
View File

@ -1,4 +0,0 @@
# We don't have a separate /{bin,lib} and /usr/{bin,lib}. But the base
# profile in portage-stable forces split-usr, so in use.force we
# unforce it and here we mask it.
split-usr

2
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults vendored
View File

@ -1,4 +1,4 @@
USE="man -pam" USE="cros_host expat man -pam"
# Used by some old goo in profiles/coreos/base/profile.bashrc # Used by some old goo in profiles/coreos/base/profile.bashrc
# TODO: clean up that old goo # TODO: clean up that old goo