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

[Georgy Yakovlev]

commit:     8ab89740f567bbc89a154271a4a7af4e7e6dd469
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 25 23:24:12 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 23:24:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab89740

sys-kernel/gentoo-kernel-bin: fix ppc64le kernel unpack

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.88.ebuild | 5 +++--
 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.11.ebuild | 5 +++--
 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.168.ebuild | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.88.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.88.ebuild
index 9c2531362fea..f54981556437 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.88.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.88.ebuild
@@ -53,8 +53,9 @@ KPV=${PV}${KV_LOCALVERSION}
 
 src_unpack() {
        default
-       ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-       tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+       # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce 
ppc64be binpkg.
+       ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+       tar -x < <(xz -c -d --single-stream 
"${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
        eend ${?} || die "Unpacking ${BINPKG} failed"
 }
 

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.11.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.11.ebuild
index fa8c4262f80c..118b14b8cb5b 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.11.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.11.ebuild
@@ -53,8 +53,9 @@ KPV=${PV}${KV_LOCALVERSION}
 
 src_unpack() {
        default
-       ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-       tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+       # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce 
ppc64be binpkg.
+       ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+       tar -x < <(xz -c -d --single-stream 
"${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
        eend ${?} || die "Unpacking ${BINPKG} failed"
 }
 

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.168.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.168.ebuild
index 4a40d43815cc..4ac8f62a02d9 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.168.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.168.ebuild
@@ -53,8 +53,9 @@ KPV=${PV}${KV_LOCALVERSION}
 
 src_unpack() {
        default
-       ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
-       tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+       # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce 
ppc64be binpkg.
+       ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+       tar -x < <(xz -c -d --single-stream 
"${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
        eend ${?} || die "Unpacking ${BINPKG} failed"
 }