From 38a53b9be66ccbf994a8d80a8086519590a21f5f Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 4 Jan 2017 15:10:43 -0800 Subject: [PATCH] sys-apps/baselayout: bump, add /sbin:/bin back into SDK PATH --- .../{baselayout-3.1.5.ebuild => baselayout-3.2.0.ebuild} | 0 .../sys-apps/baselayout/baselayout-9999.ebuild | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.1.5.ebuild => baselayout-3.2.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.1.5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.2.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.1.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.2.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index de2f620eef..e6f7150474 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="1dad7cf091467bb51ce8f5bba11b9baeab1f6c0c" + CROS_WORKON_COMMIT="dc8fe9b318df608ffb08959d0a1b0e8818797935" KEYWORDS="amd64 arm arm64 x86" fi @@ -131,6 +131,11 @@ src_install() { doenvd "env.d/99coreos_ldpath" + # Add /sbin:/bin into the PATH when they aren't links into /usr. + if ! use symlink-usr; then + echo ROOTPATH=/sbin:/bin > "${D}"/etc/env.d/99coreos_bin || die + fi + # handle multilib paths. do it here because we want this behavior # regardless of the C library that you're using. we do explicitly # list paths which the native ldconfig searches, but this isn't