commit: a8964e5b224138623525656c4a75aa67cb924cce
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 5 17:42:58 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 5 17:53:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8964e5b
sys-kernel/gentoo-kernel-bin: Bump to 6.11.11
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.11.11.ebuild | 182 +++++++++++++++++++++
2 files changed, 188 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 893ae3658832..903295262653 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.1-129.base.tar.xz 6480240 BLAKE2B
4b33131d21859d29c47c54913e87
DIST genpatches-6.1-129.extras.tar.xz 4060 BLAKE2B
494c5a4ea4fb9d1d508442a445743fdad40c7d5d6a69403ed86cc7ea70e488e9553f96db367bcaeb2639e7615ab2ebae587ac59f5e79f61b1dcd635e8b145f9a
SHA512
8f96c279ff1a22ee8227fd06505d475eab7a6da06279b9a2aa850a8445da657c8ea589eb7d2fe6389cba0f25f3e797a3f7b23deb53b6a95ae4de18974461bd70
DIST genpatches-6.11-12.base.tar.xz 809756 BLAKE2B
16a87065f9bef4016c3a19cc4e4ebce8b1dca6b6a165a36f73b5e10737a6df325f2649c609e7cf6489f683c36e52626d21300acad383df486cb866a413416ff7
SHA512
fa57d9fdaedcc5ad31d685fe512cca89f1a8a8fb097001ee069efbcdb9c377000f154c3133757e19cb7d3fe79ae54d996d1720e9eb70ba117f98c935509b3617
DIST genpatches-6.11-12.extras.tar.xz 4060 BLAKE2B
69daca4ed6c2f293f04ece77003f2040b7fbe3a28b80eaa3e7aad8ac65adaec303b433634106b5041d597c33163624a447bddbbf889121c9b917d987febe0bb4
SHA512
33db2d06b7bae72153d24d7dbb21a7459f2010ac9176ca4c3356b01c933f3d61379fe2c307981c66433d3a997d059cb3bb2956d8fea8ffffe7eb0c33bd4b0a5b
+DIST genpatches-6.11-13.base.tar.xz 1057764 BLAKE2B
af456ba89688ebaf57a0921c3046c4db1d5a83ae5133a5b4721e7521ad72fa2d6d0e44666b22b4b0e3a05c0ee9b45b27a528e8f5e64282d8e48a0f1bf14ac046
SHA512
911558be25d367062afd84df97a3bf01e32fc976c0492c9dbd8010b3ad3d6bc1ec3c14e9d2322bbcb7f7da0eff54e1d0ef0dbb822778e869cf5730602508d433
+DIST genpatches-6.11-13.extras.tar.xz 4056 BLAKE2B
c03fd34ce154442a7e5d786d554a5996dd90ada4cc302aca88a00573e4eb3ee4c5cdbe765aee0cbf1a874b5be0dd2f03bde9d50da53f3e62dd0e3e9dc0560a66
SHA512
d8b42dad1b61ea53b83e283fa0abd3cbd6e28f062047b51b3fb0339f1fea650d0ca386ad5848e9a6407006f886f1ef6107f79c179096e63bd968828428aa7652
DIST genpatches-6.12-2.base.tar.xz 6548 BLAKE2B
6872ca3238aa7b9e811ce827260330850fd90bb3bb48abe7a06c5fd36acfff7ceca5983aff7cdc82da2396e27b908cb737ab77c5efc9603d03193473236ef634
SHA512
baae1ebc693f5eebb308d35d8e6571f5f00e95bd98e4aac9c84e6fceffd051b4699762dc5c1f1b02231126e7c4bafbb352e4aa011cfa71d9b0ba84fbfa766536
DIST genpatches-6.12-2.extras.tar.xz 4060 BLAKE2B
ce854b442562d86627eed172c94d6766ed27a29e0c7cbd240ec7b18b3fb0965a30289640d828b603eb309f2e911dec157c206740b4f16f40ffc3ce8069fabf3e
SHA512
dd14190aaf8dfd51696e0fd3751695889e9c4c6ac9eb36b288f5991f01874b3cafb29240fa115fe54b718ee741c810c154e97aad8f5eb72f988bb3bae0005222
DIST genpatches-6.6-70.base.tar.xz 3723176 BLAKE2B
19017743aaa0e1c717746592f253a14ca476eae1658742c6e487023ee5a670473fe582a814a1202f2aeefc78d7dd3dd249810d7665299f740fcfceb1c8c11f84
SHA512
dfaa2df7ceb9411e9e35fc9f4822f7d579c1106b49c57805d657ec14699764a54e10d93f717801db7e33698b1c01dbab489e7b9953b1ff23feacbdec5a99c95b
@@ -34,6 +36,10 @@ DIST gentoo-kernel-6.11.10-1.amd64.gpkg.tar 293836800
BLAKE2B ef9074050bfad68bef
DIST gentoo-kernel-6.11.10-1.arm64.gpkg.tar 268933120 BLAKE2B
a8ddcfc11544bce82d51efcf4bc5a4ac2fc3bf7b7d6ac7f7c628ec554c440551754f3ba554f306c1ab2532b44032c5581ad7e6e5cdf8ba9aa74e43ab3eb65706
SHA512
d9c28da3e7c7b31173feb02264d85e9638888a2c43ae0e9f98ca4f3283fa2fd3fadbf16eea1b71ca46957f48c7ea3bdfde7ee0cecc52ace91d9d89ef6b4ebbdd
DIST gentoo-kernel-6.11.10-1.ppc64le.gpkg.tar 72847360 BLAKE2B
18a9bb4314fe95fe52a606f19e95a9ea921d440da6cee009232ae57f7a72f8b9f6d529df50cfff476fa9c94251ce69061d699ec18d5355d28f54ba4a7ab24e9d
SHA512
e149abb89d4abd00d7aa9caed0731fd4131e334f4f678ce9aae494358165e0423776c1c292c9549c5d45dadabce01a2ee275f3285d6152a413a26659adaf4d3a
DIST gentoo-kernel-6.11.10-1.x86.gpkg.tar 76503040 BLAKE2B
873d1e90fd7df593f9fbcb76114c02e4784847ab46cfa132aea95528d31d9f94d997256db1362c9e11925a7586217e600cfc109ed6093e9c9aa3ec04a601e4f7
SHA512
4945da30169963636eae7df359a59e64e19acbfb98dcc5c3c803f7c440a8e83c4207f7d8663b6b4fa23763a6e051278ad68ddd337aa9c2866cdb36ad528b942a
+DIST gentoo-kernel-6.11.11-1.amd64.gpkg.tar 295301120 BLAKE2B
120845ffc735deefb9b4d8ccb31bd03871fc24a0dc67d37988b754a6c09458e08455bbfe7680ec9635ef672cb57384f39cc723c20ac27cc0dc70c983f3ac6dfc
SHA512
4e977b692567382120df6c6fad9d9184a80f45623fc24ab3eb1a0b8b7cff9113daeec31682bd64e130ecc6ac9eacb63e51eebcbf407c2184e74cd6c95a6ff9cf
+DIST gentoo-kernel-6.11.11-1.arm64.gpkg.tar 269230080 BLAKE2B
0f66905911e2ca8aa35e08f3e1d0680797ad9f68e60b1894322c60dc74fc91f85c753e5a1ab8a545a3fd6f9a0282c75dc6f48a405d945ad493545c75a0f5b610
SHA512
202a55603991a06a088fce372849e98428481b49c97a4412218a172857329360f0212f82cc26baa8efd418f30c5d1d4f997653ce65756daabcdad7f7ae24d516
+DIST gentoo-kernel-6.11.11-1.ppc64le.gpkg.tar 72611840 BLAKE2B
36b6fbe4e35787b6d9eb6423957f34358e0edbe7abf810e9be67d3ef6ec8abc53df83bad93897fd868610a6158ad873bba29bdd484b82fd05a2403254acf92cd
SHA512
f00b12e1484df932ca939567d34db0aaef710cf59239f85e9413177f30e6292ea4c2f60b1147d1395a7851568b844e9a4a7dc36742c2b219bfa6920763b3fa2a
+DIST gentoo-kernel-6.11.11-1.x86.gpkg.tar 76953600 BLAKE2B
422766fc21a1fd75f8a334016899e9ebb0adb87c272361eb8cd2721604b55a1c962af0324ab7c30e88b2cb00a3879131ec6e50472af29af40265ed62bc8d50dc
SHA512
1b8b4b795ac666b314f5339b7147affa0ab8f6151317122f6b146cb2f727f88fae6269625153745d32f0fa4966edac2f3e3a87dd4250936e08f8ebfdfb380212
DIST gentoo-kernel-6.12.1-1.amd64.gpkg.tar 298700800 BLAKE2B
0e691f266113eb87e1b1bb3fd05b51650fb8ec02569c46dc0606a94bfe101f4cb0f48d951a380b56909695f5e3733c58191a2ef2aaa681581056f1e02631f117
SHA512
3347079fd82abda68f10af3bf0ed206a735d59a0adf062bfd2ac9d6adbc141d647ace1e37e36fb0398d7b7e5caa350f777b14cbe08bab5e762b51bce38f1b856
DIST gentoo-kernel-6.12.1-1.arm64.gpkg.tar 272773120 BLAKE2B
aecd1217beef2537dc0a459e55eb9b368c9a117c7d47f1c5f3e839d84b35651c46137c04cca7173e2f69cfd84d281e5d1db4d4eed84ad72a93cf63712aa84e31
SHA512
e213ff8b0e4744f682986f377821d4af3d97d91b4d6a47ea8428bf9914ecb11721ef9a3490a8a803bf924e240c1eeee78254b11dc66d981dda22e171404b2b83
DIST gentoo-kernel-6.12.1-1.ppc64le.gpkg.tar 73031680 BLAKE2B
0d4b88f258cba1fefe2bb6982c2a8386e4b6768e2ce79c8fda7d44e106a4c769164b9bdecfef1df6a22e560109c87dc378dd9993b3d48f9638b25bdcdc5aeed4
SHA512
94d24b9925bfe58844459360fbf7b4b982cbd55e153c5cb07caa6f725aeb35024b1fd96672a7bc2fb0886a39eb307ed621c7a09ca05bb8cb15046d913df453cf
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.11.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.11.ebuild
new file mode 100644
index 000000000000..b35a3727e6c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.11.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
+}
