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 D5229158043 for ; Thu, 18 Apr 2024 15:46:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF51DE2A36; Thu, 18 Apr 2024 15:45:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D199BE2A36 for ; Thu, 18 Apr 2024 15:45:55 +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 E66113434C2 for ; Thu, 18 Apr 2024 15:45:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F087172F for ; Thu, 18 Apr 2024 15:45:51 +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: <1713455135.211ec14baec21399470444184fe06a7469163d33.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.28.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 211ec14baec21399470444184fe06a7469163d33 X-VCS-Branch: master Date: Thu, 18 Apr 2024 15:45:51 +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: 5d7a5e6a-8c7f-4e4a-82f2-4277c4b76589 X-Archives-Hash: d382311799e71bbfc9eeee5a8b3b54c2 commit: 211ec14baec21399470444184fe06a7469163d33 Author: Michał Górny gentoo org> AuthorDate: Thu Apr 18 15:37:25 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Apr 18 15:45:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=211ec14b sys-kernel/gentoo-kernel-bin: Bump to 6.6.28 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.6.28.ebuild | 161 +++++++++++++++++++++ 2 files changed, 167 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 8793d4ed1953..16b84046202c 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -28,6 +28,8 @@ DIST genpatches-6.6-33.base.tar.xz 1799480 BLAKE2B c724ac510c4ffa2494a95268c2c97 DIST genpatches-6.6-33.extras.tar.xz 3704 BLAKE2B c337062a967a4261f48d3a571d4267ac9e0a259013eb9f5f40ed306712d83ac87108c7e60e7479e6e3fec9490c85e6d34bfc0a5c67fd30fe56970b858ef9ccd0 SHA512 fc857243332ef3b7c5e1698c0a4fea7860ddfc2a4f240e6f538b33bf4332d324d180745270fd0787e9d26fca575a72ec5bd0c0983d63304775278a4d51a168c1 DIST genpatches-6.6-34.base.tar.xz 1827752 BLAKE2B ad39269523df3e740205d812d3911da9a70e2117ed671d30b68cfc22ff3c3dcee24bc4731806fcefc7684e815019665f02c2a0ae6c8df52ef5663b57c1ed6b46 SHA512 ec1f5641cf3765833ffbd2f43454ea1c8581f942eb5d55cc894da7caad768d4f77ca579c21ef981773b90a97779965c42de32e944b99f6f8c30068910d951479 DIST genpatches-6.6-34.extras.tar.xz 3704 BLAKE2B 7e5ad01a7ef80cdce8a974ede1efe530278de1b551a173674910686860bd12b76b9569bbcdad57fc6c65cc28d9c62c84bbfa0297f4cea321f9ec9fcb14c0b809 SHA512 96d9b972f7bd5392320183cd21db573a22806841006354ee5a52f8c311ccff63805923178f9a6ce63baa432e87d972dfe1964326ab0ede4cce0a3a185db8fc54 +DIST genpatches-6.6-35.base.tar.xz 1860992 BLAKE2B afeb95582f83a941d830e8a90d1b7e6275d6d43b41de93aeb01dc743b1afafc5d675d98b66b528899fe9e69fe856402059932be58487c74bfc0102cff748244a SHA512 bf2848bc7e668b8b8df410f22f66b575ccd3a4d160efc6ac5d3549e4d34dc10d81736d8dbf689e64414491d4bb5479c54ee8ba7d6ad9d3dcae7db1d15c13dff0 +DIST genpatches-6.6-35.extras.tar.xz 3704 BLAKE2B 23fe1a854b29b205e93ac82a796ed6eabbc96774648168f616c2366f647dedd5f5ebade68059bc7e9f8aad5b57c8b7577b6e098859484f35c07913cb4e3567a2 SHA512 37e311b153e411df00489bf4973e1a414b480c4f2d6ac488ddd8af3f717461b14c53143696628df3750168869cfcc3cfc209599454f9873e28ae1e1390198076 DIST genpatches-6.8-8.base.tar.xz 491508 BLAKE2B 856cbc5f02af4b2c7073e2342a9d8131145fc0e9098557fbafc62cb5f24ce3009bb1ca9332fd1d43368bfca8963fd3f734de646faae1c3f95cf670e7768a6f37 SHA512 0af92f11d273bd5a13e0bc3effa2e6700b1404ae82a8bdcdf8be8279bacc5a45deb504c8df4281bf143698137fbf474337f91eeedfc681c019f4cc3313dd0da8 DIST genpatches-6.8-8.extras.tar.xz 3704 BLAKE2B 777b8ef344a84e3be85e65f8d0753ca7f2609e80ff80f9d460f9ba3c19f3fa19f975a199c2ea9b36901dcfd7cdeb8432653ff01db5da076336a8885fc4da982d SHA512 3fb1ed8a6b243a8c2f09aed66b5967df441e0ed4fc89dc9cb81b33561f8517f699787caf429bc173a1ee659912926a79d01603515c34fce43238525ef9cd8679 DIST genpatches-6.8-9.base.tar.xz 531224 BLAKE2B b5036c400d8e9a1ed765d31f3a2d5a542ae25bd4cdcbfb46d27e0c0887051200a7546eed16a1c527760680615d1c7a589ec482ed6c9c3ad28a4df1a778da3fba SHA512 eb33dbaa61b01e6cf5c706f7f72180005bee77a353a3c2a53319768a01ca16743bdea997fd9d520b7d112f9ed483de7f9ef8fd16adfed0cd28d955d13ada8eb8 @@ -92,6 +94,10 @@ DIST gentoo-kernel-6.6.27-1.amd64.gpkg.tar 147210240 BLAKE2B 5350f29c1802718348a DIST gentoo-kernel-6.6.27-1.arm64.gpkg.tar 119285760 BLAKE2B 7266ae6423f9c27adb1e5c8e1a2df28cebffd04831608e470a6f32bec5a686bfc95538fab05b9652c85bb8d5e7500c49ef508fb0f32bcf09c732e093441da332 SHA512 c89dbfe6cd0af62bc936b2fd61764a9e1a676631192b2bdc9a3525dd6f47de440a2bf3e1a72fec5e3b09ed9ad54805ffaceea366ec8231509904133bfa180502 DIST gentoo-kernel-6.6.27-1.ppc64le.gpkg.tar 64389120 BLAKE2B b330fc7a6fc147de3001ea09ad8693dc0ad40b52f46393476a3523ff97092549a82c3dc1c8a7e26f53edb58b432024828d04ff7d8eb867652ebebeb99b4a6735 SHA512 7ad279e05c27ef9278db638d62b69372280f0226fc6b35dad01511a4ddcae1869bd0fe021fa5853780c9b707276c55acacc6d5a0c547c75988688092e42703bd DIST gentoo-kernel-6.6.27-1.x86.gpkg.tar 68352000 BLAKE2B 4ff53a6e21bcd4be067bf83fdd762748979fc1cce7457a13d5fa1c0b3fb3408007b4b08c3e3c792996aa369b432e68b31c2b084148c8a1987e60fb363c1b2597 SHA512 045145bffcf831ec5deae8362cafc598073630229331b96d4e7688dae3bccffdb154c27c4718e3a509292a06a974b4c0267f79a891cde8b84ad820ce9d22d74e +DIST gentoo-kernel-6.6.28-1.amd64.gpkg.tar 147210240 BLAKE2B d043e6ceefa8c0d294d37aea78b06b7b1c11970ad4f8d4a3f24e4fed28d6d9868277fa64eed455b21208b05accb9c9abca71c4da519ca4af830ddbbad7ffec7d SHA512 dbe14cf733b0628509790affcd5b313cdbd66e4176a889147150c109efcc1f07a008909a8f800ec11991bb1577e711e4cdcb8c7a1c032e351c7f99eebc369886 +DIST gentoo-kernel-6.6.28-1.arm64.gpkg.tar 119285760 BLAKE2B a62e4d589266b5e6f40c67fa19522ad075a72ac84b14cb27e25afab5a342b4a0d6dbef607e51d39f333c14da7b8fce5e74ccaf036ba4841b1ce78fcd0fa9d823 SHA512 5ed1c8ccc55d5f36a63a6d743f391825acf2b25d944ea7c1a162fdc14e14c7443c8ae5e4d5cb5b2c30250d68466b8c14c6aa340327baf34ee632e24d848e0345 +DIST gentoo-kernel-6.6.28-1.ppc64le.gpkg.tar 64378880 BLAKE2B 4c0c0727cb45d642d0c9e9d4a7a9052934d47ba3f921ae4534d11fbc28b9afb059b159abd3ae72e5a3c56a6d4a6b3044b994518b33324da97c3191b39d1fd16e SHA512 9a0593fb83b314f090f3d70891bfa2fd1b026f111197398e2f966f22c4a29ddd8bdd2cb52fcf24c25b85fff257a6dec7ece81bb11252a74b5716518e4d2ba35a +DIST gentoo-kernel-6.6.28-1.x86.gpkg.tar 68352000 BLAKE2B 4822a17b94cb12005c0d0c5b4105ffa04fd3fd6ec83d38352b77b22ee625635feec074a8ad1ae90a0df0f9a8389ec0db9da241bce17df769f762924bf2dfd252 SHA512 3c6b03c2d9ad20ad3071c5033b31baecf562105e10f18397c5383845fcdc847f12d71669c8ac980a1852ab315ef74263ff732bdaff27a9d092ec38b2d47f2466 DIST gentoo-kernel-6.8.5-1.amd64.gpkg.tar 150824960 BLAKE2B 67f7dcd5f4309c992ffd3c20c43ba53d78b86a94ecd19039806b0e094c7645a6d0bbd0eee8519a9ce3b0625642664b15b9d7f6f7aa554801d6ceed31deef37a9 SHA512 d2620dba5a4e7a9de0ee6d7bb45dc8dbac013bcc97e44a856699c531dd002bbef67413b78562f78727132ce32b1a9f69a38fdc45b0edab654f1a76f85decc998 DIST gentoo-kernel-6.8.5-2.arm64.gpkg.tar 122398720 BLAKE2B 79416da38a316b25f9df59b46832e21a076b9e529cc0976e9ca8d3f38ec1d448e78feadb4c20b3ff2087af5dd42e7976567697b4d7001bb1fb5efb2a3c008c0c SHA512 d1f3deb209b89762b6dbf11e571eec79c67c303cd6b7dca900b6c92aed93bbebbf91405c2ba70dde0de385f8ff7dfcb6b6574a289d59f440b9c6f24f8e736ed8 DIST gentoo-kernel-6.8.5-2.ppc64le.gpkg.tar 66263040 BLAKE2B e4972fc108f9922ed5ae7721c4ecc8755d05ddf9f8d3c289a74d17f66ecd2e06c015ac51e7c43e5cfa203cff306623ae4db33f84fef2a70ea52e45d9639a9ced SHA512 505458ef22d5ea170eb4d02fdee9e64e18e81fa6605289030ff842c5d54deb06cef1d53bde86ff575e1a02376c515ce1daaaf51ecb8f237d57773d06e3f79dd0 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.28.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.28.ebuild new file mode 100644 index 000000000000..b4c689581c13 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.28.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##*.} + 7 )) +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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~alicef/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 +}