From 5dae6bc293c56125d19ac9afad9632fb36ce8d65 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 1 Mar 2023 12:31:33 +0100 Subject: [PATCH] sys-apps/baselayout: Replace ROOTPATH with PATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ROOTPATH is not a thing any more. And with recent portage update, it stopped being handled in some special way. Just use PATH. This should unbreak stage2 of our SDK build, where the failure was: /usr/bin/env: ‘bash’: No such file or directory --- ...elayout-3.6.8-r9.ebuild => baselayout-3.6.8-r10.ebuild} | 0 .../sys-apps/baselayout/baselayout-9999.ebuild | 7 +------ 2 files changed, 1 insertion(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.6.8-r9.ebuild => baselayout-3.6.8-r10.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r9.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r10.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 eba79a2be0..29fce7fe13 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="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="9082621e94ee6a1cdad9e15aa17a747d46c33c6f" # flatcar-master + CROS_WORKON_COMMIT="d4d6da73919bacc5b05a012d3d00dc8e2d669c0d" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi @@ -133,11 +133,6 @@ src_install() { doenvd "env.d/99flatcar_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/99flatcar_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