From 9438d1bd733dcdfa9955885b0a5a6ec25f0aff6f Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 3 Jan 2024 16:25:35 +0100 Subject: [PATCH] coreos profiles: Disable i10n globally --- .../coreos-overlay/profiles/coreos/base/package.use | 5 +---- .../third_party/coreos-overlay/profiles/coreos/base/use.mask | 4 ++++ .../profiles/coreos/targets/generic/make.defaults | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index a2e84ccbec..741eab12f4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -39,7 +39,7 @@ net-firewall/ipset -modules dev-libs/glib -mime # keep grub build simple -sys-boot/grub -multislot -nls -themes -fonts +sys-boot/grub -multislot -themes -fonts # disable "high performance ssh" patch, turn on kerberos net-misc/openssh -hpn kerberos @@ -73,9 +73,6 @@ sys-apps/portage -xattr -rsync-verify # Enable -M and -Z flags; -M is used by mayday sys-process/lsof rpc selinux -# Prevent pulling in a ton of perl dependencies -sys-apps/man-db -nls - # Disable zstd to avoid adding it to prod images until something needs it sys-fs/btrfs-progs -zstd diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask index 51a4c4441a..b66cfa2cae 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask @@ -15,3 +15,7 @@ python_single_target_python3_12 # Unmask selinux so it can be enabled selectively in package.use -selinux + +# We don't care about i10n, takes too much space, pulls in too many +# extra dependencies. +nls diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults index a64ce8d815..2dc7a037d2 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults @@ -4,7 +4,7 @@ USE="cros-debug acpi usb symlink-usr cryptsetup policykit" USE="${USE} -split-usr -cros_host -expat -cairo -X -man" USE="${USE} -acl -gpm -python" -USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls" +USE="${USE} -fortran -abiword -perl -cups -poppler-data" # Exclude documentation FEATURES="nodoc noinfo noman"