[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/

Michał Górny Tue, 27 Sep 2022 21:22:21 -0700

commit:     21a26062d6c11e4a96ab95b2bc3c3217daf5b22e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 14:56:46 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/

Reply via email to