From 794a98e403ebe65ec7dfbf43cdd22c2d874ea818 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 27 Mar 2024 16:51:07 +0100 Subject: sys-kernel/gentoo-kernel-bin: Bump to 6.6.23 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.6.23.ebuild | 161 +++++++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.23.ebuild diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 6568d1423acf..224f4e337c10 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -20,6 +20,8 @@ DIST genpatches-6.6-27.base.tar.xz 1392292 BLAKE2B 46e3c354f7c27182c2f97bd20c165 DIST genpatches-6.6-27.extras.tar.xz 3700 BLAKE2B 36a21c970dd2c8f72a4496b9f72faea3e94fba49342e00b7cdfc0ca6d4f3ab14fef161a7d02ad13b1c7db73af3c96b1c145453d0645791b46b34f599b3947582 SHA512 996a1b0a5c625043ececbeacc648f4dd71da2e239482ca515b680b146ba6041feeb0924929b1b2b6ee4f3ecc24c85926e54e28058d9401d4399282151332dfce DIST genpatches-6.6-28.base.tar.xz 1406852 BLAKE2B 09691b429951a495b8dc0e076930d72f4f5c51c0f41cc0779d7c27bd1c161e007ab6ca9007ef43db4aeed4ead3ba84dcd93ba2b31fdd689c785fc38d0c46425a SHA512 500492b25b5a8eab5781e3c7758fa1685b1050bdf30b0c8fbb306db078de1bf06e0aeea6547fd7fa868dcb84047d9842f37f5851e3637633f693a5b653cfae96 DIST genpatches-6.6-28.extras.tar.xz 3704 BLAKE2B a1c1a33eee156346766d88b142a1f199f483e3589930537c1329ef2e5946780278e902f2c912a639779ac76c61782b526b3dec8434ff678f30d4a6bbe4b95238 SHA512 f1ca783a6a90bdc40c92f004b01cd9ec4ae13db9b6ed71708c4489155df95c900d395ba3b682e62dcb69d71151f38759cc128b9775e3983d3760c01a1b453ae0 +DIST genpatches-6.6-29.base.tar.xz 1589756 BLAKE2B 6c60dfac5e2a0d887a745c7a4c486c9280169dc56447807096e9727eea11594adcf3876fc11a8f990a4aaf0961e5c0c5977b5369fa2d67d991336412a6847f2d SHA512 11f2d538cd72b33c694633b892dced44aa6645e13285d7201475b29533820523de86501bc5f5385f06f06cae5504d11d3f52e09d72ffde390bcde2132b3d3dec +DIST genpatches-6.6-29.extras.tar.xz 3712 BLAKE2B b38d84de7a6affc3adf4a04d4719058a77589033e39c70e55c818c2c2762967cc832b184be58891e14288e06df3ded4992cd8c10285d1de9ba2fa01704a46e3c SHA512 5660a05968a6d87e0a9897001962d8c2a8ead8f27aa01fef5d1905864414d959264213fd1ec417a5396ab70c1af7953d6874a1d57f65109d2d0d34423f412843 DIST genpatches-6.7-14.base.tar.xz 759200 BLAKE2B ab81cb25145e344d43c649a7330804d9fccebd85aa8afed415c8de65d7cbdfea1884447f825b10919543d667127810dc2efae7001e52c506c9bf0598a3f572c6 SHA512 eaec167accc9c27c002262f39cd01d2de897c9629fc226360887b513227104248cdce2d4a2d3d25e86968e74d5f7dd516f599c5e45a77a896b3a482d194b1622 DIST genpatches-6.7-14.extras.tar.xz 3704 BLAKE2B 2dc79c939c1793afba3591758b5a4e51987683c086e688b79c4a6817cf35f1486f06a869e18bf49c5d102c77152b842bf4669e9c77b59e35401ffff2de422477 SHA512 e198bdf7f0d6dbd937f31d0ae4d0de3a9c1091410b5a709ab1606a21372b6d2b58cf1e298ae3b1f25fac1f677a0f618f01755a542493879d876bf296f8fa33e7 DIST gentoo-kernel-5.10.212-1.amd64.gpkg.tar 63252480 BLAKE2B 3ce492216591a8c99b136e3baa7588a412917ff84dba8db91eb9d25c314b109f83009d646ed95c08a8af7a429f8a746ed824f5e6db679777cb19cf07ccef095e SHA512 dd29113f7409ce3d71df2354cd015be6c4943e13a7ffdd1609367f418aceb3eb6aa1687f9bfed20796b230dec1ed27b7bfa4c00398d3b65fa6109dee790a136c @@ -66,6 +68,10 @@ DIST gentoo-kernel-6.6.22-1.amd64.gpkg.tar 147240960 BLAKE2B bf7141a2e71fbddf528 DIST gentoo-kernel-6.6.22-1.arm64.gpkg.tar 119234560 BLAKE2B 2c940875e0b75b2ba373de0b334f826c501f0eb572eae3095187c3999cd0f64b749f2e8b64ef06e9804d2d90c67aa418420ba2f88c316ee6680245362cde7beb SHA512 bb2116948b0343f51a380bc7ca4e04e7ad2aed8c89fe178ec1a6074ecfd5861b6c3c2a6990d47d8db503c2a4f4aa4bfe8f4bdeb38f1498d1a9aecdc850cfad44 DIST gentoo-kernel-6.6.22-1.ppc64le.gpkg.tar 64389120 BLAKE2B 5afff380977b5021f48ca368321d33948144d68b03293b85aaa6ee5ed7d2aad86f62f563b898b7ba341dfef5667c3f9ab8d39dd0d4930193a65107a9331f67b1 SHA512 8d4c1135ec6c9b18752fa45a131f03e01fc5aecee73639f83a1e984cc395afb4c1426eb7d3275450eb15b2774735368e65cb17718258660ed6c9df86e5069217 DIST gentoo-kernel-6.6.22-1.x86.gpkg.tar 68352000 BLAKE2B 01d9036c758e8cd45c3bd54a9cd88d326e110f8209ca14908723a71e21ce676b392d3343ee5a0ce8a62f5d94bf8ed4967bdf0fcd1947632d5eb0da1bda4c22d7 SHA512 7c344350332e53f2140cff466873f56154b190da38f3fcba35b1ec6bcf451371d22c61ddf4473fc52d4ab905b0188e5d61fcfbb96ab6d8cf847191651d6fa216 +DIST gentoo-kernel-6.6.23-1.amd64.gpkg.tar 147200000 BLAKE2B e3d9c2e127c1744bcdb478e0f93c3013ed58f238c7d363fcdffc08ce79fa864e325417a78d22e010a6a6c5530ee2571bd38118ada7d3c5c5f2e432fc414b601e SHA512 ff3a53d9bb3a7a8cec3f5393be01460532a9d308ccc3f78fe596c7990fcede971112399cff2c734022144ec9d879f5f4c7a7cc2beb398ce7e4a3b6fa2d8f32a1 +DIST gentoo-kernel-6.6.23-1.arm64.gpkg.tar 119244800 BLAKE2B bf346737d792c558006019cf8aa49c4948d2645a55ca296d7af864ab0e28bfc060e4a38eefc31b82ef0d85b458a3f838ae7507e9f8d132998fc5d8d28842f65d SHA512 5da53f4e9437b46ad887661a0a3716b3d23cfe6e3ebf9e0223a4d5fbd185e7b674cceddefd532d7df6287f86122c9a6303a7e141134bf8b4c5df9fa89c8f0a23 +DIST gentoo-kernel-6.6.23-1.ppc64le.gpkg.tar 64378880 BLAKE2B 2b85ee686df8828ba49d26f836abc14506a35aecb03989061b5264780c7cd6e9c602f73f00fb0653036870db7cfeecb384a15427d9ef3d11c64b22302d7382e8 SHA512 1f48c8aa5947258d0dddf4a7b99e7b81393b798f82a784636869c41017143c2b4ef098fc729a40cf23ae72123b74e6ce349ce2040998687d12a55131cabff4a8 +DIST gentoo-kernel-6.6.23-1.x86.gpkg.tar 68352000 BLAKE2B 86395b953e1d757cf9ab948421d0d802f64dea448c1da96bedef88db673d6ef8c8a0347eb17a5bbaf189fb8ded904ecc741121914737faf3d277a0baa08cf0d5 SHA512 79f6bcbf4a655abcf4c2658ea0858c3c52bfe4ca27f43fdeb79a0aa10438d383c1aca603703171d69cf0977f92c80165de755453cfc1ef3ea124298c7fb66a4c DIST gentoo-kernel-6.7.10-1.amd64.gpkg.tar 149401600 BLAKE2B 943b7f5a49ccf2b15dc97f7287aafb6fe9f0100e17de98610630049ba0ce0d1251153bb19cdb1227f21d502c5a7fe3652b88eaa4db6339707517d219ebc687a3 SHA512 a5e17b08097706ce0d43e3182c75529d8a7007e13c501b7409c9079f1e560010604108f8ed07f47374585a9c3b1c455c4e9ffa96eb0d1cbcbed6704b694a1d2b DIST gentoo-kernel-6.7.10-1.arm64.gpkg.tar 121231360 BLAKE2B 6b1d5f9cb7850d8dc9e8df63d2bedf4593e56d6658e4992c57fa77352547f2db8a27ad489df30ead11275e4681c7b19a8655d55a2304f4b62e3957edd1795673 SHA512 65ca057f02a791cc9b5929640525decd5a378d8ab5f5f34c048adc59be32c59e425398ae7d69a2efb36a1cb15deb43f87db4f4a3086007bf8d19f56914607278 DIST gentoo-kernel-6.7.10-1.ppc64le.gpkg.tar 65536000 BLAKE2B 72b1f773ea421332d95a119a96146f0ac18268a852de43e6ffc8bd018c432689243a8f04fbe8588b670e566c574bb396bdc975ca25a45ab58e6eec63e8c2ea7a SHA512 25312e14fd2a8c31a71f6697bce9443cd46bb45e7b3bacb601971b0f6ff53c4e1c40aaba259f8c6099ed44b944f3509607cc48637ef430f373ba06ea0d7a5b3b diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.23.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.23.ebuild new file mode 100644 index 000000000000..b0e3fe1f8248 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.23.ebuild @@ -0,0 +1,161 @@ +# 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" + +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 + + 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 +} -- cgit v1.2.3-65-gdbad