From 0dcdd4b2ddf2bb2b27ee275a34927c3d16c0b45b Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 28 Jan 2015 15:58:26 -0800 Subject: [PATCH] glibc: apply CoreOS tweaks to 2.19 --- .../coreos-overlay/sys-libs/glibc/glibc-2.19-r1.ebuild | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.19-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.19-r1.ebuild index df31e72091..d93ba66ae2 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.19-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.19-r1.ebuild @@ -157,6 +157,9 @@ eblit-src_unpack-pre() { } eblit-src_unpack-post() { + cd "${WORKDIR}" + epatch "${FILESDIR}"/locale-default-en_US.patch + if use hardened ; then cd "${S}" einfo "Patching to get working PIE binaries on PIE (hardened) platforms" @@ -207,3 +210,10 @@ eblit-pkg_preinst-post() { fi fi } + +# CoreOS tweaks: +# - drop host.conf and gai.conf +# - nsswitch.conf and rpc are provided by baselayout +eblit-src_install-post() { + rm -f "${D}"/etc/{gai.conf,host.conf,nsswitch.conf,rpc} || die +}