mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-12 15:36:58 +02:00
sys-apps/baselayout: Replace ROOTPATH with PATH
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
This commit is contained in:
parent
421013836b
commit
5dae6bc293
@ -9,7 +9,7 @@ CROS_WORKON_REPO="https://github.com"
|
|||||||
if [[ "${PV}" == 9999 ]]; then
|
if [[ "${PV}" == 9999 ]]; then
|
||||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||||
else
|
else
|
||||||
CROS_WORKON_COMMIT="9082621e94ee6a1cdad9e15aa17a747d46c33c6f" # flatcar-master
|
CROS_WORKON_COMMIT="d4d6da73919bacc5b05a012d3d00dc8e2d669c0d" # flatcar-master
|
||||||
KEYWORDS="amd64 arm arm64 x86"
|
KEYWORDS="amd64 arm arm64 x86"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -133,11 +133,6 @@ src_install() {
|
|||||||
|
|
||||||
doenvd "env.d/99flatcar_ldpath"
|
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
|
# handle multilib paths. do it here because we want this behavior
|
||||||
# regardless of the C library that you're using. we do explicitly
|
# regardless of the C library that you're using. we do explicitly
|
||||||
# list paths which the native ldconfig searches, but this isn't
|
# list paths which the native ldconfig searches, but this isn't
|
||||||
|
Loading…
Reference in New Issue
Block a user