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 12BAE1584AD for ; Fri, 25 Apr 2025 18:35:18 +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 F39E033BF29 for ; Fri, 25 Apr 2025 18:35:17 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 122DA1104C8; Fri, 25 Apr 2025 18:34:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 bobolink.gentoo.org (Postfix) with ESMTPS id 075B21104C8 for ; Fri, 25 Apr 2025 18:34:51 +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 ADE27342FF8 for ; Fri, 25 Apr 2025 18:34:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38FC126AD for ; Fri, 25 Apr 2025 18:34:47 +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: <1745606082.4a85c5bddfc6cf6d278aa0b5f4d78db52a8dd25d.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.14.4.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4a85c5bddfc6cf6d278aa0b5f4d78db52a8dd25d X-VCS-Branch: master Date: Fri, 25 Apr 2025 18:34:47 +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: 232022eb-ca3e-43db-9526-6df6322d8c15 X-Archives-Hash: dd0abced4a461434380fa59a9d1b40f2 commit: 4a85c5bddfc6cf6d278aa0b5f4d78db52a8dd25d Author: Michał Górny gentoo org> AuthorDate: Fri Apr 25 18:32:41 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Apr 25 18:34:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a85c5bd sys-kernel/gentoo-kernel-bin: Bump to 6.14.4 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.14.4.ebuild | 184 +++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index b09d015d4644..3644bd6dd312 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -42,6 +42,8 @@ DIST genpatches-6.14-3.base.tar.xz 273232 BLAKE2B a3bbcfc9f84d435dbc990365babdb9 DIST genpatches-6.14-3.extras.tar.xz 4052 BLAKE2B 02175c74182dab71e717ac5e803fd540bb24d4c5025461fb0bd0ae8978d8fd99fe9654372fdeb3c4f00a090dafbb15e43c1f678280f45719910787ea41ae0ece SHA512 359fe9e447d34080bff08d683b60065962f357698b1fcf50b73383cb5618a93cd2b1cfb6d3269bb6ac3c463e359f58d78d45ed5936bdf98205ebffc87c03a704 DIST genpatches-6.14-4.base.tar.xz 415024 BLAKE2B c666ced5cf08829e8ebd75021c2e835ff92ec97d75808b1e6671f4376dfeb9aacc100378a7ca0776a0922faacbe2edeebfaf5966960289a22b9e3ec02b5630f9 SHA512 3f10ccef205d5072be2e5d1bccd079c178e401cee62021ae4612e745678fb1bf6007e700702a80cc978280fd5510ea2471e59a2092e12b5bbd75f12d9c7a5b80 DIST genpatches-6.14-4.extras.tar.xz 4056 BLAKE2B ac0a0059aa8aa851adb0476fcefd4b640f868271eb9df2b4852cfbfe9b2959fa08c23567f0b9f770bc0b490a4ef619b475ed6450308b76ff990b65255b85b7cb SHA512 e0a7e1e6906a7ea81985e2f91a04ae7123d221749818d57070d5128e37340a714feb0230956632923a74a1a2ff3b3765fca56e78d7d8dc0bdd5353da8ba21a78 +DIST genpatches-6.14-5.base.tar.xz 478484 BLAKE2B b4a07d4eb4efd31162d0c6880d826535f894806a664690c4648314df4ba70f374a0e8091bc8d7a7193ca2e75fe57fe730ff6867f171c2b4a90af4788272e3888 SHA512 00aefb9d59b0bb4d6361e59e8e92d141f8f5e2b033a7418fe5625ad2fcb1aac247606a3e54f7cb791f02591d57362e84c61511c896cd17be1013b23e43f70e73 +DIST genpatches-6.14-5.extras.tar.xz 4052 BLAKE2B 131ba26cfcc2f1218a79b33069f5d01a1bdb016315f85913b557429999a17c414640246e2a95c1d79cfcdfcf60577f4bb614b728e56d725dc808cb5785795a3a SHA512 746e312955ab745c901c653d2f64fdbf075a80388ee1618072e52225f7fa6163e5cc65ea41791ffea89dc1b61f242317a1b3179e85647ba9dd7c9de27937d4c9 DIST genpatches-6.6-94.base.tar.xz 4728588 BLAKE2B 63e287cf4973aa3808673a8069572ff79ca0efda0c7711df217fa44ba1d8179f355ba4f1145be2a81974922eb17b2110f31ed091fd1aa2609d2432995df9ba53 SHA512 9cd910058edb7e36a8621eb1f2d8493ad4c3db2551e3073683557be9a73b20cdf4647d7beedd2ac93b84fa126b816485372f1d8c5901bddbb83f6896dbe9a22b DIST genpatches-6.6-94.extras.tar.xz 4056 BLAKE2B 91ce861bb22c0e604dbc9e23fbc0a59baac8992f9c7ee1e1f3d5dbd28d3695f0621a6fc9b04af70dd16c0283af61b77d3560069b34e7b7457b3daf4db4a8e63a SHA512 a9b0632fb4c8fe27350e28b3bda5b2c2faf539e2d063e7ff04cb901ac4610c16537cc121117e283076f07318454eef6127aa326a401f932f197575baa5ea99be DIST genpatches-6.6-95.base.tar.xz 4736688 BLAKE2B bb95c2f2839f40a05b0277558a08d91a031e9066f8ba44f08dc1c9cfcae038ab431f8951734f37ae0b4c0edb42e7c3f868f495b90a7e0e988b8fdbd900cabc3f SHA512 c5b0bb418c4ce0cbf8e00da3864c37308141f757621c5125e33c283d92187efc234d5e2097e40ececd55b1c10398063b378b42fb7aca57a0864d04f0a06b3472 @@ -138,6 +140,10 @@ DIST gentoo-kernel-6.14.3-1.amd64.gpkg.tar 311275520 BLAKE2B 72108fdbc4a4633f7b9 DIST gentoo-kernel-6.14.3-1.arm64.gpkg.tar 284180480 BLAKE2B 4092893d614bcff6adca18c7a0f6b1decab68475c5f02e0b08f3d3a03284da9c3ebddd189da6a8e12a11acfdd698cb9cf719f32f2547ecdba24ab855bb1b6dfd SHA512 5bbe37f1ef915f9ebc5db1a58f48cbc21bf4cfabd045ba41502281ca79cddb3ec678c895489d25afe9be7703065fa62ecb70ce04dd788dae89b77af1bca1a0c1 DIST gentoo-kernel-6.14.3-1.ppc64le.gpkg.tar 74403840 BLAKE2B 10fe4a277c8701bed7bfbc241768993e797b098ada235cc7b79833eabbc8079f83f132726dc29c5881f57d2dc1b39ff889d209aff9165144ae3801bee87f3922 SHA512 7cc98c70b33ad2305eeacc1bddd40190ed0acf0337b2261a0a57fedfbdb80d187613899e86b62a240946df5d269c0d882dc487d112fcb45a4da50c527ad85d9b DIST gentoo-kernel-6.14.3-1.x86.gpkg.tar 80670720 BLAKE2B 884f0971ae5ca7dfdb91311bea25c445306e5dbb08b4eec6dfe4a15d437e2d0e76f434e86357251d3f9aeea27e4360c6e25368377fa1e9af384da1fa46896f06 SHA512 c05a370001a6696417ef3c7f970e8915d879ce0273f5dc71c605c9b3e63d8e6b564205126f17e74ff1f64f27e8688cfaead46b38ee3ab54c6c441956d0f8891a +DIST gentoo-kernel-6.14.4-1.amd64.gpkg.tar 311562240 BLAKE2B cb9268a68056d80ce6e7e64e6061e058413c3e1fabb9b5d86e72bfa58ddde19a7460b3943264ec9dddfbb0b2ea108efdd07f0b8c3de0114a7c92b3a97b65c0ca SHA512 a3b7f3d05dfb5c2a3336d166e166a4f3650f7e283f016e5d47e2a7e6d4deaf68490af902d09c423ca43e5308de91966c2a4cbc642c6c469d6b23c39ca963a243 +DIST gentoo-kernel-6.14.4-1.arm64.gpkg.tar 284200960 BLAKE2B b151c4e04bca81032849982c8296f766e593304e9afe7794a98482faed458da3693ee7827d81bdea62d905987e961eecb90eb9e58ce674dcb2373d9aaddc9ee0 SHA512 fd31e7e5bb4e9c09397f8f9da0bdbb1c43ff2000c61166c4f95c23eb6c033f013f45e9c7a5455aba25930755fb2e6396c848ad9029408bd71cd10e3e72760374 +DIST gentoo-kernel-6.14.4-1.ppc64le.gpkg.tar 74444800 BLAKE2B e920d4a83c08b91618f8dfe2403d95766e1e3c0b0e08216c63953d0ea3edd38aea942359ccb11022776f7c175cea1a3e1e1f79f859e5c094b808c94ef04c8006 SHA512 0302f6aa755303579858ad895191ca09074bf3548f6101591a0f6f3502329fcb3a029b3760b63f5f22324df8296ad82f17a94175fe57baac58d4faa100bb6f70 +DIST gentoo-kernel-6.14.4-1.x86.gpkg.tar 80834560 BLAKE2B 27edb3742d04c6327605aeeae81a21dab48fa91afd3951d12612e393916747a4ed003bb0355379649b52d033cc9add37faad4f58df871df6a441e4d0d1997ac0 SHA512 92e6bccdba69c4be9be51cd56c76f78c9fb1fc5fb06b0caa3c9c795723aee2f692112cca30317a2c62d222d84bf6f3b6e82f58a0f6fd2152545c96ae04c198c9 DIST gentoo-kernel-6.6.85-1.amd64.gpkg.tar 273459200 BLAKE2B 77163f000eb2ba7ba6afb9ac81e8f6f114a8401707a33ce1af1f787bf891e2dff92d74d57043cc8b16c2f83570d93d01e6364d7be854273f92fb130185e25b98 SHA512 9af07d1daead4b49544b57f1b30836538f86cd303bbc08f5e3fb4f23cc49cc2b496c6f0bde5546279cc5d0b6c067a6971fb2f90d40842777f9fa0eca3c9fb14e DIST gentoo-kernel-6.6.85-1.arm64.gpkg.tar 246292480 BLAKE2B a3db12f0125e55a9af4d227848397b259418c9aae6ca15e88b50d1f54901a836543537ee991bf35d9c07ba35a4e3e0dd1f118d5879fc4e798ad120715924b914 SHA512 0eb02919d964639733875c3e1402f3c7a54251c678a12288ec8863545bb0c739b050a6648b04fa00884fa4d6a82d1df452e81c52cc38ad1f64a64157e88cb529 DIST gentoo-kernel-6.6.85-1.ppc64le.gpkg.tar 64430080 BLAKE2B 52082ced8fc59daf2a95dcd924273b7987e814f6cd68e18e6e9412cbe80401c224088763d10c72dcc993c7a33fe0e6518bb9990c7d3315f45adbecef05538f99 SHA512 cea21d9a9533b6d55b4aacc11d3b4b25d8f297969fcb717ced2f6165f7f493d3e350a254d74f8fd3372d700608dee2f380a7aa62d21f507db2dbac76dba9dde7 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.14.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.14.4.ebuild new file mode 100644 index 000000000000..c0377f141128 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.14.4.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##*.} + 1 )) +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 +}