summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2024-08-03 20:04:08 +0200
committerMichał Górny <mgorny@gentoo.org>2024-08-03 20:10:57 +0200
commitc5640049019ab55ae4bbfe2e89fea699e0003d34 (patch)
tree4fb71213e0d9b9b13bedd63f6328aef3944ac87d
parentvirtual/dist-kernel: Bump to 6.10.3 (diff)
downloadgentoo-c5640049019ab55ae4bbfe2e89fea699e0003d34.tar.gz
gentoo-c5640049019ab55ae4bbfe2e89fea699e0003d34.tar.bz2
gentoo-c5640049019ab55ae4bbfe2e89fea699e0003d34.zip
sys-kernel/gentoo-kernel-bin: Bump to 6.10.3
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--sys-kernel/gentoo-kernel-bin/Manifest6
-rw-r--r--sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.3.ebuild164
2 files changed, 170 insertions, 0 deletions
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 5c044b804083..e4d81e1f6c17 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-6.1-112.base.tar.xz 5686744 BLAKE2B 2a45c958031096547d8db5c43413
DIST genpatches-6.1-112.extras.tar.xz 4056 BLAKE2B d592f37cdd0c21afb347ff53965f6fc9ab962b8ad48d666cbc55dd91a32701918669b8fe8997757aa55d5923829c237aa27b7d819faff74dbac2fe88b5863fca SHA512 aff46e4c47e3e0398a8d371a8821afd7d6d7ee33997834dc5532e007e8b69b333705d6978f0a32496073eb6d06607cb34626a1bc932376361ce2baa9587f918b
DIST genpatches-6.10-4.base.tar.xz 15672 BLAKE2B 3dfb069409ca8c1cc8022daaeda3f45443c4e11ab1b086d8178ae4bd7e9a77fdbd8016484324248370bfa4b92e1a10cfa67d40592fafcd8540cc917c60b52ea1 SHA512 ea2f80b065c59b485446c8acc174b93a688b9e6d5de8cd9bf307a43811f6087368b528647a2371636b22dc082735b57e470e9c5d1092972c3890a9c628db723c
DIST genpatches-6.10-4.extras.tar.xz 4056 BLAKE2B b1cc5a0d37760aac34837b9f7b26240d92afa816b5456a334deaaff8e911cba25f15c5e168bcba86b80d9fbe006a4b07cf4aa963e68a92e5152033cbcb080be0 SHA512 765b58ae1ce61678dce39b27e9212844cfd991e222384c7650355a374a236918f622549d49d5d483bfbc6dfaa74120b66976e85bbfdb6b54b0e871f1d5d5ec60
+DIST genpatches-6.10-6.base.tar.xz 257104 BLAKE2B 13309e86f5b16ff79797736ac91214698afb07ebc167eb22bbc354432f64e26dc3c19e0e4bccaf4fac7f0c858b7739317db3ffec9eef596eda5c2a45e785bac3 SHA512 55c009415c1b03c02a5e0251c8a12adf9eeba0fa7010cde100735880332127bda25bbbc59f9105c091fbc5bd67d7bbcc4fe02fbf4de7bee645bc679649ca3a67
+DIST genpatches-6.10-6.extras.tar.xz 4056 BLAKE2B 746ea837c1ba5ed7a4385b2f60be08986ad43f0c2eadebbda940d4cc2f7eabdef830459c55c183a68b63be318af661a8bffa25bc5da37628efb1f59987724c8e SHA512 63929e552c0e648245f8b7af72478bebf3a19be2f9aeda2d37e68b02611a69bb171338228c1c1d46b352236f63c3b514e24ef4f0260e0477d487d02ffd99ddcf
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
@@ -114,6 +116,10 @@ DIST gentoo-kernel-6.10.2-1.amd64.gpkg.tar 160737280 BLAKE2B d697e43a5cc520e2895
DIST gentoo-kernel-6.10.2-1.arm64.gpkg.tar 131891200 BLAKE2B 3b46113a10ff8b7a57e4f436aaa2cfeb4d95e9293fc158a70e52bd577ec5de573e17be05e5015a444a9da2ca5b768b6ebefd4a69e6dcb29dad31b82aad96ec56 SHA512 c8f3ed9fdbe4f761308a9109354c52d2ca1f65ca6289ac1d033ea28930a8cd94c313f5493a2e74f2b132bbc730de3b95acbed4330152bafdc1fb18f9a40cc574
DIST gentoo-kernel-6.10.2-1.ppc64le.gpkg.tar 71987200 BLAKE2B 4609342bf865984397f6b166b786c4ab3520f298a92027679584c789f2545f7c728c4710fe817155b33be1c637c1fd26c46aa979258aba552755acb892d5bdb8 SHA512 9faccceeb88e902f8d43edde4d890af3274f849bff7fe7cfc176e1061778fd9856e701d04adb04b99f6cb8ad993d3bb31a65ab80d79c50b046a2eeb519b00e2b
DIST gentoo-kernel-6.10.2-1.x86.gpkg.tar 75540480 BLAKE2B 0ca33e131b3b86a4a3d49b54a95ac90efaedcfb187c1f1c169a448c7cf271690242ef8013e93c89d18cddb2217210f2007c56617720af2ad4f755be449d8ef6b SHA512 15fa48ea4cd43ccad8b8542a8ce2bea57ccd8ff8368fe234d7f4b5f8440ced254c3e14be1eda7b93bf2012ed61dcd6ea41c58f108341d69e9a149d5ddb4208b7
+DIST gentoo-kernel-6.10.3-1.amd64.gpkg.tar 160778240 BLAKE2B 264edb4c72ec7c3c773401fe7e67dd3636d05e791d96d3b98a308fe12cbba6ff8803cdf71bf4e088adbd4b17b834eba7ee835613994614e678b1aacc3e3d676c SHA512 7266f9c1401e526f977c54a0c3c77ec234269e37a7841f7a44b1a10be0d4c0efcefc75039184dcea68ef8c6cc7b5f33a4547ec0b3de0a9162a19a29d1f4c0c42
+DIST gentoo-kernel-6.10.3-1.arm64.gpkg.tar 131891200 BLAKE2B 4cfb6c05ef01ab976a65d164f0100347d913033e9851b4b4fbc9646bd14ae6c455ebd3c435678dd74e695a356c03ec136df0395fb11b292f2dd80a2661039757 SHA512 dec53cf395e42280bddcb07ae6b7aca73ce8b7c9ad99a460199a1212ab72801959ada4f23c0205f6cf00b50d70176b3e47a339a3f0d581e688c8cdc0c522a3c5
+DIST gentoo-kernel-6.10.3-1.ppc64le.gpkg.tar 71966720 BLAKE2B c8055e58ff14a465f465d4076fcfb363a4287648cab243ac6fde7ff9652d96b802dcc6231000136af6af6b90e58afbb55b468d44c36812e299476f19f806ed63 SHA512 7fe3ff27cb7b5c16fbeb12bb7f0212f0ce548cd95f003f7c35f6088a2b5cd22ed90796c1838623678f9fde2ef5b56570a8c72dbb55ac3fc5cfdb8685fc6cb078
+DIST gentoo-kernel-6.10.3-1.x86.gpkg.tar 75509760 BLAKE2B d95db1d0b11c9d801d0d8384d31ff1e9bde30bc7665e0321bfb01cb3b135dbb89081d9a4c41c3dd41ea9464b935c252cbaecfd1c65f325a84ec822a65623e3be SHA512 fd8ca83123122e8af61fc8e3d131e7ff887b52c65e6c4907f21627edc6793f99a5aa5e883fd5b7a361029365c8df96d9dd2056785178b78da4d4f3e2e2eeef2f
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.10.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.3.ebuild
new file mode 100644
index 000000000000..93eef4c29436
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.3.ebuild
@@ -0,0 +1,164 @@
+# 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##*.} + 3 ))
+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"
+
+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="$(tc-getSTRIP)"
+ OBJCOPY="$(tc-getOBJCOPY)"
+ OBJDUMP="$(tc-getOBJDUMP)"
+
+ # 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
+}