From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1925915838C for ; Tue, 16 Jan 2024 16:42:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A12C9E2A80; Tue, 16 Jan 2024 16:42:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F357E2A80 for ; Tue, 16 Jan 2024 16:42:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D0C93432B3 for ; Tue, 16 Jan 2024 16:42:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BEA5C14BE for ; Tue, 16 Jan 2024 16:42:43 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1705423359.75ecf08f23d729a2f90615b6c0bbda3bf76ccac0.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel-bin/Manifest sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.12.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 75ecf08f23d729a2f90615b6c0bbda3bf76ccac0 X-VCS-Branch: master Date: Tue, 16 Jan 2024 16:42:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c43e4a1c-e2f4-47c5-8bdf-d40da4aa6370 X-Archives-Hash: 4d28cb79a5074554164e3f8e6dfbf37d commit: 75ecf08f23d729a2f90615b6c0bbda3bf76ccac0 Author: Michał Górny gentoo org> AuthorDate: Tue Jan 16 16:38:17 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jan 16 16:42:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ecf08f sys-kernel/gentoo-kernel-bin: Bump to 6.6.12 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.6.12.ebuild | 161 +++++++++++++++++++++ 2 files changed, 167 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index c735199bc0a1..b4eec3996932 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -28,6 +28,8 @@ DIST genpatches-6.6-13.base.tar.xz 669256 BLAKE2B 9474c68e1558162a583278e9ee510f DIST genpatches-6.6-13.extras.tar.xz 3704 BLAKE2B 846cd76f82b38f2a55262fe6b56ec5f9eeeffea3da929e83338ea3b4d1352435c928ecd222b4167aab080025115addd8bcb559870328c16c3aa74d90ef2442d0 SHA512 9dfad8cabe8176606ff8c81c79bb628e0ed4195f486cd10f34677702847d005bbd8b077ba6646cadf90cbe799238c996f7d0e242908cf242e3acd7acc36e225f DIST genpatches-6.6-14.base.tar.xz 704772 BLAKE2B 81679d803f68a65cdb7e72254949703c19d24aea7dc4a4e557c854abf8afad4b6341099fcaac9a5f68ed861dcc0dc4629b4929d563943e5e7a8918d76f4e87df SHA512 7695b65f10a2d0eb8601426b7e6116ed60a3dcb2a5c66dd2946936398607f1d6aab1c2a64154f0a95102100d8c0e0f3017addbd93fba7b555c57b9d3f148effd DIST genpatches-6.6-14.extras.tar.xz 3704 BLAKE2B 79dd6f5af3d310844e41da0682b379bd409c8ef02aff3bcca248494e3dd955d25445919de06cf818f58879077576e56574896fbd5da57a079f8fbdb2a25037cb SHA512 ed144b0d65466f35a078fdd2a2b23ff54bd3a3fea36d590f19cc59756c1075eea68ad7f9edcd8d6d7cc4cf79531d91dbb40e57128070b2761d23bbe97864aab6 +DIST genpatches-6.6-15.base.tar.xz 705240 BLAKE2B 35353cfc627d8b2b71e0e117db880850d54b640ff537f5f04c3e8ba03014a732cfdf3dc54df71a9fbb48817af3991e61fcccb15737e82903b61b900033f5bfe9 SHA512 9f667d0395ab285971bbad2daa63107f2b18809650fd00861111f44155381debb00ce2eec77bb603af822cf115105469bb8b5660c60af9cd1047d7227b602942 +DIST genpatches-6.6-15.extras.tar.xz 3704 BLAKE2B 4808b3b5295768d7d352ec902a53c010d0e76ac322d399114512704115884d3735e34f86793e7c9de596fe1ad0d104eaf979ba0ae442a3c83d0d6b27823e8458 SHA512 eedc4198cb08b2f7d6daa17c298822a4235495416d453419efff71fb6127119679fb271bb5aced58974e496a66e81764e3eb454a96a6e4dcf403545a45fefb0f DIST gentoo-kernel-5.10.205-1.amd64.gpkg.tar 63252480 BLAKE2B 52cf3967ac881aa557da92d11a021c2509b5e6920cb04be415c626bea66e08579481b61d6897d8e88fd830d18461e6c41423aea398fa1f00aed581300cc1403a SHA512 295945d6ca4ed5322918662531b353867522782f243aba54f3cbbe22b515059e54b40bf124020c1d8315c27a491d7af894a8331e1395f44c0d763297d36e58a2 DIST gentoo-kernel-5.10.205-1.arm64.gpkg.tar 56729600 BLAKE2B 62ecf66572c0b5da944e3200f7b0d1ba3e12231e66c5e90b1415becb0fd80d49da34b57fa5d20898f7c0085be25edc9ba939daa400e7587d6ac9836ede944f94 SHA512 5b5530f160b7119a200a4fb7c247aeff76055e92be92289d02be37f886dc522c076a19013d518df348f5fe352c758343c6ad61d7b0a819609f8020e2321de6e1 DIST gentoo-kernel-5.10.205-1.ppc64le.gpkg.tar 52879360 BLAKE2B 2ba47d25e79ad05473f8ae87c08039bd858daf5d67ba6746f01bc57b6f7515a76e91c34fec101d514e81caf4a4103f65be43a4351a5c509056fd53da98f0da8e SHA512 4817b60666808ed734d84f2bb0f2e2c051d3a908eb24c70ef8607536d3aff782925aa231bb0d8180e53224cdf30c426643ff375e7b3f5f047d50411eddf6d178 @@ -84,6 +86,10 @@ DIST gentoo-kernel-6.6.11-1.amd64.gpkg.tar 145612800 BLAKE2B 46d76aca1c68c5a3c55 DIST gentoo-kernel-6.6.11-1.arm64.gpkg.tar 118558720 BLAKE2B 4c4eb673bcbde12f6723af76c0fe6491912ed9eb606c1924386755c44eb045f6df92c24192961bf8dc1b3df88a443509dbd1bba7ee150a12e14048d196d0b90a SHA512 9ea514f3258e042aa15242c83efd3560bfe1e84ce65918e6c69797f3e15ee4551cded28213a60af76747581ddcc30069268a8f4c4de027feb4851f99d3a986dd DIST gentoo-kernel-6.6.11-1.ppc64le.gpkg.tar 64348160 BLAKE2B e8fa1afb293dc93176fbb81e744b7e4a83bf009139d6334aa9b2c5b8dc2e5d7ba6762a078cfdfb3fe8a0b2f22703e37c4a9bb6c1352a26fce82557e9fb5f111d SHA512 7ea25d00598e30ab93abcc401be6240f2df706e3bbca4555742f468f69ccede514a9fa6b55b2b40f0b1f0be9ea309d1d9779a0566f7b6a5ca0513f4f44b68808 DIST gentoo-kernel-6.6.11-1.x86.gpkg.tar 68270080 BLAKE2B b9e67031695040d4ebf1d5f6cc0ee42653a03c972b2c66eb330dce07eb1f9f016b240bc62cf1d1a5fece671d4b52904db45aabdb461f17328920c3b7e49b5d28 SHA512 fe13aae4cbe8bc00bde2a7226227a1464c90882203166c34f229c04f7573da8dd65cd500288323acee26b76bbedd40bb31fffb2bb263d8e0c4d3896af0de7218 +DIST gentoo-kernel-6.6.12-1.amd64.gpkg.tar 145715200 BLAKE2B dde56a5bc47beeccc850b4bdf40fb3cb2ddd63f0bcd3d945aeb7b64d855b15e1f8a0ac72500b1d341dbb0c0dd2e9e938495a62a9366115d58d3a735d065166f6 SHA512 5da21df3a0760feba492593a828325a6c6c6f6153ab76d7e340df845e78a87793d50b07de4e021c0973611678d064646922eb998efdffec6bb91fbc684bc5cce +DIST gentoo-kernel-6.6.12-1.arm64.gpkg.tar 118558720 BLAKE2B 88beced853954183df0d340641dbe659e6d5fff35c6750164139e9f0ddcb334b4b856efe96f13998ff060effc5eb2a4163826d6b798564c78572c95f61c851dd SHA512 52eadc98999db628b0129c872bc95bc8a3fae225398f9cf54d2b78314a3e6d76e9ca5ddfb20a458b12b0cc90c9484ca401009fe3e0e6f60ee37ab2d3aafd387e +DIST gentoo-kernel-6.6.12-1.ppc64le.gpkg.tar 64368640 BLAKE2B 3e5818ebaf02415fb3ba14488af2d4d215a2e7fe23c46f75d44e3e8535751ca65ce50e93df48a6e93dba60b4e9c5becc8556f9a10856eb4bed2ecb007018cec5 SHA512 509c7df0b57083185c5dd1c49989d3e29625d95130e9a4e5003a3327b3662b9b8fe81435c02ec7cb842f55a576acfa8c0accd43dc5b4a8beb1d02812373c114c +DIST gentoo-kernel-6.6.12-1.x86.gpkg.tar 68280320 BLAKE2B 3e54c0871478f8d999be8e9c1e7d3ddd2b88aaa3c3ffd6712fb458faccb56e4f71d9b9d024ca2b9aa12c6c8831584ce4bc818a795d3fb052c88b37c5743e1719 SHA512 be387e2790da9820b2dc44515b59bf4270a71ab05f026b2571833b6b9db77c0e671ec711493a1e59aecc969f1aa2f641d94e4f27f872d53e6d7ef15a5b48b1bb DIST gentoo-kernel-6.6.9-1.amd64.gpkg.tar 145643520 BLAKE2B ceae9156ae6c37c45b0105e86a8bc29b562ed11c58a2f8c1d38e38b6b0c5c9e4f29908e633628a18bcd4180ce5def1ddda5e75dc5e25422ca4b108675e30ea9a SHA512 3ccec88ed280714b2e26e0c7cc2a07ef3436bb07502bdd704c005a4e54f9469355ff1d543956b049b52f8b3277f664bbdc353f5983c16cb046f49b86b7d26d12 DIST gentoo-kernel-6.6.9-1.arm64.gpkg.tar 118558720 BLAKE2B 170d7f90400b9bdc0d4e98f7871d4f7622c670bac8baefd77ce531a11acfbb34e5ce4c4fe727918009b2980985c6c8d5d15d1859f2e129762c68efba3d3a621b SHA512 e7e56d77eb5391579fa1e8b5a6ced2c383e53c56b4079578f14a0ad5364405fc2e0088c6ab0851e5f8eb461912bec0b3d377560cf551b35cab3039ba750f76ff DIST gentoo-kernel-6.6.9-1.ppc64le.gpkg.tar 64337920 BLAKE2B 93a44b217ad4a3d7c1ce253554238e5d04da795f3eaf1c94fd44294eefe1c56130bda61985ce759dbc98f851c7da910934a777046f22984b6521867db6d69a05 SHA512 1d55ac1965e86783a290437bb654d727899a19d3953d428097fc9b169bb732227d8042ceadde85449278aaa323dff8827bf751c520cbbc8f36c7c742298d486b diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.12.ebuild new file mode 100644 index 000000000000..9055f90433bd --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.12.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##*.} + 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}.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 +}