commit:     182ab7632fef083f671bd664a74057f1bf339d2d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 13:22:35 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 13:32:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182ab763

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.1.99.ebuild                | 132 +++++++++++++++++++++
 2 files changed, 138 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index ad9b96635a59..fde33e8f95b0 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-107.base.tar.xz 5516960 BLAKE2B 
a4c1128db49bc5dec2aad2999279
 DIST genpatches-6.1-107.extras.tar.xz 4052 BLAKE2B 
e37572e0575345470b87d07d8e3a0a7e8f7284d9ebb987152232f5a09c54508da833d60982cddce2fe5997e2791866b61a07555f631ea75c130d094bb5ed4925
 SHA512 
b0f2f6758677b163da436205f7493932aa925854446dfe1f687f829b0ef2d53b371992bf2001b217a0b4ec6c236a99833c98f168b877df45aae6819e39d0598e
 DIST genpatches-6.1-108.base.tar.xz 5541376 BLAKE2B 
59ef9110b100cf6064c6c6e556bec827138f44dd636d55a976a1ec4af4699f95258962ce272867a1bf172b6a2e1d4f7b25025d5b6c48c9c6c7a6d8f13834b297
 SHA512 
f250359fd14e11ee176fedaf8bff84a553a7cc559e56c29fa2b6e04217d4e1a63b072e1c73a021a527e37101704b99136e06e008553220d7a35eee3848aadb90
 DIST genpatches-6.1-108.extras.tar.xz 4052 BLAKE2B 
b6ad898a5a66a1a6ef293bc4a4a886ea29f0a1f985b3b85beec7c4e935e90ac9f642e7811261e413cc39b5a0ae36fd257d0afeb4a9c52aa29956070b4b52c50e
 SHA512 
6fbabfbcd35db0dd77da03c138a6a225f7255cc3566007368ee759ce154f23f11edb8434be82992f153deab19c6b5549d00a7cfd54c4d0e49eaf2e4d39b86597
+DIST genpatches-6.1-109.base.tar.xz 5540948 BLAKE2B 
b6fdb5f6641ca8617c976f69bb731147ae1d1d24f1da6686ac8cc2a1a9775c2a3c890c24609042617b9397a9abdf9abd6806fa5933e215de1dad6d0f67277a5e
 SHA512 
e2f0837a9b5588df44a1936dc5dce2c1aeddf1d56795600513aa22a08195da4c358935e7d347ec09d4d25aa5db6c5a036e7a718bfc442796c4994736c6dc4daa
+DIST genpatches-6.1-109.extras.tar.xz 4052 BLAKE2B 
562d5137c87031ff9f43b4d081b26b35cf4bd3c5fe074ee826edc8ece2ed074eeecf55c8914ca728267a9f78d907a51354c3688186d442d9fc02340224a0c71e
 SHA512 
0370a5cfd83a1c87828396e49f003b29fc68dea1568f6de417fe488aaf045e349f0b84695f3643ad9811b4f57ef31237ffb9a97c72294139aba94557e1f67a18
 DIST genpatches-6.6-42.base.tar.xz 2474752 BLAKE2B 
074b24c3848ba0b2521d364d67222ab324cfacc3036b2c3b9ceebebf03afcf21d963921841f6f987422e904be35653f9dafc2a795ed6eaa050d6a37595bdd111
 SHA512 
6ce7c93c92a5f2951c9a60b7a058560dec8c3f9c16f00ac4b58c23f88ceaf9cbc519653320bc95f45039219eecb068247f3c27ac448c8695ed8c9e93022fdc37
 DIST genpatches-6.6-42.extras.tar.xz 4048 BLAKE2B 
0d86f11ef43c33b1014423a4417be73e4ace2eb5d9c38c7a63e8bc424eff7399137239138de1b89a70247f1b174766c9672cb05743aeaa14ea66d8bab67593bc
 SHA512 
5d264209a734c4cbc48dab228b7d8570b735748b1c01f80beb2803dca3027ed78303ff937aecb1d8e3e6f2e2d4722aa0c1b5c77a4d45f2a9c53cfe1c0ac0affd
 DIST genpatches-6.6-44.base.tar.xz 2571884 BLAKE2B 
117eb333385bbff1ec4056dc9fd7374260a33f243fe20462b914eee658a57b90e9115e9edbf5c8935890ddcfb233eaf88b3e0062245cb838953749c8bc674376
 SHA512 
e8bad736c8566bbdc081600305a4014301e4f6f74b73ee68efd818fb92e2d49bdbf0b7a2b66c5cd5aa8e56e7d183aa03c2a02e7328ba7e0c71fa1646e6868cc3
@@ -54,6 +56,10 @@ DIST gentoo-kernel-6.1.98-1.amd64.gpkg.tar 72581120 BLAKE2B 
ec9979a8fc1eecb03b46
 DIST gentoo-kernel-6.1.98-1.arm64.gpkg.tar 65546240 BLAKE2B 
47f3cfd2bf63f7c25ac263063f75486eb1a65b5bc805ee8640c7867eaaf394e4d8394b9990f49b9d54edfeab93ee67dc7326017db707efc948fd9fbf21f09998
 SHA512 
31d27d4f87383169cbf958b7fbe0255217dfd8d018a8641669d37f9dd3a5813fec575a4a9ce51e5bce9c7ae55c7ca7fdb4445fab7b696a92c06c69ea412cb038
 DIST gentoo-kernel-6.1.98-1.ppc64le.gpkg.tar 59791360 BLAKE2B 
d07f0210f6ee255804c97681f3a1a4cb13492dcca3e83b416c26574eb6b937614859595eaa6513a6453427d34c47e77f12b0faf2f50d1b1d6088bd5842bd4380
 SHA512 
034e9971aefd8e5a4f40e876fa2b937c94e118bd52e2c7bcb90bc4a09e2da84caeada8a00ddbe5525143fbf7378f27a77559d02ab72297431212b0decea67b3e
 DIST gentoo-kernel-6.1.98-1.x86.gpkg.tar 62136320 BLAKE2B 
92874aa93688c90c95ce4490004b70cc87e6d3f99370aa7375a0e165ad8fb3250bac1b2d1833c8bd0465572c7049244036afc9d23fc0863e75785e484fe02b63
 SHA512 
690a3dcd2e9c8694401901b8541e42ef70a54457a96ba516105d011e9be79657f60079073eebc70f880ebfbece4ea7a3e54f5918a38d40a302d2ef5bc906f6df
+DIST gentoo-kernel-6.1.99-1.amd64.gpkg.tar 72591360 BLAKE2B 
6fd503939c44f96e3bdf3ecf37851c1611df52f8f54e2c3e6699d158ee7a1f2f2a5b261564d3d4bdfa117fd2c35b4ad10ef05f65a88a5e9cabe579017bb2df60
 SHA512 
d114de37bebfdd0b28b6e489c80bbfc8b3772e862e0ee96421a888bb59878344672450e5f9598d425d3e3b4de0ef52a89a591b52ade7e2ad4e74169c284db3bf
+DIST gentoo-kernel-6.1.99-1.arm64.gpkg.tar 65546240 BLAKE2B 
0af7321ddaea5a9b7d4d869adb3740b036e67d25e36bace334637951d10c41acd9f0232037591dc5c1e0585261349b5a1503bb2e9a1b5f7ba7548195b43035cb
 SHA512 
47d63299f0ffb62dff610854c9099826e62a24a1d61a4f0e9db38aab1622121c647d514f295cc01cfc98152ed8159b0001a8077b484dd3d668500b052d58a918
+DIST gentoo-kernel-6.1.99-1.ppc64le.gpkg.tar 59781120 BLAKE2B 
7b986f04225db692031da3ae115c911510631cc6601d76a336954197ba3e0bfaeb2c3ef338eca34a64d95aa6b901ff96a8c06cd4b9af348813b7859b325b7a72
 SHA512 
5b2e2da18d64599b2418efc7e0d56aba57af4462ddd1ce0b691e07f5c08f249f02d9e5989f261b3b4836ca43a9eab20ad710caf4ed7639860cbaac1c4de268f4
+DIST gentoo-kernel-6.1.99-1.x86.gpkg.tar 62126080 BLAKE2B 
6280c49eba83e32abfb9630139f5291b88169410b1e892e50d82b34a3ec60ff8a33a0160658ff196133bfd19cbaa959f818186dbe0458f3407bc00ac5924c824
 SHA512 
674084d5e25c0e93f1ca0b7d61e224da5c2036951cb31d520abbfdf451a67cea4b09923211579937420412abbaeed6226b0029676fad4ab5b55504eca218aed0
 DIST gentoo-kernel-6.6.35-1.amd64.gpkg.tar 147220480 BLAKE2B 
45178fff1c0cdf75499f735666eb89ef0a6248ab6182b3e4e9d85688aa2eca5322310363038f64d1d932a6fac244fb16d64b05b146471fa663f6f0350c647832
 SHA512 
91f81fd1ffc6ed01bbfc94fe52395c8c5f3bc10c7f7445df2c1d6c982c81b0154ea7638c5322089c2119363c8a810498b111d6e9562e6de7ce0672a41509e95e
 DIST gentoo-kernel-6.6.35-1.arm64.gpkg.tar 119214080 BLAKE2B 
3342aba4c25236a26179d92a24938ff96c771c6b2da0e3590c37a06a5516d8005a7ac97fa076dcab8191abd2d8b07813b59b4f48fc71e885de2714b681e8930a
 SHA512 
183c5557d19e6690bb02eb5f55bb1bd8bf16bbda9e69533b84d00c61d75e4b62d66842c753f4a9a8294c8e6127d428f3958f7d14661620e9c6866862546a73d3
 DIST gentoo-kernel-6.6.35-1.ppc64le.gpkg.tar 64256000 BLAKE2B 
89441b1e5b8b5de47e2e1b176e3cc51d1a4b19b8d7200c5168d40a3268b7e5a8b5af2a858ae567306ae2e4ada44046a55a72a1dfe7a3c6133592c897f2a28d77
 SHA512 
38a106716a3169e9a316d458ae541069594b21c494476876aa99661c3061f34e62ace80e2ed6028111790b9d504788c5b1c8a7494ee8f9b66b6ba52f37864896

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.99.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.99.ebuild
new file mode 100644
index 000000000000..81911930d7d6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.99.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2020-2024 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##*.} + 10 ))
+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="
+       app-alternatives/bc
+       app-alternatives/lex
+       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() {
+       local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+
+       # Overwrite the identifier in the prebuilt package
+       echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+       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