Merge pull request #391 from marineam/features

misc updates

sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host

@@ -4,9 +4,6 @@
 source "/mnt/host/source/.repo/manifests/version.txt"
 COREOS_VERSION_STRING="${COREOS_BUILD}.${COREOS_BRANCH}.${COREOS_PATCH}"
 
-# Tolerate collisions (for now), disable extra locking, ignore missing digests.
-FEATURES="-collision-protect -ebuild-locks -strict"
-
 # Since our portage comes from version control, we redirect distfiles
 DISTDIR="/var/lib/portage/distfiles"
 

sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target

@@ -16,9 +16,6 @@ PORTAGE_TMPDIR=${ROOT}tmp/
 
 PORT_LOGDIR=${ROOT}tmp/portage/logs/
 
-# Tolerate collisions (for now), disable extra locking, ignore missing digests.
-FEATURES="-collision-protect -ebuild-locks -strict"
-
 PORTAGE_WORKDIR_MODE="0755"
 PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/"
 

sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17.ebuild

@@ -209,23 +209,7 @@ eblit-pkg_preinst-post() {
 
 # CoreOS tweaks:
 # - drop host.conf and gai.conf
-# - move/symlink nsswitch.conf and rpc.
-#   These are moving to baselayout+usrfiles and glibc shouldn't conflict
+# - nsswitch.conf and rpc are provided by baselayout
 eblit-src_install-post() {
-	dodir /usr/share/glibc
-	local move
-	for move in nsswitch.conf rpc ; do
-		[ -f "${D}/etc/${move}" ] || continue
-		mv "${D}/etc/${move}" "${D}"/usr/share/glibc || die
-	done
-	rm -f "${D}"/etc/{gai.conf,host.conf} || die
-}
-
-eblit-pkg_postinst-post() {
-	local sym
-	for sym in nsswitch.conf rpc ; do
-		[ ! -f "${ROOT}/etc/${sym}" ] || continue
-		[ -f "${ROOT}/usr/share/glibc/${sym}" ] || continue
-		ln -sf "../usr/share/glibc/${sym}" "${ROOT}/etc/${sym}" || die
-	done
+	rm -f "${D}"/etc/{gai.conf,host.conf,nsswitch.conf,rpc} || die
 }