commit: 42eec240c910fd59ad2e661f5ffb7d7a2eb7eedc
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 06:50:22 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 07:06:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42eec240
sys-kernel/gentoo-kernel-bin: Bump to 6.11.5-r1
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.11.5-r1.ebuild | 182 +++++++++++++++++++++
2 files changed, 188 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index b1e044375f03..827617b2dcf6 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.11-5.base.tar.xz 531212 BLAKE2B
c9e98632ebd2e74f59dfee66d13f9e
DIST genpatches-6.11-5.extras.tar.xz 4056 BLAKE2B
a09e9802239237005410082eb6c4294a13cb3d415be4bd83aaea52ff37f472d4ab743fda02c8cff76a12e232044a91fe2ba83e0e46055edf28a5f473cf7f863c
SHA512
3556b2f09e4f9e328bb04fb1e40b26038ef98864741b517f222c98fbb75975b34ce5d091df571f4e65b707fc8a74eb395f687a20f9f8ea0d617c4c8ccf8fa288
DIST genpatches-6.11-6.base.tar.xz 561884 BLAKE2B
8fd4ee418b02f2dad7e8599477d03dc56b7e3ab8752d9e73bec91e9f7e01d1615aaf4d14b1091314bd82a15ff443b16d3cb4be58c4a46f33a1f95ff8bb85d82f
SHA512
109f1e9e562eac0c606ef621bd2ebc4bda96a26002999765e31551edc6070c46de6c24dc4387389f964fdde485aee0048e01bf5189997b84111334c2f239d5f8
DIST genpatches-6.11-6.extras.tar.xz 4056 BLAKE2B
7884aa8796e7b79db2b0db6aff5cf02119ac092d95529e0d0ee78ae5458faddf4fdc288b222f3126bb40749cb2ebb7bf2ac3fc6f77f1d2fb46d53b4b62b75c7e
SHA512
b7c927e5bf90be5afb0cd479d385c7170316cf74c2aff136ab966734c82e6f4a1791a12124c7a73065711ba22f9260a3094f2bfbc8d0674ba46c158b2e147774
+DIST genpatches-6.11-7.base.tar.xz 562312 BLAKE2B
80227e573f63c6356c846fc1608ceaf336f209887a00e95504125298b24c3497a44fe53f7fb231b1cc2f0cdcc82a49e2bbb8496e16f182ef4884c7da15c62bae
SHA512
02441292bcfa15034f7bbdfc7c92b4c0e583208cc9c94f20c7f0edf4c18cb56630de0e888d5ec208c15ea75f03f8194bcf8b1d2ebad2b5e38f11632289928ad3
+DIST genpatches-6.11-7.extras.tar.xz 4060 BLAKE2B
073ddb98be6a0ea659f5b494574f0c004ad9342a6ae9bf6b2c46ca83f44f10f8cb02a6df3b7f054d9828dac5d5488d3920d21157848cd85340a0fe7c9dfb34dd
SHA512
0b0b41516a7e47fb93ec819e90cbadd000b9615445dce61fda136028788791803f5681caef5e8e86c536063979dddae36d7c8e473a40fa1f65117f7125b1e5c8
DIST genpatches-6.6-63.base.tar.xz 3551092 BLAKE2B
8edca00c49096ef4682038389b19e312773d3a56e29a03527e8f39ae835243193e2afce6411e0f1404af899793e766e108134d990dc666f15eebf02d6dfe6475
SHA512
0b51ff04cf01262502c3b1651288a87f235f3c1f4cf8b92699161353ddd75cbaecc27b8f2838375d77a4cf99a746a2175eab6fb0d23fdea67a6d4e9b89279ca3
DIST genpatches-6.6-63.extras.tar.xz 4056 BLAKE2B
a7a361bfe180362510300753b3fea12bb0ec1014a3b7307211931193672db1216abf994ba8cb22cf365221202dd93f4b49fff6970c8eb88b7a77ef7bd02d1f12
SHA512
49574eac90eb749de544afaa7102163607bc24e2214ccc3c84cb6bf8f60773c45831da93bb5598aa4b933f65455228649afcba6d93107a81a666828b0919b18e
DIST genpatches-6.6-64.base.tar.xz 3582172 BLAKE2B
e607e40b069b41983d461bdf9e3d6cb1bf53f6bdedef80934da3feaf7760ecc01fe77ae76980351e56d3358cbca8ba514b83719a6943b3ad3582bc5e1f55f949
SHA512
c33db1d09741c996c3e63253e24cd06e0b1ddcd66c602007394c2f8bf1800d5144fe6f27643954b004057cd2056d8e353a5aa67456c1afbdb3aa23e540a45792
@@ -50,6 +52,10 @@ DIST gentoo-kernel-6.11.5-1.amd64.gpkg.tar 291379200 BLAKE2B
1818d5fdc811246b33e
DIST gentoo-kernel-6.11.5-1.arm64.gpkg.tar 268431360 BLAKE2B
6eba8f276fc144630d94feea9d83cdeb2ec471cdd991a3e7b18e2baf1023be6c8c5343e8b05027de14599253232b0df170e6907618a26d7e89c8d3414eda0d70
SHA512
bf076a390c5c944b58b8ef0c05169d88435396698128a8e842eb79d5bd464d5783e50ed4a644aa14d3be7023fe4805b23ecdc095cfa11f7d0331be53229f0b84
DIST gentoo-kernel-6.11.5-1.ppc64le.gpkg.tar 72806400 BLAKE2B
ea08d468ae1bb56cf93041ca10d08a0fc1883282e1f706851b57c43f7db4e4aff27ebb14d510940a755452d3786378759aaef7d98cb4616f5332976846394e51
SHA512
fd8c513541daa1b2133e3bf1047bea86d33670cb002284de4d8f7300c876f207b3561209d13db47e550775dcbf306fb1615ee541394c7efbfddda8c9c49f1fb6
DIST gentoo-kernel-6.11.5-1.x86.gpkg.tar 76472320 BLAKE2B
d9d6caba32588111f470e0d42648916730bd58cb27d83f9c7f53e38e5fc881ab642a1dc5abf6d50cc80e059ac95f799ccbeedbb6d92fbf843660704e2b32d1ec
SHA512
9212ff8926b0fe712973902a900c53b22d7baef3075402531bc0a7c2b4a15e1b4aac0ca3fb0132a0fc10e96762f98d0e343dcf79c69e5a20164f708afe547fdc
+DIST gentoo-kernel-6.11.5-r1-1.amd64.gpkg.tar 291328000 BLAKE2B
9c1ba7d9cf2b34577a5fb2235619d0ee4cc35bc47923dcb6593c080caaea5ce3d0e1e9d31454ee7eee3417d30fd9a6e288667434b5b799180d9439b93a2194ec
SHA512
73355314712a784bf44f5b1486eb929cca45c1643c1c57f8d81a853218fae27752106382e364a5ee2be7ab05dc6745ce81b118bd730a5f24538786a90f1fdf80
+DIST gentoo-kernel-6.11.5-r1-1.arm64.gpkg.tar 268390400 BLAKE2B
946224df401b5c18884f5bf10379862d2536c672fc7962f0f83eeb1966d897479383ee33a42ef692ef4ad4bef9a750740bebef36ccede5c4a3673635a4aafe0a
SHA512
dc7d31cf8387ffacb370ce6db1bf830549c59e7cac744958b353062cc9a143370b80232070a9a32d324f9698f166f81da83fc1d93ac6e8dff103c61a318319f3
+DIST gentoo-kernel-6.11.5-r1-1.ppc64le.gpkg.tar 72785920 BLAKE2B
9865a9fab8030c696d8f84dcc471a9bd8432e6cd603b23e6c5e0fd181ae06b8f76255603d02cbe2767fe2449677be80ec4f0488987f56675df4e3dee41ba4a7c
SHA512
a3971900701d743619127eaf8b9072e0c6f0b188e744de4433f3edb59f80adec69316682e3e2d2d787c26f891664bd33373d837eb7e205a0219d5602588181ff
+DIST gentoo-kernel-6.11.5-r1-1.x86.gpkg.tar 76482560 BLAKE2B
44f4af75a2daa8b1433152c8af8e414494b5d23dc9b11aca22529a10c6c28b43350cff31c6420dae0f6df5e8382d41f580f5bff5b05c9c14cd23516d44e8eba0
SHA512
4a6d8ce4e25d541de1096ec2ead561b3f9d7115db7a76e539fa395e058d19adbbf1b59c24380534064f3114b9797d398447c1a5dc2b806217f0bd2c765295837
DIST gentoo-kernel-6.6.57-1.amd64.gpkg.tar 264243200 BLAKE2B
6929ae1df44f7ca9ded205e42ded2f601f6252adec0cebdeedf2f4343a2f4d62c904ffb1b1c30b948dd5928d00ddea93db1382de1e06e8cac71749dc3120fb9b
SHA512
a55c92d767adc3186e25d2ea652432f2ecc900e4c2d7da8c83264cddc4661aeb4ccf7c1bfdb801cc53bb166a900ed2045120646fc9018fa89de9d97678827dc3
DIST gentoo-kernel-6.6.57-1.arm64.gpkg.tar 241264640 BLAKE2B
4f3d7c7e1f4027361bb2705e12bade25342e4b38ff933e81bb4708f6eb77e7096da69912a86c12e2e5ed3cacc1c9fe00cfe31ad4e8d46f2fd406c4fa8277eb59
SHA512
68ba3e5736dc0c98fbc8c14b75246063710f504d36cd7aa4ff4c7a7161d0120a67ea0d6d3b5e7162ea734d959b77398396e7b00a833f6056f8ef94c98ee8cd6d
DIST gentoo-kernel-6.6.57-1.ppc64le.gpkg.tar 64296960 BLAKE2B
d679aebf79ca62f5ff7c01bce794067d74b53fe7b60f42c18a644039fea55ba4de95c2f4a75060d38f276353c037575cea6c98668cfd1ff3adcc26f12dd84973
SHA512
73c659ace206fdbe9b4abf2115670afa2416e36c489f45e332cc8fa136f889590a329acf959df8381fd59191677799b6ff4469052a0368d8c11d5bfc12b9107a
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.5-r1.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.5-r1.ebuild
new file mode 100644
index 000000000000..b35a3727e6c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.5-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_SECUREBOOT=1
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+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/-2/-1}.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}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+ app-alternatives/bc
+ app-alternatives/lex
+ dev-util/pahole
+ 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 HOSTLD="$(tc-getBUILD_LD)"
+ if type -P "${HOSTLD}.bfd" &>/dev/null; then
+ HOSTLD+=.bfd
+ fi
+ 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)"
+ HOSTLD="${HOSTLD}"
+ HOSTAR="$(tc-getBUILD_AR)"
+ HOSTCFLAGS="${BUILD_CFLAGS}"
+ HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+ CROSS_COMPILE=${CHOST}-
+ AS="$(tc-getAS)"
+ CC="$(tc-getCC)"
+ LD="${LD}"
+ AR="$(tc-getAR)"
+ NM="$(tc-getNM)"
+ STRIP="$(tc-getSTRIP)"
+ OBJCOPY="$(tc-getOBJCOPY)"
+ OBJDUMP="$(tc-getOBJDUMP)"
+ READELF="$(tc-getREADELF)"
+
+ # we need to pass it to override colliding Gentoo envvar
+ ARCH="$(tc-arch-kernel)"
+
+ O="${WORKDIR}"/modprep
+ )
+
+ local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+ local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+ local uki="${image%/*}/uki.efi"
+ if [[ -s ${uki} ]]; then
+ # We need to extract the plain image for the test phase
+ # and USE=-generic-uki.
+ kernel-install_extract_from_uki linux "${uki}" "${image}"
+ fi
+
+ mkdir modprep || die
+ cp "${kernel_dir}/.config" modprep/ || die
+ emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+ local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+ kernel-install_test "${KPV}" \
+ "${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+ "${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+ local rel_kernel_dir=/usr/src/linux-${KPV}
+ local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+ local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+ local uki="${image%/*}/uki.efi"
+ if [[ -s ${uki} ]]; then
+ # Keep the kernel image type we don't want out of install tree
+ # Replace back with placeholder
+ if use generic-uki; then
+ > "${image}" || die
+ else
+ > "${uki}" || die
+ fi
+ fi
+
+ # 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}${rel_kernel_dir}"/ || die
+
+ # Update timestamps on all modules to ensure cleanup works correctly
+ # when switching USE=modules-compress.
+ find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+ # Modules were already stripped before signing
+ dostrip -x /lib/modules
+ kernel-install_compress_modules
+
+ # Mirror the logic from kernel-build_src_install, for architectures
+ # where USE=debug is used.
+ if use ppc64; then
+ dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+ elif use debug && { use amd64 || use arm64; }; then
+ dostrip -x "${rel_kernel_dir}/vmlinux"
+ dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+ fi
+}
