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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BDAEA158041 for ; Sat, 24 Feb 2024 22:06:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFBDAE29BC; Sat, 24 Feb 2024 22:06:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB92CE29BC for ; Sat, 24 Feb 2024 22:06:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC06033BEF5 for ; Sat, 24 Feb 2024 22:06:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2189F131B for ; Sat, 24 Feb 2024 22:06:51 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1708812399.2c49d2ffed7cc4365cf8dc9e8df340ae0b1bfc14.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/genkernel/genkernel-9999.ebuild X-VCS-Directories: sys-kernel/genkernel/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 2c49d2ffed7cc4365cf8dc9e8df340ae0b1bfc14 X-VCS-Branch: master Date: Sat, 24 Feb 2024 22:06:51 +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: f0a55239-a709-4f87-83bf-b549b62ec28a X-Archives-Hash: ef6a6cc957fe61a43bbfafd1130dd8fc commit: 2c49d2ffed7cc4365cf8dc9e8df340ae0b1bfc14 Author: Timothy Kenno Handojo gmail com> AuthorDate: Wed Feb 21 12:25:52 2024 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Feb 24 22:06:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c49d2ff sys-kernel/genkernel: modernize build script Signed-off-by: Timothy Kenno Handojo gmail.com> Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/35089 sys-kernel/genkernel/genkernel-9999.ebuild | 76 +++++------------------------- 1 file changed, 11 insertions(+), 65 deletions(-) diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index 6de5f5963238..deb515ad14ff 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -111,7 +111,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # because genkernel will usually build things like LVM2, cryptsetup, # mdadm... during initramfs generation which will require these # things. -DEPEND="" +DEPEND=" + app-text/asciidoc +" RDEPEND="${PYTHON_DEPS} app-alternatives/cpio >=app-misc/pax-utils-1.2.2 @@ -128,11 +130,9 @@ RDEPEND="${PYTHON_DEPS} dev-build/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) - firmware? ( sys-kernel/linux-firmware )" + firmware? ( sys-kernel/linux-firmware ) +" -if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} app-text/asciidoc" -fi PATCHES=( ) @@ -163,73 +163,19 @@ src_prepare() { popd >/dev/null || die fi - # Update software.sh - sed -i \ - -e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\ - -e "s:VERSION_BOOST:${VERSION_BOOST}:"\ - -e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\ - -e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\ - -e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\ - -e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\ - -e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\ - -e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\ - -e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\ - -e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\ - -e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\ - -e "s:VERSION_FUSE:${VERSION_FUSE}:"\ - -e "s:VERSION_GPG:${VERSION_GPG}:"\ - -e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\ - -e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\ - -e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\ - -e "s:VERSION_KMOD:${VERSION_KMOD}:"\ - -e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\ - -e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\ - -e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\ - -e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\ - -e "s:VERSION_LVM:${VERSION_LVM}:"\ - -e "s:VERSION_LZO:${VERSION_LZO}:"\ - -e "s:VERSION_MDADM:${VERSION_MDADM}:"\ - -e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\ - -e "s:VERSION_POPT:${VERSION_POPT}:"\ - -e "s:VERSION_STRACE:${VERSION_STRACE}:"\ - -e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\ - -e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\ - -e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\ - -e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\ - -e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\ - -e "s:VERSION_XZ:${VERSION_XZ}:"\ - -e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\ - -e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\ - "${S}"/defaults/software.sh \ - || die "Could not adjust versions" + # Export all the versions that may be used by genkernel build. + for v in $(set |awk -F= '/^VERSION_/{print $1}') ; do + export ${v} + done } src_compile() { - if [[ ${PV} == 9999* ]] ; then - emake - fi + emake PREFIX=/usr } src_install() { - insinto /etc - doins "${S}"/genkernel.conf - - doman genkernel.8 + emake DESTDIR="${D}" PREFIX=/usr install dodoc AUTHORS ChangeLog README TODO - dobin genkernel - rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf - - if use ibm ; then - cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die - else - cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die - fi - - insinto /usr/share/genkernel - doins -r "${S}"/* - - fperms +x /usr/share/genkernel/gen_worker.sh - fperms +x /usr/share/genkernel/path_expander.py python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py