wip

flatcar · Aug 29, 2024 · 1b74fff · 1b74fff
1 parent 541ec5a
commit 1b74fff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 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-8ec52c70d8b6f0a19ee40f2096435d858278f9e9.tar.gz 36840 BLAKE2B 54ec053dd7b933f33358077f545d04101ee6c29a3808cd645cf2e010806870d01e97a23d2c28e9ec65ca18c1f1a6dd24e08447b744ba645225371cbf7408353c SHA512 e73b03752ef115b08bc9b55d7708da0c209a396aa314e18197243e411594ec0e0521632a41ba1565e9ffdbc92b64c37e06d2d5a82526042f6faaa072a4770190
+DIST flatcar-baselayout-65af4cd8f8de0bbcdabbf3f2d0f396beff41572b.tar.gz 36844 BLAKE2B 643d72cb564ee328488691eec75031d23f61402b2a7055f02667b36a68444125df78e15a87da23e1b674b79c25f6fa831384088596f7b590d3d13cc4eb42b58a SHA512 9caada198fc955b88524812d36aae1e2234891bf125b5810af3c5d7202015ce459a2e7e555ccc2201665aaf9eb18cad2832a7001667325332f32838eae3f29de
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="8ec52c70d8b6f0a19ee40f2096435d858278f9e9" # krnowak/merged-usr
+	EGIT_COMMIT="65af4cd8f8de0bbcdabbf3f2d0f396beff41572b" # 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"
@@ -125,19 +125,19 @@ src_install() {
 
 	emake DESTDIR="${ED}" install
 	# GID 190 is taken from acct-group/systemd-journal eclass
-	SYSTEMD_JOURNAL_GID=${ACCT_GROUP_SYSTEMD_JOURNAL_ID:-190} ROOT_UID=0 ROOT_GID=0 CORE_UID=500 CORE_GID=500 DESTDIR=${D} ./stuff.sh --exclude d "${ED}/usr/lib/tmpfiles.d" || die
+	SYSTEMD_JOURNAL_GID=${ACCT_GROUP_SYSTEMD_JOURNAL_ID:-190} ROOT_UID=0 ROOT_GID=0 CORE_UID=500 CORE_GID=500 DESTDIR=${D} ./dumb-tmpfiles-proc.sh --exclude d "${ED}/usr/lib/tmpfiles.d" || die
 
 	insinto /usr/share/baselayout
 	doins Makefile
 	exeinto /usr/share/baselayout
-	doexe stuff.sh
+	doexe dumb-tmpfiles-proc.sh
 }
 
 pkg_preinst() {
 	local libdirs=$(get_all_libdirs)
 	emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" LIBDIRS="${libdirs}" layout
-	SYSTEMD_JOURNAL_GID=${ACCT_GROUP_SYSTEMD_JOURNAL_ID:-190} ROOT_UID=0 ROOT_GID=0 CORE_UID=500 CORE_GID=500 DESTDIR=${D} "${ED}/usr/share/${PN}/stuff.sh" "${ED}/usr/lib/tmpfiles.d" || die
-	rm -f "${ED}/usr/share/${PN}/Makefile" "${ED}/usr/share/${PN}/stuff.sh" || die
+	SYSTEMD_JOURNAL_GID=${ACCT_GROUP_SYSTEMD_JOURNAL_ID:-190} ROOT_UID=0 ROOT_GID=0 CORE_UID=500 CORE_GID=500 DESTDIR=${D} "${ED}/usr/share/${PN}/dumb-tmpfiles-proc.sh" "${ED}/usr/lib/tmpfiles.d" || die
+	rm -f "${ED}/usr/share/${PN}/Makefile" "${ED}/usr/share/${PN}/dumb-tmpfiles-proc.sh" || die
 
 	# Set up /usr/lib/debug to match the root filesystem layout
 	local dir sym