commit: 9294f31c006a1816aaceaa49dae58ae61c391e9e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 23 09:39:58 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 09:42:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9294f31c
sys-kernel/gentoo-kernel-bin: Bump to 6.6.58
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.6.58.ebuild | 180 +++++++++++++++++++++
2 files changed, 186 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 2c22f1c1b7ca..764999f3345b 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -42,6 +42,8 @@ DIST genpatches-6.6-62.base.tar.xz 3451484 BLAKE2B
526cd644a849da225bea9e77c9132
DIST genpatches-6.6-62.extras.tar.xz 4060 BLAKE2B
a475e52b151241692f6db4b41b19d6ee0212fafa1570ca47bd9c1b6e3a3b00a00f3a12a023f5c13f519dac46a01147d513ebfe37011fc289e9b3590fa2fe5a69
SHA512
dfcc7657e7299fca6d3da30fa2ecbdcc00cc1133607d3ded5d2f8f9dbfd5877906e357368665fe3757ae6b873ae4313c321ff79b8cda5ed213b7a1866dc9009a
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
+DIST genpatches-6.6-64.extras.tar.xz 4060 BLAKE2B
d91c7df7c970efbe0126a3e189daa71ac02259cf1746f432ac702af7991c04bf235c28ffb578ffb2250e92e2c475ecdadef97645b510606cb395e725dec348fa
SHA512
c26f1c1446ccafb751bcb8d05a41d378ce670b8115ec79e1b9a21714a1275c75ca36b68424b17717cd5b75fc1421a132eff0fcc31f7f32bc192964f3c64a381c
DIST gentoo-kernel-5.10.226-1.amd64.gpkg.tar 63303680 BLAKE2B
d7fe1733fc5686e91cf3cd086e64ab3695f61f71d053901fe6b3bf8946cf67858b6fcec89ae4430b3d033c0a8c2069d3ad2c85e9f3dc12cf0fc3ed637fade62a
SHA512
0b267771cda36cd5597d2e6dcada6b1a17dd0d89df8602bfa822fe94d7e844f0d81bbc1177b88a54879b273bdfbcc9b479c6210ed476f65b075c8e52bfd384f7
DIST gentoo-kernel-5.10.226-1.arm64.gpkg.tar 56750080 BLAKE2B
7dd5adef82039d4aca30824168d5eb56d95dfc0672e7c401e6da9dfa3cb1bc4c4eb0e56a2a3a769cfe92e3c71d19e35af5c7017567cac6d5026b3b50e280b513
SHA512
fc19ce80ab64b670b48d67913ac81bc953e73d91f9e84f4421e6e7aea4302f6ba43db786b8f83626d89b47b881f2e88cc1794aafce5e75704f4d141a09f3b12c
DIST gentoo-kernel-5.10.226-1.ppc64le.gpkg.tar 52766720 BLAKE2B
830c15ec760643c636c1294a8cea2ffbb0f46589196cd10a97c09e4d131a2e32398cf18f3f4d832e0ba1a123f031953ff3f931d86a60e6e6d80d8f7f5f0c446d
SHA512
e1662eaf7551b54afe01a0b23f88447e3ee7684d17d6515fe4cd9e6dea28293d440b677a1e55b83583c74c5362d6e9bb5939314368c3e7f6bbf462b60e055dae
@@ -130,6 +132,10 @@ DIST gentoo-kernel-6.6.57-1.amd64.gpkg.tar 264243200
BLAKE2B 6929ae1df44f7ca9ded
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
DIST gentoo-kernel-6.6.57-1.x86.gpkg.tar 68321280 BLAKE2B
d577962982fb92a7a1aac507891dfee465f28d6ecf7a8dbdcd28ac122dab5f379150602d80b77b27e41cb73b7c1ab3d80a6c8cf383d70f0388eec0ba1404ef43
SHA512
be0e41ae412b3b08c5f38690ddf17ed506c0c00e1e97e637f9c666f0d58cb769d765a0b683f19cceb129597fc180067a82c6ab42892d8ec3dfa6de99ce154983
+DIST gentoo-kernel-6.6.58-1.amd64.gpkg.tar 264212480 BLAKE2B
3a88f2c0bee3fe46380fe1ff7b7515f17dee450c26278d48fef25f05afc7b38112925ce377bb719ff12a35ea128677ecbeb3ecca5c4143e071195a847a2243f3
SHA512
cd7e03acbbdc74e403fe5bbac3c66a9d049285c1cef85110d129d5f4632e23cc60391f9748ea835b8930eec92c3b4f449d5faf9e1051d36bf103072404e37522
+DIST gentoo-kernel-6.6.58-1.arm64.gpkg.tar 241254400 BLAKE2B
a18159f59314697b05ffd145d900f2d3c9a4311ba6ada234a835afcd76f30f79efb6b9f7809cd7ec61d4ebdc43e9eb6329ace3680947cd75107e65adec317388
SHA512
3097704edddafd69167ec49cdebe36aee4845758e577d0b64694900c142c116b815898997d0fe056c6a6905d5f582756e58fa50d4966ecbf10cb4dad4fe58aff
+DIST gentoo-kernel-6.6.58-1.ppc64le.gpkg.tar 64307200 BLAKE2B
d8d863fab084e95523afdca0b9857e09aaad33e9ddd136df7d0a0bca2de9e602823dd9a80273dc64b8b757b4aa192ad2535c4e34b24a23c056fbdb4df4d2b086
SHA512
792a9e77b9b4fb6bcb14bf5b7321a3a39262aa1b7592affd8280bd3d57703e6014e12bacdcb30b8562b94bedd22df3a8a67a32e163301b19bffd29a7e49adc3e
+DIST gentoo-kernel-6.6.58-1.x86.gpkg.tar 68331520 BLAKE2B
c87d6d152ac50dc346256fa2b6fca6812a9aa12ec2eab1e3408bf1afb31019843e18330f493aff63daad3a10b00dc2cfc302d70a5fc68869951353f999294df8
SHA512
49307d991f0c811219611fdd5fb2b26230af222908d6dc7fb528d3d1564a186d5a7c996355eaa768c382f2142b349fd1541178e6f4a9fbbe312795f361d71d60
DIST linux-5.10.tar.xz 116606704 BLAKE2B
b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1
SHA512
95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.15.tar.xz 121913744 BLAKE2B
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
SHA512
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-6.1.tar.xz 134728520 BLAKE2B
ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e
SHA512
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.58.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.58.ebuild
new file mode 100644
index 000000000000..4873f0a07e43
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.58.ebuild
@@ -0,0 +1,180 @@
+# 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##*.} + 6 ))
+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}
+
+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
+ 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 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
+ # 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}/usr/src/linux-${KPV}"/ || 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
+}
