From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D1767158017 for ; Mon, 27 Sep 2021 20:38:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AA05E09C1; Mon, 27 Sep 2021 20:38:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB20AE09C1 for ; Mon, 27 Sep 2021 20:38:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF13A342A54 for ; Mon, 27 Sep 2021 20:38:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56D3F107 for ; Mon, 27 Sep 2021 20:38:28 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1632775102.9a9deabd0fe4d01d457ef808e6fdaac36bd1ef81.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/baselayout/baselayout-9999.ebuild X-VCS-Directories: sys-apps/baselayout/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 9a9deabd0fe4d01d457ef808e6fdaac36bd1ef81 X-VCS-Branch: master Date: Mon, 27 Sep 2021 20:38:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 11c0f8b9-e205-4449-860d-ec3e61d335c5 X-Archives-Hash: 73f1aaa8f0525d9b56398388692b5fb9 commit: 9a9deabd0fe4d01d457ef808e6fdaac36bd1ef81 Author: William Hubbs gentoo org> AuthorDate: Mon Sep 27 20:29:10 2021 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Sep 27 20:38:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9deabd Revert "sys-apps/baselayout: stop using install target in makefile" This reverts commit d2c10afa5573e5efaf1f6845cb47e3f8cc226812. It will be cleaner to use the Makefile where possible. Signed-off-by: William Hubbs gentoo.org> sys-apps/baselayout/baselayout-9999.ebuild | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 9988d48fbad..5df53f3739a 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -244,27 +244,20 @@ src_prepare() { } src_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 - + dodir /usr/lib + emake \ + OS=$(usex kernel_FreeBSD BSD Linux) \ + DESTDIR="${ED}" \ + install if use kernel_linux; then insinto /lib doins -r lib.Linux/* fi - insinto /usr/lib - ./make_os_release ${OS} ${PV} > "${T}"/os-release - doins "${T}"/os-release + dodoc ChangeLog - insinto /usr/share/${PN} - doins -r share.${OS}/* # need the makefile in pkg_preinst + insinto /usr/share/${PN} doins Makefile - - dodoc ChangeLog } pkg_postinst() {