From da1f605863ff8b2921e01bd80b069cbf8710fe3a Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Fri, 29 Nov 2013 21:11:52 -0800
Subject: [PATCH] fix(profiles): Move default INSTALL_MASK to profiles.

The INSTALL_MASK is altered all over the place, clean it up by moving
all of it to profiles. Add /usr/share/{i18n,locales} to exclude those
installed by glibc since it doesn't have a nls use flag to disable them.
---
 .../coreos/config/make.conf.amd64-host          | 10 ----------
 .../coreos/config/make.conf.common-target       | 17 -----------------
 .../profiles/coreos/base/make.defaults          | 13 +++++++++++++
 .../coreos/targets/generic/make.defaults        | 10 ++++++++++
 4 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host
index 35d393e34b..bc461ccdd2 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host
@@ -37,16 +37,6 @@ PORTAGE_BINHOST="
     http://storage.core-os.net/coreos/sdk/${ARCH}/${COREOS_SDK_VERSION}/toolchain/
 "
 
-# Remove all .la files for non-plugin libraries.
-# Remove Gentoo init files since we use upstart.
-# Remove logrotate.d files since we don't use logrotate.
-INSTALL_MASK="
-  /usr/lib*/*.la
-  /etc/init.d /etc/conf.d
-  /etc/logrotate.d
-"
-PKG_INSTALL_MASK="${INSTALL_MASK}"
-
 # This is used by profiles/base/profile.bashrc to figure out that we
 # are targeting the cros-sdk (in all its various modes).  It should
 # be utilized nowhere else!
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target
index f2c1de0d34..d1f36d9f64 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target
@@ -60,20 +60,3 @@ ac_cv_func_wait3_rusage=yes
 # When building packages for the target, we need to search the target's
 # sysroot for additional m4 files.  The autotools.eclass uses this.
 AT_SYS_M4DIR="\${SYSROOT}/usr/share/aclocal"
-
-# Native language support is handled inside Chrome itself.
-LINGUAS="en"
-
-# Remove all .la files for non-plugin libraries.
-# Remove Gentoo init files since we use upstart.
-# Remove logrotate.d files since we don't use logrotate.
-# Remove sandbox files since we don't use that in the sysroot.
-# Remove bash-completion files as we don't install bash-completion.
-INSTALL_MASK="
-  /usr/lib*/*.la
-  /etc/init.d /etc/conf.d
-  /etc/logrotate.d
-  /etc/sandbox.d
-  /usr/share/bash-completion
-"
-PKG_INSTALL_MASK="${INSTALL_MASK}"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
index 7532a8418d..f320cecba3 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
@@ -47,6 +47,19 @@ CONFIG_PROTECT="
 	/etc/make.conf
 "
 
+# Remove libtool .la files for non-plugin libraries.
+# Remove Gentoo init files since we use systemd.
+# Remove logrotate.d files since we don't use logrotate.
+INSTALL_MASK="
+  /usr/lib*/*.la
+  /etc/init.d /etc/conf.d
+  /etc/logrotate.d
+"
+
+# Keep the default languages small.
+# (not many things respect this though)
+LINGUAS="en"
+
 # Use parallel bzip2 for binary packages
 PORTAGE_BZIP2_COMMAND="lbzip2"
 PORTAGE_BUNZIP2_COMMAND="lbunzip2"
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 2e714394f0..303236e1f0 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
@@ -8,3 +8,13 @@ USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"
 
 # Exclude documentation
 FEATURES="nodoc noinfo noman"
+
+# Remove sandbox files since we don't use that in the sysroot.
+# Remove bash-completion files as we don't install bash-completion.
+# Remove alternate locales, we only need the standard LANG=C
+INSTALL_MASK="${INSTALL_MASK}
+  /etc/sandbox.d
+  /usr/share/bash-completion
+  /usr/share/i18n
+  /usr/share/locale
+"