[gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/

[William Hubbs]

commit:     d2c10afa5573e5efaf1f6845cb47e3f8cc226812
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 27 20:05:57 2021 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Sep 27 20:10:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c10afa

sys-apps/baselayout: stop using install target in makefile

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 sys-apps/baselayout/baselayout-9999.ebuild | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index 5df53f3739a..9988d48fbad 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -244,20 +244,27 @@ src_prepare() {
 }
 
 src_install() {
-	dodir /usr/lib
-	emake \
-		OS=$(usex kernel_FreeBSD BSD Linux) \
-		DESTDIR="${ED}" \
-		install
+	local OS="$(usex kernel_linux 'Linux' 'BSD')"
+	insinto /etc
+	doins -r etc/* etc.${OS}/*
+	printf '%s\n' "Gentoo Base System release ${PV}" > "${T}"/gentoo-release
+	doins "${T}"/gentoo-release
+	dosym ../usr/lib/os-release /etc/os-release
+
 	if use kernel_linux; then
 		insinto /lib
 		doins -r lib.Linux/*
 	fi
-	dodoc ChangeLog
+	insinto /usr/lib
+	./make_os_release ${OS} ${PV} > "${T}"/os-release
+	doins "${T}"/os-release
 
-	# need the makefile in pkg_preinst
 	insinto /usr/share/${PN}
+	doins -r share.${OS}/*
+	# need the makefile in pkg_preinst
 	doins Makefile
+
+	dodoc ChangeLog
 }
 
 pkg_postinst() {