commit:     5a4a926eb220960141b1d0e0bd8fc4f769f7d9b2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 20:22:52 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 30 20:24:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4a926e

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.1.31.ebuild                | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index d346934c9d03..e4373f7b08f5 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.1-34.base.tar.xz 1760348 BLAKE2B 
9a7672bf2f106e0df50997d746171
 DIST genpatches-6.1-34.extras.tar.xz 3808 BLAKE2B 
9830d4850e5095ef0864df0aaa25a4549678fb76b22807abf61739b42b048455535aff7eaac16bad5d2cdb0cca65efd2e176a50f40a685250df0b75565fadc36
 SHA512 
13c8f7f596eeaa9b78be7aae7667a196e199fbb8d3cc045318dfdfe1ab340622fd0e958be09ed8608f9667231d6523685af1f03f4f2b52d78810885c0e9fe4a0
 DIST genpatches-6.1-35.base.tar.xz 1862704 BLAKE2B 
b6fb58876bf303e807a429d63c8a932798a73f95275ca1137ca672477d8004404f931e09e681c92202fda9083a44dd53dd0b93d1e503f2bd6e177c44a9c10425
 SHA512 
df18933b2dc32af5a0760c8419d0f69d2c221c4d12aa8c64ec7d38be8407930b79d507f5312d9e9d369a51a192196dd36a8b919e78c81d068f7ea5989be8c8a1
 DIST genpatches-6.1-35.extras.tar.xz 3812 BLAKE2B 
3784c4bc551ad594a75de1f174112f80c2e805f5ab2f1fc20642162e72ad785c03ac7e90be19497b6826810d706e36b4f40396e45ba95a6a40f7ba296a3d2930
 SHA512 
4666ba408cfedbf2d6858fde80699c7d533cf24724598c2b719bed365021eebbad7eb1872008b1bca2f8da77ab31b20d56ead15d9c7d0cd6135f117510a87c89
+DIST genpatches-6.1-36.base.tar.xz 1892196 BLAKE2B 
21e7b006889ce39d3b2afaa981cb04c1229050d13b944086ac2c51add6c63dc96c3ac2dda188dfa11a45343904e26589684ffea3a22c235738c1c6d8c38a11cd
 SHA512 
b4de4f6db586a9aafddf639ae914b35ffb0e2340ef312c64a48f4a0bfc02c573437595fc61596245dec2eac7add9f62925e575e2f621d2cf2e80262096f64df9
+DIST genpatches-6.1-36.extras.tar.xz 3808 BLAKE2B 
ba99390043e4a62ea1322364ba601440fd70079ffb98dea924f91aeb00a7add4d2402e16589e0406e66ff9e0ec7a9d0d76e0a14276fe486507345c8ebeb82bde
 SHA512 
ab4170a7b75c2617ccd5c08b7c5d84e68e593cacdca70dd59ed0b738639ddf3bbbaf6a4758728ff74026478a341782eb0e73a6a40ef9a7158f9c6221703afc55
 DIST genpatches-6.2-19.base.tar.xz 1082064 BLAKE2B 
a25100f54e9775fb220e2debd088c2d9e822e0c8e80da51f34f2372e2b2ee9a09f64fde4ab63e7b53ff1b6c5c0022d52aa7fb6d023a234ef520b3566bf4055c7
 SHA512 
bae1c063f9e624ebd935681ec7323b7c4fadecff63c2f4cd21d13731a70b549a4128c59a03e282c502bfd9b631ca6ec876cc782a90f633003dff97fc05c95eae
 DIST genpatches-6.2-19.extras.tar.xz 3808 BLAKE2B 
cd58fa1bc082b4cc6f45e1d8332921f78ce4eb8356c6510c6df2eac06778695ec98e4f68b6608bb22b66486895340595c13a9b59ed5316b3a6a8d27e86a796a8
 SHA512 
b69b534b8398ea2cf8578dca763736c6ea071959c37f4c2fcc0ff5ea9f35cee2e88637567979211d242a04f2015fa3ba6765b5e2173a9ab90c69e5d67b02e9c3
 DIST genpatches-6.3-7.base.tar.xz 466812 BLAKE2B 
830f25190bad0be6dbfd45ebc748bc5ef6075cb13466f6cec02ba075d1af98d8ed7285506746631bcea71dbab007290c5b86cc8970c02e5aad5bd37d92d4b9c0
 SHA512 
65d9ecb216c900aec0d265b849fb40f8c141bda2ea4150d93f24f84c33eedf67b8966ff50a4ef65b0a3ea0aeabacacbfab45203c73dc3e83c1f7758d54b8a2e6
@@ -88,6 +90,10 @@ DIST gentoo-kernel-6.1.30-1.amd64.gpkg.tar 76615680 BLAKE2B 
695a07dfd7a1e2ebc4d6
 DIST gentoo-kernel-6.1.30-1.arm64.gpkg.tar 69314560 BLAKE2B 
8b2cd1a41b0b5866747692ff384473b9488d8cde39224ee9d3716e7902d02ccdacf3ad1e4c3362e46f13b2c95d382d2a16e34a38eb6c5184d57bc11ac317a104
 SHA512 
99d49cee001629db6b3c187c12480a099d4357d4e3f2c606a6252ade9a440d5085778f6fa62127967405ab2eba6867039877e4e638055ffc99c07e5199a76da7
 DIST gentoo-kernel-6.1.30-1.ppc64le.gpkg.tar 62720000 BLAKE2B 
6f166db6bb269ebabe515619192c0e93278adaeec228cc400db4ceb951bd6dd84fbbff6dc23d5a6f5d61c9b2c0a88920a1eb5625998507d9a2ab693db43b2fa7
 SHA512 
fb9ca9bf10e6ee03f99d2301c8c17aad71979ae9ee12752f820db5604696bc3ab5a33f57ec1f4d05125cc047527be1d3f721d9ade936c108e1a1a2835844ab93
 DIST gentoo-kernel-6.1.30-1.x86.gpkg.tar 66068480 BLAKE2B 
94816353dbcb1c002e479a0b486860bf6fc9afedfc461f634e21fc9a2538a5f9c412f9f5ce399d4cd5360e6161a0d743fb25b4772b40105a4a2a0cec0cc09ee7
 SHA512 
535fc8b6a5cf87a2c881226682dad6895bc21cc3665faa92027e88c6653b52502398a461415326cf8e802ef3af7c22d3d3da9babf3dd7f29552422b33d716ff9
+DIST gentoo-kernel-6.1.31-1.amd64.gpkg.tar 76656640 BLAKE2B 
7bf643f5c46e77546e300ef4aa58fe67d9ebfad8a6404dbf3fd166af1f9980f473b70dfc03d1ea7589f02e59c1538627a0f5fa1731331b95c76fa44ee9f51a5b
 SHA512 
109eda5dbfa28f42d8308208bc2240f604965b21a8a2c76ce76331c9dd85823fb666b04d5113677616cd385d928d5d916e73e10fd99995019a1c91394ac92a32
+DIST gentoo-kernel-6.1.31-1.arm64.gpkg.tar 69324800 BLAKE2B 
57169ac151443e6eba0b83a7973e154eb8b43175c5ff44c796ce85726cc1684470e77a77968b46937dd44cfad789053acbe04c2886bc39375c8b652b46f06abb
 SHA512 
4a453f8a22c8bc99c6bb83377139e8d9a37e540a3ccac494762a7a49c93fee0d3c842aabcfa8e8df7a88db1a2439ca5b5165d9dfb889e5ee0780003b972f185a
+DIST gentoo-kernel-6.1.31-1.ppc64le.gpkg.tar 62720000 BLAKE2B 
de2262a2d4192e3002eb61ef6eeff85424684b3ff4f1f67ac9fd05c7bd33daa7d6b3576c5436a1ab7a7e9bfa741306e6c6f1a215f4b5a6aa939a5df9bfecd5d2
 SHA512 
f1675afd84a62c4f1552dbcdf6dd108ef5d4b11a1f7af695ae263f9c40976fcca678532a4c2b4c34485ee463e6f7c7ca7668c0ea8dd825f3a3e362839d19a455
+DIST gentoo-kernel-6.1.31-1.x86.gpkg.tar 66078720 BLAKE2B 
377a8d5141d71d8510fa31d263b98f93feb75e4cd8fad0592b386430998dc875736339fc643332039d0fd1b8ad6a5e65bf4b6f8f2abae6516090d0c5e7939a87
 SHA512 
fa6fbe87941f9ac359e9bbdec4fd87ae13749afc1d36447d9250611b73661498a6f473b6e442e5c94af3a367374560bb44459c4c583db4da219e4c44dab375b7
 DIST gentoo-kernel-6.2.16-1.amd64.gpkg.tar 82657280 BLAKE2B 
da4ae3efa4a19653432054d5d260509ebc728be136a413d61e700ca2fad1a656d4322621c03434fdd6ebc1433b2148332a089f6e6dbf9c7d60131fde28a874e9
 SHA512 
5f48a3e9979a2e9879c3df355194116a4d612a17853d36b0392e5ab41f194982474885296f5afe97a2e64224b055331da68fe696af60970798b67a91b53cd1dd
 DIST gentoo-kernel-6.2.16-1.arm64.gpkg.tar 71813120 BLAKE2B 
9675c1545cdb1be365591bd54757eb3f1ab9df7cf573c0ceabe5971b8065c587b2f39098530a3085a8d7583bfc92601ee571d17fc38bc012cc22234e32d964da
 SHA512 
6d276aec4ebcd53d6d62882e6fa1f453192891433348b87c259a34d40f2ffd6aa692e945a14802388f8789f1ca8773d9dda6758b6e147eb51bf5aad166f64c1c
 DIST gentoo-kernel-6.2.16-1.ppc64le.gpkg.tar 63928320 BLAKE2B 
4e068dd011162ae70d3456652bd66745bfd5981ab065b67a3455c8c4a7dc5f16ed5d53b24468f113cb3012e9d653cdfc6c580b6d8f1a322d9782915f9896f9f0
 SHA512 
ec96651688940c9a6912055fd2dd43d8dc39bafc7efa853c843b3a279db8d482b96a241ea9089e38beaf4b72fc401a31dca68d9759c3a3eb03f8b7491e739f1e

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.31.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.31.ebuild
new file mode 100644
index 000000000000..623c8b8ab75f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.31.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+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}.gpkg.tar
+                       -> ${BINPKG}.amd64.gpkg.tar
+       )
+       arm64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.arm64.gpkg.tar
+       )
+       ppc64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.ppc64le.gpkg.tar
+       )
+       x86? (
+               
https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.x86.gpkg.tar
+       )
+"
+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
+       app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+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 "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+       emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+       kernel-install_test "${KPV}" \
+               
"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" 
\
+               "${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+       mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+       # FIXME: requires proper mount-boot
+       if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+               mv "${BINPKG}"/image/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