sys-kernel/gentoo-kernel-bin: force re-fetch for arm64

Apologies for the inconvenience. We need to do this just for these two versions (5.4.56, 5.7.15) to force a redownload because of (missing) compression in the original binpkgs. Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Sam James <[email protected]>
hanetzer · Aug 16, 2020 · 177f95a · 177f95a
1 parent e09bbfa
commit 177f95a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -9,7 +9,7 @@ DIST gentoo-kernel-5.4.55-1.x86.xpak 53203656 BLAKE2B 4f7a52537a3f2578eeb4275cc2
 DIST gentoo-kernel-5.4.56-1.amd64.xpak 61920923 BLAKE2B fabc9003e395bf78d3d4541440787e034d945bc63dd2c4e97f805509a170f32ce2e594f89a343a47d1561b31f40b32c407177060afebe0d189b25aa3efcfd967 SHA512 5e27736110c1eaffc37da70f5e30120e8869f768155d7a1de0a731ef1a1822d8d491f1de64849cdafdb6c43b5db289416d7746784f69f7ee0622fd1ad9347e55
 DIST gentoo-kernel-5.4.56-1.x86.xpak 53199861 BLAKE2B c0ac8804b81ef6db8ce4d459f5ffdaecedefb3a5bad61391b55915c22a0394cf1f838c063430ed7c384088199960ce0d187819adb00f06719f71539c98fce14d SHA512 8953c187020e4a9995ca148395f789df276c86e6e35b5a2876d2ede3f1123f2310d4644e69ab160c7605ecbfa51c8996b246cc27b9be9c5c8b2bf4d507838d86
 DIST gentoo-kernel-5.4.58-1.amd64.xpak 61957732 BLAKE2B 543ecd10e5387bd8d58c02a03a4d1a80fcc56d4fc8c4c010a9ae51aa688fa77acb28468c96786f894607d242e50981df10ccdecb8023f60b5007267c7bb3ca29 SHA512 bbe7d8d9362c3e73759c1180dbff7fc574511def3beaab5c211b41d262763f26fc9c3dd237a606425f572d38eec4d2eb6c01ea7053c3a8350a406ac03aed2681
-DIST gentoo-kernel-5.4.58-1.arm64.xpak 71010054 BLAKE2B a7d7f4805a210d703cf3f8ffe136860a324b9693d0ad3ee808750d6d1ab1229211dd260d046bf8cd333f9596e3f915d3ee16f4adecf6712a9b4cdc985486688c SHA512 e0fc7820446d937500843f76afe25a6c0fc8795ee4a3220cd5b8093e7c0c3a4b6676e87b88b1c48688576f1fefbdbefee0715d96f28d70f8afbf025329d3af15
+DIST gentoo-kernel-5.4.58-1.arm64.1.xpak 57890920 BLAKE2B a7d7f4805a210d703cf3f8ffe136860a324b9693d0ad3ee808750d6d1ab1229211dd260d046bf8cd333f9596e3f915d3ee16f4adecf6712a9b4cdc985486688c SHA512 e0fc7820446d937500843f76afe25a6c0fc8795ee4a3220cd5b8093e7c0c3a4b6676e87b88b1c48688576f1fefbdbefee0715d96f28d70f8afbf025329d3af15
 DIST gentoo-kernel-5.4.58-1.x86.xpak 53199773 BLAKE2B b92017090e1aecb1b5775c48b826ce15629e12e66d9ee3bec38638a6cd71a35fa3270678a20c1876a959d9bd309187fa6183ebac10941d2c0d044fc1abf643eb SHA512 2d67d6ab8b15c11d5aae20f3cef6f7a1abb09daaea3d85130d94ebf84dccf39cc26f296aff8bfec69863b092c82f5f2ad976e2be5e83686997004c99f41fa560
 DIST gentoo-kernel-5.7.10-1.amd64.xpak 62959097 BLAKE2B 7d10cd9af73be952e521afd696ecc9cac69e855284997ffc48cfb374ef45e379be721d6d71db6e81911c797597cea54dbca92c64aa1b774be89d6d9c8d64452b SHA512 34db8816fe6f2d125cd737eee207fb16c75ed061837b8e3d67b4aa8887942aa727869a725018bddf9b6b1928d3a0e093a0f441f7c49dc17e46364c523a56135f
 DIST gentoo-kernel-5.7.10-1.x86.xpak 54968846 BLAKE2B e33923959281e22b40ca5205097938671aae0967e9a32a5c63628f2ef285b10cb0672ae2a59cbf641fea2521dab439a163e0c624ffb4788b0a8bf333db5efa73 SHA512 728d3eeb66c9bc8940cc3d745055d66c368c9bd7f133f903087b09655fd441a47ff75b48d6b2887a2d0be607de3a361c12dc8f5fb1ee58e74dcfa916dfa1f667
@@ -19,7 +19,7 @@ DIST gentoo-kernel-5.7.13-1.amd64.xpak 63493547 BLAKE2B 38955ee76d650a19f36eb0bd
 DIST gentoo-kernel-5.7.13-1.arm64.xpak 74486569 BLAKE2B 6fbf270cb0783db1e553d66744d9af9d23679b57e5a7004e386385c7f2dc9fe42b0a37e9f38e746c8a8690bba071229fa44295330428901ee9afb2f0412291fa SHA512 258d1e6d1019043f4aec1b5e8f5d1887c55b76c8334396f606c53d7e63cffa0f7f17360a0d7a7f08dae01f54af451c246375f0295bf18fc34cfa936925e3e99f
 DIST gentoo-kernel-5.7.13-1.x86.xpak 54964807 BLAKE2B 15760458eae84df260af1b6657ce0e446442c99ca7400cd9cdc3045cebf430f7a3ea1805b3b2859af9e4836f4240e4e4e0f300e6ab2e3c477dab5a9feaa17354 SHA512 db666dec94178b4bffe1ee72efdd1b74041b35917d2e2367936cc076cffa832caa8c1a44447a5398f49dfb108e60aea3527abdd4d9c8ef2b332b0415ca1e24a2
 DIST gentoo-kernel-5.7.15-1.amd64.xpak 63458161 BLAKE2B 794d5c3d143c623cd6d5446537a499e6a7902f779eee77e87358e64f18f0f6b8586c382143260cc528e749a8c269b81eb1e5eb9e05cab980827177b9e3ee665b SHA512 713fed1045e158e0faae283419d771f94270acdf91d89a8602e153ddd9199ed42ece0b112c31abb1640952baef089186600fc9d590a3f2f49577542e8b8b2f29
-DIST gentoo-kernel-5.7.15-1.arm64.xpak 74813009 BLAKE2B 02cb962faad93148d01c0da4c78cf72b8673c1e38c9bd3885eee4709ad9fdec32ffab6f4a360e5c2568213dab5f690acef514d41aacb01b0ec2b6bead84bbbad SHA512 8faf248616c92f2a753c3b5d72712ef90c775325ef869c498264d4ed4a6c0208eab8ed8c3ceb9f5b89fedf0d9871a3956f5b8d825ab39bd8d280b8b6b20a4b83
+DIST gentoo-kernel-5.7.15-1.arm64.1.xpak 60767789 BLAKE2B 02cb962faad93148d01c0da4c78cf72b8673c1e38c9bd3885eee4709ad9fdec32ffab6f4a360e5c2568213dab5f690acef514d41aacb01b0ec2b6bead84bbbad SHA512 8faf248616c92f2a753c3b5d72712ef90c775325ef869c498264d4ed4a6c0208eab8ed8c3ceb9f5b89fedf0d9871a3956f5b8d825ab39bd8d280b8b6b20a4b83
 DIST gentoo-kernel-5.7.15-1.x86.xpak 54960037 BLAKE2B 80c38017a830ad1c50b02d4b313b84ca9584598c26fa831b822c7148cb79b5d767895b71935a6def7123b5f8255d764bc6d1688215b9d0994c6f76ffaf9927be SHA512 1676d0eb2408a062bc6539ea3eb244b834f9cdc69cf2d3bc5ea6b27d8dda4cec5f66c36801aaba79611bde51f3b0375380a3c8e9b321e219cba655a472680d74
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.58.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.58.ebuild
@@ -15,7 +15,7 @@ SRC_URI+="
  )
  arm64? (
  https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
- -> ${MY_P}.arm64.xpak
+ -> ${MY_P}.arm64.1.xpak
  )
  x86? (
  https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
@@ -41,8 +41,15 @@ pkg_pretend() {
 }
 
 src_unpack() {
+ local arch=${ARCH}
+
+ if use arm64 ; then
+ # Hack to force re-download for broken arm64 image
+ arch="arm64.1"
+ fi
+
  ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
- tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+ tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${arch}.xpak")
  eend ${?} || die "Unpacking ${MY_P} failed"
 }
 

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.15.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.15.ebuild
@@ -15,7 +15,7 @@ SRC_URI+="
  )
  arm64? (
  https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
- -> ${MY_P}.arm64.xpak
+ -> ${MY_P}.arm64.1.xpak
  )
  x86? (
  https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
@@ -41,8 +41,17 @@ pkg_pretend() {
 }
 
 src_unpack() {
+ local arch=${ARCH}
+
+ if use arm64 ; then
+ # Hack to force re-download for broken arm64 image
+ # NOTE: This can be removed on the next bump.
+ # (And switch back tar line to ${ARCH})
+ arch="arm64.1"
+ fi
+
  ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
- tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+ tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${arch}.xpak")
  eend ${?} || die "Unpacking ${MY_P} failed"
 }