commit:     1765e97069d4b2ccb1ffed8855b8a7d395ec3b23
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 16:17:56 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 16:38:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1765e970

sys-kernel/gentoo-kernel-bin: Bump to 5.15.31

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.15.31.ebuild               | 135 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index abf50a3177f1..1740e687cd38 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-31.base.tar.xz 1285168 BLAKE2B 
3ca09c8deeb3487fd69fe1b26ba3
 DIST genpatches-5.15-31.extras.tar.xz 3876 BLAKE2B 
47b21170f3fe46257b20f4cd63288a8f61a3600746883baa2931253d2924696e4d445404746f1a656adfa390ddf8f24780ec6688aa835467deb75dfa0d9f2fb4
 SHA512 
c0f866410b3436f5c45c117f1dc49e3b1d99d77d41de66ca6d08213daf6bf3eb1e8875e75e1674c3f78c7beddb6dfa2d47dc9fb75f8dfedd169f1c3478b74db1
 DIST genpatches-5.15-32.base.tar.xz 1289524 BLAKE2B 
4fc3b82df9a96c5e91cfb93bc68597afa1524bc8c1a49f9a803d72610307551b9675b4e014c5ffd0b3e273b2a660546f274b27ab5425e9aa6eafd03719e5ed74
 SHA512 
277957056d9c8c8cc8f6a5a26582f35ae594c26e6e29b755b9214a91624eafb2917c67a612c231d8862831f4aeb34a725502c57e9063432d9597e24abf913947
 DIST genpatches-5.15-32.extras.tar.xz 3876 BLAKE2B 
6dc352a080f10cafc7a24503d515a451996a3c6940b7cb44dd661bee0125ff993b1c4594e808a087b2d15e640b8b921b37a4607e0e8312645fd0ba5c84fd214c
 SHA512 
8d6565a8a5a39267b682d592cf757dcfe2e7f33789fe26a596ad5d400f1821f37081a37bd25cb6fc8cea28e83448cef937e772b138314fb239ba83a288e94d44
+DIST genpatches-5.15-33.base.tar.xz 1296164 BLAKE2B 
25dce9e6d4047709a0995ff75999f36a5695accfcfb3b378d0e1a0782b6897035dec5285b678f79b71d05bc573ced2a49c2eaa891aa7201b1930049a95cc410e
 SHA512 
e49f7e08120c2dfabe97107b15885e46dc469bb2cb537fa395e94518f1db8f326dac2a6b6176aad0d63d54e2e5e92a7689f3f54dfc64ac372a55dfc7ff75c655
+DIST genpatches-5.15-33.extras.tar.xz 3876 BLAKE2B 
4a7d695523ec637b847c28eb168bbd7543706ed346e863930c1c824b82087cd531d86b794605b26076000e67661f5894d0d8f081ed031b7d7e27b2f85a0d152f
 SHA512 
f8b5b9264f917f79c6ea34605511d1b7e5a12b6336746495f42aa64a157b5879ab4fb23704e625eba53d9ce1c5a5dbb3bbf259e08c4bfb81edbe0ac6cbb1f55d
 DIST genpatches-5.16-17.base.tar.xz 753196 BLAKE2B 
8f4be6ddb70a7407f6515d180ae8a65eed54c7a7aa3ffa4175500f532036bd13dc718a77fc9cb442f6053b1cf0f8e3bf2de2c0954a5bbfd8957a99162675980b
 SHA512 
9550fd794ffcb29ed26be5f99116f8b53a5bc9ce3a9fd6a79d221e7f7e5e81be809eda7a8becd253361ac069526b141c414e132f11d8e1eeef84f5737c03afd0
 DIST genpatches-5.16-17.extras.tar.xz 3800 BLAKE2B 
9224e534e09bf58189462be87516fa21fc37228fe60399ef670e40320a8bcc5edbcd0371b5da5ed445ca84c0127ae6541a07999edd62f67a8619f977c70d08bb
 SHA512 
92a0580b4e38c43c3e594fcae0cd6ad1c04621e8ea543ee7c039bd47bec9229c23f72585d98d4f237e5c80fd1a3a21205a4b688ccd67df77e048d4b417dd3884
 DIST genpatches-5.16-18.base.tar.xz 761144 BLAKE2B 
f4d4b5225a2ef03e422230497861714663b430397d3118c8e1cd880eea9fbd2393a4b6848c674cce8892fdb145c06e4b3d828be05836d76a1c56501e07d840b4
 SHA512 
472f456ff01545dad0a9e21a3560eadca63dbbaa5dfea0cb4496d3ea8f10fc968967a97a7d483ab573312de53b6d719f8baa21761feb7b7474597af53e50abd0
@@ -30,6 +32,10 @@ DIST gentoo-kernel-5.15.30-1.amd64.xpak 69284924 BLAKE2B 
5c10090c32d93068e9c341e
 DIST gentoo-kernel-5.15.30-1.arm64.xpak 64205101 BLAKE2B 
9457b030d4709307de8ca8558f4ddc7f820877eec25e10a7032712fa7663cb8738c4f34805edaef880ffdb0a0925e62f03d451d882d4c6381292ae2124f7a116
 SHA512 
2d1ae8e63a6a5c8838549c9f8d196af0bfb9fdab47728e4254d894cfc781c22d7a0afc8968a7f7387084e67e8af45599210e1265ff5132ff1feefe9d089c12c2
 DIST gentoo-kernel-5.15.30-1.ppc64le.xpak 57931210 BLAKE2B 
98dd273393e819255bee9f6672b324e19cf4021754a520e89dd825514fba9339ffa70d9f8c80d87c4bf3afa87ec7ac9bca888d64d6e6eb09d3c94b28d3bfc40a
 SHA512 
d7d4f8dae9e28af8dd48ee4b9a38ae08f8f334601d1c3842dcbdaeb2ebeb65effc1329629c7947650ca3622c729e2473555d7c4026d3aa7f78132dbed36037a3
 DIST gentoo-kernel-5.15.30-1.x86.xpak 60007487 BLAKE2B 
127f01c5286a49ad25cb11ddc047f53efc0249e1029d8921b86d646f6b3d1bbd4afaa5f28ec83aa922b13deb5bc6a2f88422a98b2880c4734dfe0ce9b5377953
 SHA512 
8419f19b886aff3db534c617f98d86d199431cc5e7851b0bd72209e371de844d90666c1531824708ee7f49d3fe5f852f14ee94539f0f44ae2d7f27ddd6f05eae
+DIST gentoo-kernel-5.15.31-1.amd64.xpak 69295740 BLAKE2B 
7a1a06735c3f1615e5364e61423981a8ffca44d100858201559e6f60bc1260ec293b08370e43d122db406fc2a26e6b17c47f8cd035210e39dd856f8f896e1d49
 SHA512 
3508c67077d924eacffcefe334889aa13fa336008059becc25b99528250a4bbf542fd49ab7c549167e3f21307b92a48e16a6ee7c81fcd16df172b28e3f90cc8f
+DIST gentoo-kernel-5.15.31-1.arm64.xpak 64193608 BLAKE2B 
532c6ee413dd8199488051d35c81cae96b935bfab01a5918688c5919406be6362030c662e1921537fa3d14507e9cb927e052a36b2112f6897d564f97fbc0409a
 SHA512 
1e5f3d34b936c5abe693d73cd9a6a644ed5718491bb0052a7578791c4029522e89c8cab8ec574c6245764464118e3664c6e6151c462dea17975a268e74c39b88
+DIST gentoo-kernel-5.15.31-1.ppc64le.xpak 57932193 BLAKE2B 
aea965e160c68179db7a649815bfbc1c8583be6f99e8adcaa6ad661dd5da4c40abbd316e8aa855c61200f47df49130699c067b0af09036459f6418a806298f6a
 SHA512 
443a67d17cfaede7283ba73b5711c1ca215cd02ceb4e014024e17c1ec7fc64f622c045017fa9ca6b7aa97ef36155541cc8c79bf14fcda79d7529ebd16880ee2c
+DIST gentoo-kernel-5.15.31-1.x86.xpak 59999822 BLAKE2B 
7e17d014f09415b9ab21a36834355702cd1c51e7a60c9c127815a9c14534a4771dd9bc1bd465f8b9f11c3933f7b8371466874a40c008ef48d9d9efd657c3e848
 SHA512 
fa2e109ecefc13ef516c0fb8f9d30927a644d93cb8855515defdcac3f699052d5f3ffb8efbf8bb9dad4d1d66881e0ec2759bf67412d0fd2843dc2ddb6b175e5b
 DIST gentoo-kernel-5.16.16-1.amd64.xpak 69716835 BLAKE2B 
961d065169c1f657e9492144c83d0738c1d97bac8b5ab7f7b68a2a9dc9175cafb07037b4c24fc20c067fa95f2aa1f9070cdfb8e11efeeda2b97cea7cdd9f1ffd
 SHA512 
26e2e51e51425fedfc9d8bf7529a5001eb54b2c6279e96c7f8132749709c3acd3323c9b8fbf6f2771a697fb837b13f7987b19f0c6d8ef84ad95ee0a673b60a9a
 DIST gentoo-kernel-5.16.16-1.arm64.xpak 65166903 BLAKE2B 
febed4db841a18c45e63440a4b517401592b2fd25a1dcdfda5107ffdb4e5c1d4284af2f2ea61964f1bf9519069f5c8a7fecdc1eb9c19ea0cdfd269911870481e
 SHA512 
bb7cd2fd38a10d0608b7fec6a818e323292747616171411ba5a47886ef92c3df3cf7402124f0740f3a12724db1c64a94c1c76a5c6d4ec329018af12196fd24c7
 DIST gentoo-kernel-5.16.16-1.ppc64le.xpak 58506473 BLAKE2B 
8d66bae7d90141c67d7355740d13028f8aa475b829e94ef26f9e338db3564d758009e4e3fd3ae2dc209e7bf6dbd823c1d08b06d39c3dd92613002c0555a06ce8
 SHA512 
c9121593ea8c810a49120d2230c51b1e1335386415a390f5b37b80b02adae4efde7d4d5efc1b6be3e00e3266cd2c7cc57ee0815b4d85aadafbe1b8c45ccf8e70

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.31.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.31.ebuild
new file mode 100644
index 000000000000..733d693fbe56
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.31.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       amd64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.amd64.xpak
+       )
+       arm64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.arm64.xpak
+       )
+       ppc64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.ppc64le.xpak
+       )
+       x86? (
+               
https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.x86.xpak
+       )
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+       sys-devel/bc
+       sys-devel/flex
+       virtual/libelf
+       virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+       default
+       # 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"
+}
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       cd "${MY_P}" || die
+       default
+}
+
+src_configure() {
+       # force ld.bfd if we can find it easily
+       local LD="$(tc-getLD)"
+       if type -P "${LD}.bfd" &>/dev/null; then
+               LD+=.bfd
+       fi
+
+       tc-export_build_env
+       local makeargs=(
+               V=1
+
+               HOSTCC="$(tc-getBUILD_CC)"
+               HOSTCXX="$(tc-getBUILD_CXX)"
+               HOSTCFLAGS="${BUILD_CFLAGS}"
+               HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+               CROSS_COMPILE=${CHOST}-
+               AS="$(tc-getAS)"
+               CC="$(tc-getCC)"
+               LD="${LD}"
+               AR="$(tc-getAR)"
+               NM="$(tc-getNM)"
+               STRIP=":"
+               OBJCOPY="$(tc-getOBJCOPY)"
+               OBJDUMP="$(tc-getOBJDUMP)"
+
+               # we need to pass it to override colliding Gentoo envvar
+               ARCH="$(tc-arch-kernel)"
+
+               O="${WORKDIR}"/modprep
+       )
+
+       mkdir modprep || die
+       cp "usr/src/linux-${KPV}/.config" modprep/ || die
+       emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+       kernel-install_test "${KPV}" \
+               "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" 
\
+               "lib/modules/${KPV}"
+}
+
+src_install() {
+       mv lib usr "${ED}"/ || die
+
+       # FIXME: requires proper mount-boot
+       if [[ -d boot/dtbs ]]; then
+               mv boot "${ED}"/ || die
+       fi
+
+       # strip out-of-source build stuffs from modprep
+       # and then copy built files
+       find modprep -type f '(' \
+                       -name Makefile -o \
+                       -name '*.[ao]' -o \
+                       '(' -name '.*' -a -not -name '.config' ')' \
+               ')' -delete || die
+       rm modprep/source || die
+       cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}

Reply via email to