commit:     beffe9feaf250d84460f14071f3e977bc9a52fb6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 19:10:32 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 19:12:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beffe9fe

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 9748914881f7..430c36e4d589 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-6.1-27.base.tar.xz 1321772 BLAKE2B 
8d46e2a7c0023fdca7f30edf56f15
 DIST genpatches-6.1-27.extras.tar.xz 3812 BLAKE2B 
bd1f13817906296ceeb943a211abfab4dfec495734ca97031ac901c0b8a644e558d161d843e2e09810f2d39643adaf687ad2c7b5fad78167b7bbcedceeda0e94
 SHA512 
4d6d2bb3a722a1c82b324ab4924a1c2a6b6ea6afecff19f1ebaeb93c542efeb176130f938d7a613c4e11ef809ccd3abe0b4df8c358ce297b5662b36c3a06dc25
 DIST genpatches-6.1-28.base.tar.xz 1412456 BLAKE2B 
126c74e7558efbfb104e97e993a70b628fe7882d756ef0ef29031b042651a8df3e2e940d31f85556453cd391358421594f9e089ed194e14b107932a8d525ddf2
 SHA512 
b033d8b873b0c8ebdd89b25dd25a814746b1debc0f0944da8fdc2ec9ed1da3d8d45816547119f7548ac30a91003c3c078a193875711d7839e4de71234192ac6d
 DIST genpatches-6.1-28.extras.tar.xz 3808 BLAKE2B 
3bd49fb256420883a267b2513cc9e6928a107b0142c82d9abd20114f733bfcbd474eeb19a7ef833da27ba625db28806ec25a1dd945f5d94f5bd5f729e445a57d
 SHA512 
06c84adf52e36357fd01e8e1989ba8b8cb08bef052da05d261df3e80aac6d2d10a3c39583fad6d92936e19d8c7484786a4d11f64f2dc3fb5f8e1ee90106d6367
+DIST genpatches-6.1-29.base.tar.xz 1445804 BLAKE2B 
fb801efa1f48c9ff3362db22c218faf203dbc4171ee77f4539022c8f86ccbee65bb93c36e9796411dc997531dcb0b6c3cd2420a1b19ab5219fe92bf15ea3926a
 SHA512 
c1797b202639b831fc601b6690fac85b91c1dd5dbb1520b243a5a2ed9bacc0b25f6614289b08cc5338ac8a66f8832a68a07b24ef327281c2e3c27e532a430d41
+DIST genpatches-6.1-29.extras.tar.xz 3812 BLAKE2B 
d77b52859028d028d6f33f7bdb26589ced57caf84c6ad5c0716f6fa978ff6a1c16518bc4ab06e76281ac486d7a5476878e408288b3ab4c55f8daa0a46a907c31
 SHA512 
3eee3d165bde6fc820307dc7483f228c7774237df8b5ddb0e5089b0f76fd3061a0223f2b1743f38f9facfb41a78deef0256ed4a9514431471265bb86ab64631d
 DIST genpatches-6.2-12.base.tar.xz 611100 BLAKE2B 
9e3e50edbd85e9909351304b292de87b74f8adee2a99a2d5c6f858ee195e8df08772f1b1167899b52964b3d7a2595628d0e0e6c7e6dcc79f53b88434123ca308
 SHA512 
9923a3d4fa2f2310954b9d803784192b0367c286880c15af34e63c660ee593373a51d23561be0d1bbec15d39f1b57b345497f5cae3c73535c1caa8e62b8f43c4
 DIST genpatches-6.2-12.extras.tar.xz 3808 BLAKE2B 
65df0f1a93ba2eda0ac31002f723d5b730c6af33dc60dd8a6f942a6a0276feafdd12463017164c5b782c031748829d812079290533268f8df497a8b10e1ae4a1
 SHA512 
f91ff719f6cde159026bdc4a76432bd195933d34dd3e7cb3ef0a2dcf18ad6786e2a4f8bab423b1b1d19ace3513c02e048a491f4ca76f37bd211d5579361bef6b
 DIST genpatches-6.2-13.base.tar.xz 700552 BLAKE2B 
53187881831a5ee8ac1581d78d89b56d5e6cbd45a1267f294312fbd648818530f029280b6face5c1c7f7c6d2c13c5e3fc6d1747f4abea8b2065f960a42a45d2e
 SHA512 
2ca287f97bb3c01291eb5faa1de40827d014547e2cbb5063e77597e027f58672a262bcc51f1f2111cb5621f75b59c61a3cfa40f30fe8bc923136f8de3dd3e1ca
@@ -76,6 +78,10 @@ DIST gentoo-kernel-6.1.24-1.amd64.gpkg.tar 76666880 BLAKE2B 
798d538c0877b7dfad58
 DIST gentoo-kernel-6.1.24-1.arm64.gpkg.tar 69294080 BLAKE2B 
93de0b494daca195ea8b4fed646b82efcaefecbff4f6ee0e30aa94d1eefcb521fae0de6eb65ec3ce04da5f619b8b07cf2544b3e46176d5a45c5eb03fffd41d47
 SHA512 
3ed12ddf9c3b3b7afb60cb55cf4a0ce5beb1bb16719ade4134800d917acf472bb89b6ab38ceba6a19a14ca02e6c48abbe68e7b72673132171301265ef19f42ff
 DIST gentoo-kernel-6.1.24-1.ppc64le.gpkg.tar 62699520 BLAKE2B 
150beeffbc6082aef7502f54ac860a1fbf4e77f4596e7bb6030d996ac4554c9be37a4476827005278af8aab031cb713fd9e2dedfa72175b3f43a52cf1dc98d01
 SHA512 
c1ce12017195ebd5314d3157e8d8ebe8c4ff323e9f2d4ac5add9b9eeca3cbd24a873d0a9d33f6edfd98aef41b66f4bca61de95dae1c9169be15d10031f7f2170
 DIST gentoo-kernel-6.1.24-1.x86.gpkg.tar 66048000 BLAKE2B 
30cec8869bbe3219aad3538300c546143992849925975914212a2c81a84123d6af04f36fc254bba4e2bc13ae13ed400e9d03a5551834dc6b0afccbab340d6062
 SHA512 
63f1d12fedc01ee87a46be2ba64cd59c32dfbf2d1d32c684d747bc32d1337016c5104454ea3040beba7d97bdb3e5c6d425ed8f1b8af3e730a656d772d93d07e0
+DIST gentoo-kernel-6.1.25-1.amd64.gpkg.tar 76636160 BLAKE2B 
3071f21eaafe1873a7afaf8b492bd728f16230e54b476d9868b742c903d361d80b2df161e0b4a074c764c8ba133ed862a5e276cc7628509d3120314f33e72dd7
 SHA512 
f3ff9b18daf93334eb673d6896141f60429a07bde4a79e53b3e04765075e6366b98a278f99a2d4b58edece629f904a7a45671c75c31b5b8a6d17f06093a55029
+DIST gentoo-kernel-6.1.25-1.arm64.gpkg.tar 69283840 BLAKE2B 
15045eacd32fcd8219e143d5410d1733fdcbc2578d6d06423bd7700762e4d197e42292cf1a1aae514541ab4c33120afbda280376cf18c0643646072b387c45fd
 SHA512 
8c556ac01898a00a87d27552c73ac2482eea3b5a8ba1a079f1c13a5cf569b0dbef60616092739b906d578a240222bafba7a6fd7e9007c1c5529f4b7148b803ef
+DIST gentoo-kernel-6.1.25-1.ppc64le.gpkg.tar 62699520 BLAKE2B 
9225901a6c53b2b9c5e38c6f507515ee35e435daa57b10cd8242d0a04bab54b57e0f57ac205b42e5e630478d74013d5cce6bfa306fe6f3f7e74502678f92a727
 SHA512 
653e19f1aa683795780c2d7ec2b0887c5ffbc72435e0529e97afa71d8cc33ca9ff44898c9acff688658b9b755837b94063451322e9f45bb83232e31477bcaebb
+DIST gentoo-kernel-6.1.25-1.x86.gpkg.tar 66058240 BLAKE2B 
0523f3c1fd6617e41eed43d2aca701468b2e10b11eb8bc4aa316b81c21a8994e0a7254b84ce7a177a2aced2fd15c8fb1c53fce1ecd68efc4fe8fbd502f0ad2b2
 SHA512 
32c8eeb557d1ac2c2a76d6e48928eb4d17bcbbb5148013d34be06434ad59600be7a86b5500120989876b6868a62df5681ab35524a0cd9efbdcd0900db56fe49f
 DIST gentoo-kernel-6.2.10-1.amd64.gpkg.tar 82636800 BLAKE2B 
6440affd0e251a896be87495f30e9646922a94184b0729e0126bbda082745de40284b2f0a84415918e12417e8825bf9d65ccdaf2d7160dc75672c532dc84b73e
 SHA512 
e47a997c2146339cd02794a2b653bfbbc423bfb20e5ce2cb50278229cebced5f4dbf2e68c8d6201719154b57e43a5150017107274f14726b10c4602b53a66951
 DIST gentoo-kernel-6.2.10-1.arm64.gpkg.tar 71792640 BLAKE2B 
63a0e205036ef45b1d661e8789cf311ac6de4c105e86d9bba93e062e2a8e8b0e15c7944b57c3230d584a870bc64400bee44a91b5e945c9b8f2ce37eff1148798
 SHA512 
055e64da90d7b97358656898aa9f718382da3006220ea96e4a9c769ff8c057926b17d35770d5145e83538d6cfe5a39fd6549a1d415e3516efe2cde71937adebe
 DIST gentoo-kernel-6.2.10-1.ppc64le.gpkg.tar 63907840 BLAKE2B 
b34e7d2d1ad6f95f04c492ddf3ff13be45c38ab53cff33dfa9d7d9685594d565f8e9a7346bb5116bc0065633738bb711c2bd052a2e88617a7f632b534bf7e0c2
 SHA512 
1d0288d6d838d3fa8c9802f2c9e5d519e6f464f537a90af54c195c16e7163aeddd34abdb8e3a36b50d34e5af762dd14d5aa6ed0de44459457fe712242aaaed74

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.25.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.25.ebuild
new file mode 100644
index 000000000000..d46d51864fd9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.25.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##*.} + 4 ))
+BINPKG=${P/-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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~alicef/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