From fb86fc60f7e015ba06e978b546858271835bd95d Mon Sep 17 00:00:00 2001
From: James Le Cuirot <jlecuirot@microsoft.com>
Date: Mon, 22 Dec 2025 17:03:44 +0000
Subject: [PATCH] sys-apps/baselayout: Already non-live but make consistent
 with others

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
---
 .../baselayout/baselayout-9999.ebuild         | 27 ++++++++++---------
 .../sys-apps/baselayout/metadata.xml          |  4 ++-
 2 files changed, 17 insertions(+), 14 deletions(-)

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 e260bc1706..403d3bf497 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
@@ -2,23 +2,22 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-EGIT_REPO_URI="https://github.com/flatcar/baselayout.git"
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	KEYWORDS="~amd64 ~arm64"
-else
-	EGIT_COMMIT="bb76459c3338ce0e76c4e48d545795bfbc9dbfd9" # flatcar-master
-	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"
-fi
 
 inherit multilib
 
 DESCRIPTION="Filesystem baselayout for Flatcar"
 HOMEPAGE="https://www.flatcar.org/"
 
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/flatcar/baselayout.git"
+	inherit git-r3
+else
+	EGIT_VERSION="bb76459c3338ce0e76c4e48d545795bfbc9dbfd9" # flatcar-master
+	SRC_URI="https://github.com/flatcar/baselayout/archive/${EGIT_VERSION}.tar.gz -> flatcar-${PN}-${EGIT_VERSION}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
+	KEYWORDS="amd64 arm64"
+fi
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="cros_host"
@@ -81,7 +80,8 @@ src_compile() {
 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} ./dumb-tmpfiles-proc.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
@@ -93,7 +93,8 @@ pkg_preinst() {
 	local libdirs
 	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}/dumb-tmpfiles-proc.sh" "${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} "${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
 }
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/metadata.xml
index 96a2d58636..db98702ec2 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<upstream>
+		<remote-id type="github">flatcar/baselayout</remote-id>
+	</upstream>
 </pkgmetadata>