Merge pull request #267 from marineam/turtle-chain

Turtle chain

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild

@@ -122,9 +122,6 @@ src_install() {
 		# Insert empty fstab
 		doins "${FILESDIR}"/fstab
 
-		# Insert glibc's nsswitch.conf since that is installed weirdly
-		doins "${FILESDIR}"/nsswitch.conf
-
 		# Insert a mini vimrc to avoid driving everyone insane
 		insinto /etc/vim
 		doins "${FILESDIR}"/vimrc

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/nsswitch.conf

@@ -1,24 +0,0 @@
-# /etc/nsswitch.conf:
-# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nsswitch.conf,v 1.1 2006/09/29 23:52:23 vapier Exp $
-
-passwd:      compat
-shadow:      compat
-group:       compat
-
-# passwd:    db files nis
-# shadow:    db files nis
-# group:     db files nis
-
-hosts:       files dns
-networks:    files dns
-
-services:    db files
-protocols:   db files
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files
-bootparams:  files
-
-automount:   files
-aliases:     files

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!

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}"

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"

sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults

@@ -8,3 +8,31 @@ 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
+"
+
+# Restrictive mask for production images.
+# TODO(marineam): Perhaps later move this to a generic/production profile.
+PROD_INSTALL_MASK="${INSTALL_MASK}
+  *.a *.la *.h *.hpp
+  /usr/lib/debug
+  /usr/lib*/pkgconfig
+  /usr/share/aclocal*
+  /usr/share/awk
+  /usr/share/doc
+  /usr/share/gdb
+  /usr/share/gettext
+  /usr/share/gobject-introspection-1.0
+  /usr/share/gtk-doc
+  /usr/share/pkgconfig
+  /usr/share/readline
+  /usr/src
+"