stuff

flatcar · Aug 27, 2024 · a3d61af · a3d61af
1 parent 63bc8a2
commit a3d61af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest
@@ -1 +1 @@
-DIST flatcar-baselayout-208740e83b16509278a2f09816d49f5af4f569f2.tar.gz 36831 BLAKE2B 88609e66cc8c12dcb27b136c21877693b8fed85f697b570d8bbc1b56d529ceafeeb23fd28f755ac1f89fc443c768e9cb49ea728d1c0910ef03f1aefbf9f63156 SHA512 b25238ca856325199e58cdc61478408e1f2990fa1f6d6b1b8f5d89d54e46ca4bbeedc578506f603ab24cb70bcf9f4936a78869e0ae880aa3adc4dfd5932133d4
+DIST flatcar-baselayout-8ec52c70d8b6f0a19ee40f2096435d858278f9e9.tar.gz 36840 BLAKE2B 54ec053dd7b933f33358077f545d04101ee6c29a3808cd645cf2e010806870d01e97a23d2c28e9ec65ca18c1f1a6dd24e08447b744ba645225371cbf7408353c SHA512 e73b03752ef115b08bc9b55d7708da0c209a396aa314e18197243e411594ec0e0521632a41ba1565e9ffdbc92b64c37e06d2d5a82526042f6faaa072a4770190
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
@@ -8,7 +8,7 @@ if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	KEYWORDS="~amd64 ~arm64"
 else
-	EGIT_COMMIT="208740e83b16509278a2f09816d49f5af4f569f2" # krnowak/merged-usr
+	EGIT_COMMIT="8ec52c70d8b6f0a19ee40f2096435d858278f9e9" # krnowak/merged-usr
 	SRC_URI="https://github.com/flatcar/baselayout/archive/${EGIT_COMMIT}.tar.gz -> flatcar-${PN}-${EGIT_COMMIT}.tar.gz"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 	KEYWORDS="amd64 arm64"
@@ -95,7 +95,8 @@ src_prepare() {
 	# path and the symlinked path doesn't change the resulting cache.
 	local libdir ldpaths
 	for libdir in $(get_all_libdirs) ; do
-		ldpaths+=":/${libdir}:/usr/${libdir}:/usr/local/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
 	done
 	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/00basic || die