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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C72D4158094 for ; Wed, 28 Sep 2022 04:22:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 991E3E0824; Wed, 28 Sep 2022 04:22:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 5BB03E0824 for ; Wed, 28 Sep 2022 04:22:18 +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 2909A341082 for ; Wed, 28 Sep 2022 04:22:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DFDAD4 for ; Wed, 28 Sep 2022 04:22:15 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1664338931.21a26062d6c11e4a96ab95b2bc3c3217daf5b22e.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 21a26062d6c11e4a96ab95b2bc3c3217daf5b22e X-VCS-Branch: master Date: Wed, 28 Sep 2022 04:22:15 +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: 0fd29aa2-44b1-4156-ab55-b40434d1d76b X-Archives-Hash: 715ee19551c4d949be00b4f0c3407678 commit: 21a26062d6c11e4a96ab95b2bc3c3217daf5b22e Author: Michał Górny gentoo org> AuthorDate: Sat Sep 24 14:56:46 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Sep 28 04:22:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a26062 sys-kernel/gentoo-kernel-bin: Use unpacker.eclass for .gpkg.tar Signed-off-by: Michał Górny gentoo.org> .../gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild | 17 ++++++----------- .../gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild | 17 ++++++----------- .../gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild | 17 ++++++----------- .../gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild | 17 ++++++----------- 4 files changed, 24 insertions(+), 44 deletions(-) diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild index 691ad14894b2..26eed75d6c06 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit kernel-install toolchain-funcs +inherit kernel-install toolchain-funcs unpacker MY_P=linux-${PV%.*} GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 )) @@ -55,11 +55,6 @@ QA_PREBUILT='*' KV_LOCALVERSION='-gentoo-dist' KPV=${PV}${KV_LOCALVERSION} -src_unpack() { - default - unpack "${BINPKG}"/image.tar.xz -} - src_prepare() { local PATCHES=( # meh, genpatches have no directory @@ -102,22 +97,22 @@ src_configure() { ) mkdir modprep || die - cp "image/usr/src/linux-${KPV}/.config" modprep/ || die + cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare } src_test() { kernel-install_test "${KPV}" \ - "${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ - "image/lib/modules/${KPV}" + "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ + "${BINPKG}/image/lib/modules/${KPV}" } src_install() { - mv image/{lib,usr} "${ED}"/ || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot if [[ -d boot/dtbs ]]; then - mv image/boot "${ED}"/ || die + mv "${BINPKG}"/image/boot "${ED}"/ || die fi # strip out-of-source build stuffs from modprep diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild index e1d7752b26f1..9c843f83530a 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit kernel-install toolchain-funcs +inherit kernel-install toolchain-funcs unpacker MY_P=linux-${PV%.*} GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 )) @@ -55,11 +55,6 @@ QA_PREBUILT='*' KV_LOCALVERSION='-gentoo-dist' KPV=${PV}${KV_LOCALVERSION} -src_unpack() { - default - unpack "${BINPKG}"/image.tar.xz -} - src_prepare() { local PATCHES=( # meh, genpatches have no directory @@ -102,22 +97,22 @@ src_configure() { ) mkdir modprep || die - cp "image/usr/src/linux-${KPV}/.config" modprep/ || die + cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare } src_test() { kernel-install_test "${KPV}" \ - "${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ - "image/lib/modules/${KPV}" + "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ + "${BINPKG}/image/lib/modules/${KPV}" } src_install() { - mv image/{lib,usr} "${ED}"/ || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot if [[ -d boot/dtbs ]]; then - mv image/boot "${ED}"/ || die + mv "${BINPKG}"/image/boot "${ED}"/ || die fi # strip out-of-source build stuffs from modprep diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild index 966fadbe839a..0ba336c5c1aa 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit kernel-install toolchain-funcs +inherit kernel-install toolchain-funcs unpacker MY_P=linux-${PV%.*} GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 )) @@ -55,11 +55,6 @@ QA_PREBUILT='*' KV_LOCALVERSION='-gentoo-dist' KPV=${PV}${KV_LOCALVERSION} -src_unpack() { - default - unpack "${BINPKG}"/image.tar.xz -} - src_prepare() { local PATCHES=( # meh, genpatches have no directory @@ -102,22 +97,22 @@ src_configure() { ) mkdir modprep || die - cp "image/usr/src/linux-${KPV}/.config" modprep/ || die + cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare } src_test() { kernel-install_test "${KPV}" \ - "${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ - "image/lib/modules/${KPV}" + "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ + "${BINPKG}/image/lib/modules/${KPV}" } src_install() { - mv image/{lib,usr} "${ED}"/ || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot if [[ -d boot/dtbs ]]; then - mv image/boot "${ED}"/ || die + mv "${BINPKG}"/image/boot "${ED}"/ || die fi # strip out-of-source build stuffs from modprep diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild index 13605295f2bb..7d29184e6c6b 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit kernel-install toolchain-funcs +inherit kernel-install toolchain-funcs unpacker MY_P=linux-${PV%.*} GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 )) @@ -55,11 +55,6 @@ QA_PREBUILT='*' KV_LOCALVERSION='-gentoo-dist' KPV=${PV}${KV_LOCALVERSION} -src_unpack() { - default - unpack "${BINPKG}"/image.tar.xz -} - src_prepare() { local PATCHES=( # meh, genpatches have no directory @@ -102,22 +97,22 @@ src_configure() { ) mkdir modprep || die - cp "image/usr/src/linux-${KPV}/.config" modprep/ || die + cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare } src_test() { kernel-install_test "${KPV}" \ - "${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ - "image/lib/modules/${KPV}" + "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ + "${BINPKG}/image/lib/modules/${KPV}" } src_install() { - mv image/{lib,usr} "${ED}"/ || die + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die # FIXME: requires proper mount-boot if [[ -d boot/dtbs ]]; then - mv image/boot "${ED}"/ || die + mv "${BINPKG}"/image/boot "${ED}"/ || die fi # strip out-of-source build stuffs from modprep