mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-16 14:52:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2348 from dm0-/bump-baselayout

Browse Source 
sys-apps/baselayout: bump, add /sbin:/bin back into SDK PATH
This commit is contained in:
David Michael 2017-01-04 15:32:39 -08:00 committed by GitHub
commit 634a4b35cb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.1.5.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.2.0.ebuild vendored
View File

7
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild vendored
View File

@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://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="1dad7cf091467bb51ce8f5bba11b9baeab1f6c0c" CROS_WORKON_COMMIT="dc8fe9b318df608ffb08959d0a1b0e8818797935"
KEYWORDS="amd64 arm arm64 x86" KEYWORDS="amd64 arm arm64 x86"
fi fi
@ -131,6 +131,11 @@ src_install() {
doenvd "env.d/99coreos_ldpath" 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 # 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