From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id EB621158B20 for ; Sun, 02 Feb 2025 13:29:21 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D5905343029 for ; Sun, 02 Feb 2025 13:29:21 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4095F11047E; Sun, 02 Feb 2025 13:28:54 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 308A811047E for ; Sun, 02 Feb 2025 13:28:54 +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 D4FB3343085 for ; Sun, 02 Feb 2025 13:28:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74B482629 for ; Sun, 02 Feb 2025 13:28:50 +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: <1738502921.f746343bc13d882692bd098b34ca5e91689fca71.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.12.12.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f746343bc13d882692bd098b34ca5e91689fca71 X-VCS-Branch: master Date: Sun, 02 Feb 2025 13:28:50 +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: ae60cbbf-90dd-4eee-8cb8-aa1dde3445de X-Archives-Hash: c0bf6975d8b5ae41824e715cc205e62d commit: f746343bc13d882692bd098b34ca5e91689fca71 Author: Michał Górny gentoo org> AuthorDate: Sun Feb 2 12:50:18 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 2 13:28:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f746343b sys-kernel/gentoo-kernel-bin: Bump to 6.12.12 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.12.12.ebuild | 184 +++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 913f89f4eea9..c37f76b71ead 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -6,6 +6,8 @@ DIST genpatches-6.1-137.base.tar.xz 6788380 BLAKE2B 365778dab67485d413506657e7dc DIST genpatches-6.1-137.extras.tar.xz 4056 BLAKE2B 8a39c1f0b11bc776f301f6a750af6d7416a20231c7170f50080a61b40071a55f6d2906193d76d8fe4837b4b494fcf0a683a7325ebf18eaed6543c0362c78a6ea SHA512 9739342cd761efc0fb4b2d09f147d721b8099ec0594a0190a0f39fbb23b131068c6127be3b0083a1e60c4d4120b3437bab8b4608fe1805724e513890a0a46bed DIST genpatches-6.12-14.base.tar.xz 846696 BLAKE2B 63f6f0326eedcbc5d44f2320dc0c9352c009e219764d6eb9e1da460a6b10538e5c81c27a0a633264d3d1011af266b310e49a9b928dd59dc76b226cc3ce8b06de SHA512 909307a85a15e27c517e352690c4e8579d4889e36cd7254164230e4589b3544ab1126008373ea2289628361cf82414da9de4809c45c1f1dc02ab3666547d0a90 DIST genpatches-6.12-14.extras.tar.xz 4056 BLAKE2B db12618351b80d499fbf9b3f8d0a4ab00639fe1b0c73776e0b038f6f996db29f0890d796effd120c3428a9515771016cd0a23da559c028996b312e75525d78aa SHA512 79a23575135205c33eb07d7026ccd0c38e5223b4b29d7c90002b72074a089fc994c38dd17868e53198fc11d2fc28e229a79ea50d5449261aad9689cd73139003 +DIST genpatches-6.12-15.base.tar.xz 856536 BLAKE2B dba6809d63e9ff073b40a08afdeadc173e3ab5d739cb251e4415887815a420ba295fcdb80f53f2601f5274ba206d9f562d3841977391f254ef5783dc5f329010 SHA512 ca9958e76b1c156e7ebad1c14a1f957733a8cd99f9c8e23b82bd06bc4fc982c70685668f5d5dbc251abc4e7ea32a9508b0215babf18511514aa2c159767760f4 +DIST genpatches-6.12-15.extras.tar.xz 4056 BLAKE2B f3b21174d15e3ee9f367ddd10745e1812b2a7573dc618f1c42db7afc9794208fdb67f62e2f400a144ad2f6d050b0419d67152c10af83ca263ba210bd8d939972 SHA512 7a5460091350c279519bacbfdcc83ee69d14364c0a8b5c192b244695196f72ec24e27d85d1f87608b1af6e9adcb5089ffb079c3e5190b7580833a438a2672c32 DIST genpatches-6.6-83.base.tar.xz 4270596 BLAKE2B f94c4d0387957b4384a893f37bd232eba24dac57fa73297f4c25822c2aaaf6e9616c402624e43daab655c31677a59129dc853914fe9817125281ed40139b0bc9 SHA512 7479e6ffc5e736cd36df2a3f66079514b016059a273ef92d2e120f8da050c0383f8249dbd9f45daa1ee192117942d339b0bbe1a6afb1eae6e118b483fddbb8a2 DIST genpatches-6.6-83.extras.tar.xz 4056 BLAKE2B 5b28f9a1750f3aa6dd30c976f1ae8431a93d44967c52dab2bce6b3cc17c75c063ef675765da94a212eab94dc64d144283049570d413b5d7acffa7be207249557 SHA512 27a91748aa74628c3fdb78709e39166858280a4cd80f4d3241e96158d1267b79c0a6a3cbc9b70fb7ec9069e6c8c7f7210efa174ffca4aaf3234ec34083fdd61d DIST gentoo-kernel-5.10.233-1.amd64.gpkg.tar 63692800 BLAKE2B b1807bcd074455292610a08353a8cbd329c9c8eddc09bae9bc089d6c1dc099a3937a98017f577d5d90cf7b7ca15c92845d16af7a124d08b9057a56c5fcc13a6d SHA512 95889f3754ea1601e063866a59599389229346b195b5247151dd34f6fcd397424d9d504a5aefe7d8424e62a4a043e9d9c82fcd32e633928e3905c89baef6e608 @@ -24,6 +26,10 @@ DIST gentoo-kernel-6.12.11-1.amd64.gpkg.tar 301352960 BLAKE2B d8edd0bc033540b256 DIST gentoo-kernel-6.12.11-1.arm64.gpkg.tar 277370880 BLAKE2B f6dd4880575836c9d663e271ff744c665bb9d8bd01d615ec002b1974cdcb4688a1b8498e209b7e37f35171dd1195dcd0b8f506de6c3cf164f03eee55615e5611 SHA512 ee9cb359da28d677c4ca0087079103ecc5b485c438bafa28abd3d73d1beba12393acbb7ec9f9c4a8a08ea7e5075a0c699df4863a2cfc69bf6c358a62e6067798 DIST gentoo-kernel-6.12.11-1.ppc64le.gpkg.tar 73113600 BLAKE2B 0760b960afdcd7bde62ed518bb55613447f83501bbf7bca80b6adac88d44eaec6e3d61be062a1c1a57d7d1a6922f041d9dd1cd80bbf353cdaf468c423cf34273 SHA512 ce91af6cef42d4cdd728fb97a229600f6529892716727eac7c054ad5e761de192753ba5c648651634abfd5b83ccc911d1c8939640562599b29b5e8987ebb7d04 DIST gentoo-kernel-6.12.11-1.x86.gpkg.tar 77404160 BLAKE2B 63598762f1835482b9f6a755728808bf17a537193d4c9768a202b127eb60a8b379004c876b63b265abbbbb158bd25335586eeeba23c7e279455703eecc5b26c2 SHA512 637a45ee484dd18ed6a21620375ca316194eeb66405eeffc4261cb0a7d469906cd690fc72c2babe17b7618747490291e00e23df8b835d1bb814a4129fd070b4e +DIST gentoo-kernel-6.12.12-1.amd64.gpkg.tar 301352960 BLAKE2B 0936a4c9395264fb8bdff9e5ca020e03197f3525da245afc4769eefeeb1ced798177dc2cbd40406c2cda563667d7b5014553c411fa4b737c3c5f21d888c9cfad SHA512 79ace68d05eb746dd441d2d3f1178a2788d6fd1c13403c8b1904395dd07a1040d5a77601223b3ccba1bb23d7a2ed35046fa90ade24bf17edd4e257151a080be6 +DIST gentoo-kernel-6.12.12-1.arm64.gpkg.tar 277350400 BLAKE2B 34c7e77cbcb9fc6ddca038dc01095fd988a741f42283ce9fda78c2c14702785b40d2fef7fd15c4529ab782cc2aa7cc70943a876e715e94217217289dc82b5fde SHA512 df0ecec53c80e42f53177b57a3c24a9f6bdb89cdb566c66aa49611401ce8e005a19ff6740823c4ab301346a9c9ca2057e74c1af208144e6a3abb89af02d7c7dc +DIST gentoo-kernel-6.12.12-1.ppc64le.gpkg.tar 73134080 BLAKE2B af4b89a71712d7a119901f23ea7160cac06ef4f0cec3332e5ef510172e662bd4831b3d8a9c68975e9cf6fe4a1a394410f5faf1287fa84d3f494d41e184a7c139 SHA512 cd9591dc748b229063c5a2079acfd29d164ddeab565ddc98cf37d3b4ed014a3171ac6af6ab00aeebbb6dcf2a832335180037eb42691cead49c80ac55a52fb1bd +DIST gentoo-kernel-6.12.12-1.x86.gpkg.tar 77414400 BLAKE2B c5ec7fba2cacd3bbc151413fe194c2b47e7d9496478ad2291f96a56fefb9f8e39e0a7daa6cec7cfe7291d54be92c00bebdcd0ceca2a0cb6ab40d9c71e4995e4d SHA512 9b97685266e193b49d2a1047b5ca0b2088016ecbcf16bde6a550417037b0294621b7747caa875a8a1a2bf9f23daaadfaf2f1a2393f5bb6957bbd27cc5a4d2593 DIST gentoo-kernel-6.6.74-1.amd64.gpkg.tar 270028800 BLAKE2B e74b3ccc5ba74a5138536eeaffb699cd7130b6e05fedeb4e85464def2eca67e153ddcc61a43be9eb6c46b402024411578b3abdebba26d4cca3444d1e84e7fdd6 SHA512 7dd5bdc97bfb69ab6d859d52823f737430d4cb5d16f20dac7c081706ea49b05de6dc4f17d79a87666133c45220e5d02f82255e7e469feffe0aeb3b7775257ed3 DIST gentoo-kernel-6.6.74-1.arm64.gpkg.tar 245944320 BLAKE2B d113815afd6a696630525b13775d625c33f087c5c6fa817149b478b94153414eab8f413b236144b3989a043329b82c0f79f38679e1e6d65fab7c8fa4fb15ba43 SHA512 9f855f1882e40a1b596041c1370500baa1119ec3e4987ef500487dd87f62c1b6527eca4b23df4001cfc167f9375101ec938f783d717460ecff8fb218c371bbc6 DIST gentoo-kernel-6.6.74-1.ppc64le.gpkg.tar 64409600 BLAKE2B 439c66dfb35eaf37b5f21d7a36f728230861cbf1fd3e4e7420af87ca2d8b45fbbf0b730ca17670c513b4a7bc060d5e13b3f99db35df4e8ad619940bcb4886ee5 SHA512 673bc0a287737dca8079466e1fe2fb1f07d19ca15f05aa4c5537f49dfd486d7ec73172025f43d8474707e48814407980b0b842ec410257241b5710bc169074e6 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.12.ebuild new file mode 100644 index 000000000000..8431fd7c468e --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.12.ebuild @@ -0,0 +1,184 @@ +# Copyright 2020-2025 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" +IUSE="debug" + +RDEPEND=" + !sys-kernel/gentoo-kernel:${SLOT} +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" +BDEPEND=" + app-alternatives/bc + app-alternatives/lex + dev-util/pahole + virtual/libelf + app-alternatives/yacc + amd64? ( app-crypt/sbsigntools ) + arm64? ( app-crypt/sbsigntools ) +" + +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 rel_kernel_dir=/usr/src/linux-${KPV} + local kernel_dir="${BINPKG}/image${rel_kernel_dir}" + 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}${rel_kernel_dir}"/ || 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 +}