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 F2CCB159C96 for ; Thu, 25 Jul 2024 15:51:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AF802BC01C; Thu, 25 Jul 2024 15:51: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 pigeon.gentoo.org (Postfix) with ESMTPS id 2929EE2AE5 for ; Thu, 25 Jul 2024 15:51: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 3323D3406A2 for ; Thu, 25 Jul 2024 15:51:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 440041E68 for ; Thu, 25 Jul 2024 15:51: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: <1721922704.fa0c0c93313639d0a1b4b5da177ffb1c02ac5a73.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.9.11.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fa0c0c93313639d0a1b4b5da177ffb1c02ac5a73 X-VCS-Branch: master Date: Thu, 25 Jul 2024 15:51: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: 04b86163-992b-4ab8-a1e0-c36c1b2da6f9 X-Archives-Hash: 454b683b0ac582539c36371463898a58 commit: fa0c0c93313639d0a1b4b5da177ffb1c02ac5a73 Author: Michał Górny gentoo org> AuthorDate: Thu Jul 25 15:14:16 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 25 15:51:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0c0c93 sys-kernel/gentoo-kernel-bin: Bump to 6.9.11 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.9.11.ebuild | 164 +++++++++++++++++++++ 2 files changed, 170 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 5adc2cdb4e37..eb19c9bd79b7 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -36,6 +36,8 @@ DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B 614634ed1d1132be830e91a13dc509 DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B 607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c SHA512 b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc DIST genpatches-6.9-11.base.tar.xz 636320 BLAKE2B c1a730341ca150f9f698300f59f43d1f4ab2af44745ccd060033702112caa9941a0021e23f9a470cdb0fec51e76779a20e451b2b058943c12e153acbaca4b770 SHA512 e3b40a773a2c58914b25534949f9e05542eb1712b823bf84287ed546e44c9d6e830aadd4c61d4e2a72b1e2b071387a9d1131cfc9f43ee9e26d9a14785b248758 DIST genpatches-6.9-11.extras.tar.xz 4052 BLAKE2B 3b12fe75ae76ff17e30bb30d5e5cb913e31732bf43958b972356772e76d892823b925e715d9e777dc3ca39f89c01960b8d420d2647775d1e4406e4b82ef2c08b SHA512 5fb378ce92f4d443ce162cd69771d6b9d150bb7be01e776c22cb913437c7b441a4474dcb33fe7d6d3f285ff0f8605b7aabd9149594d0e45ef8b231e3703ed026 +DIST genpatches-6.9-12.base.tar.xz 683040 BLAKE2B 4a87ff8941e75ef372616a5d705bddd62b9c4d305f6806463cefbcd8b21ce5ceee587e875c7ed6b2be9c239635bf59c532290af71700a6d651873cdf21d5e539 SHA512 dcd0a956248c9c3cf7a978e35ab8304569005fa4b688491a6b3a73d4ed32f3fbd0b4389a8aecb5649a39b6b3a603baa74c9be7b1ad1aed6a016f57f9a00408ef +DIST genpatches-6.9-12.extras.tar.xz 4056 BLAKE2B cbcee5bdc1567abc3b7b546607b0c7f59c48b58deebf24e2ee1141f4181b19d05cb5a3b799d5d7e1619f6708ee7083f96d2f581b74104d910150c53f5248559a SHA512 c7016f5dd9b1be70c80439b5f5f651731e193991a7551304daa5628bf296546d94378e74193b98d695f7d4860f952ac200a67342321dde8075c028e6a5701c21 DIST genpatches-6.9-9.base.tar.xz 548708 BLAKE2B e0130d225056f77c92e566eef9db643ecdef6faf2f81e8329859830850bb5409e212aca0ab0da85b9b1e3377121221259044dac650986ec05feac46f4d588a5d SHA512 714016638f866b536b85edd24e3e44513048591aa270dbee1460c5893b3e8b0508f299d86a202deacd10f105c0da48038d78219226b2808e17012d1811df391e DIST genpatches-6.9-9.extras.tar.xz 4048 BLAKE2B 7be69cb63abf9df9267bc61e3e365672dbd1c0b3568d48bf949b660ff1abb483b28846eb36a162ddd9bd91473c25462440fd41a7ba3bac70467ad45fa88fdd29 SHA512 955cd846bb020d08888aac04ebc5c1e56429e11ac59601a3e068971ad05aee59b75a24722dc7fe2645ef4414424d21e117e2eeb24ae72a5949476a213f3383fa DIST gentoo-kernel-5.10.220-1.amd64.gpkg.tar 63283200 BLAKE2B abfa4447a66dbade52e79edebe0bf1fe6d9be7a3ae6eef0510b45b19ca6f209dd46ad8426defb9935ef10485d8704634dc45d411c2760a92af8692ba16f3d34d SHA512 8ee2d79de3c54036d4302ac542438c73132f88a803c56159c96a4fce63fb6208a299ac3310aba5ca30c3fa504f71a60ce365a06c867d884e2da104ea57cf2eb5 @@ -110,6 +112,10 @@ DIST gentoo-kernel-6.9.10-1.amd64.gpkg.tar 159416320 BLAKE2B 2d335be253e2313e6de DIST gentoo-kernel-6.9.10-1.arm64.gpkg.tar 130068480 BLAKE2B eb1455d1a444a45db4c7148c61c2be13bcfc6d723683e311a1ccba50ab0beef1f5b93f207717b25e0e1c74020ba6daa1d2c42cc70ff983038eb9ba1628567a9d SHA512 a075ff588892e965ad3c1ff18cf770fa38da7ecf2769526b518088881ea1fab406ab77b5a40aa3e5c1925748fa91d3d2d1a4a8fc99df02aa711c3e5e8b371319 DIST gentoo-kernel-6.9.10-1.ppc64le.gpkg.tar 70748160 BLAKE2B b3d09062b5ddf3eabff8ca1e1844eb445dd2a7a910356fb8799c38b000c7cbde64f259bf09ff6fcf6bd0b49d2ad87c9faa54581f27505dc7dd4c4f3cbfdcdb4f SHA512 41b46556727e57f325e204763cc98eab0627e0bbb00eb7dd054aa9718e61fea49293ba0f858b3f47e723e914b08c0f3785892e02b6d9e9abad1119fdac758bcc DIST gentoo-kernel-6.9.10-1.x86.gpkg.tar 74895360 BLAKE2B fd12759766b8d86d7356c10b3957748c9813e41ea861bb0f197eafdf258a338d8fce7f00f8cd65fc6bd4d12047dc6bbfa73a52e58e9f8ff92e60ee48443fd404 SHA512 59ec1c1506163cc76c40b726b3b9c2fbef29c5addff205ece6b15e58e553114b9299903a8ea0e4d58399ed94e4f3a6eedba3c785944fff2e1d571d09bb725d71 +DIST gentoo-kernel-6.9.11-1.amd64.gpkg.tar 159375360 BLAKE2B c9bd176abc9c7dc938d7cc397cb063bd0e45c883dc5412b26d51f43513cd624039f4d71ea451a47a4475a91a23eb45b1999abea4e1d883b9e402e8066e72a932 SHA512 d296aeb2fffb8666694b4e2b4d13617ceaf9ddaf8d9663226346c21a3a22f8590508206933d7d36d39f97f600171dc435b3b70c7cfd4b8b2cb362019d99982e6 +DIST gentoo-kernel-6.9.11-1.arm64.gpkg.tar 130088960 BLAKE2B 9f723e93aaf392c6d601023695b54f48a386a4410465722c516a41940b398e4f31fdc99a609ba92859efe149b66f51e25fad601c119ad27b54051b4f5430ef39 SHA512 8b4961cb6955fe5609340771c2b275d36a060ced8fdd522b9eb52b60cbcc671a2b40e6921fc19bca24e1dc15e5215500acfcae6b7e5b497711a414113afad69a +DIST gentoo-kernel-6.9.11-1.ppc64le.gpkg.tar 70758400 BLAKE2B e342bb4a241093e773f766b8863a68b97c94d1859a34509ff0c3a1cf4b192ad9a3455ea05b2381736188465787bd0d6fcff04a8151e6e48adf6adff85a88f98b SHA512 12d858cd5dfcd879a552179f8891b892aae095e1c5844e36ed58597b15ec6e91ca62ba378d778dce21e0ad859ae19d8e71c9e7887fadee7a937d00af2d1d23f1 +DIST gentoo-kernel-6.9.11-1.x86.gpkg.tar 74905600 BLAKE2B f86a47b277355201b37869ef1965f1aca187d1c5358555fc97379bd4475484f6261c86532863326620475a30de72bda97ad97ecd9fd00a4dd9f8ceaf8983be03 SHA512 70cf83968c84161ac7428fe904584ce6b9057bec4560ee10d922d42cc2b2275d9d22372306eeed703003af0dbe8e82949d68c8a24394f264bf9ed1da7a3db4ce DIST gentoo-kernel-6.9.8-1.amd64.gpkg.tar 159160320 BLAKE2B f54c76780fdec033d8ce5b419dfb8cb1d9fd36af80791532ec7d6bf5ac4472f1fff6f52151aca93cebf3f99ba569b990a850403a99b56d427b6a48a32350b735 SHA512 ddf33e3b2d19a1beadbf6e578a70f363e2fac965dc19c2fcaf4a73b768f27611c86f1c3ec2a472fe37376fcdfece48a53846ff3ca554c97d4eb9686055c1a758 DIST gentoo-kernel-6.9.8-1.arm64.gpkg.tar 129792000 BLAKE2B 7df88f8fda6a34699ae60ad3c12e20fdd957a8a07bb0880a634a94b91b5d803d35ac493862ff35a85426b62e1d8c7affd4728aa87d5e3d911ab73b39c1dd54c7 SHA512 b27e2854f7b5a5b4a179578c6228c3a11c50c7deb37cc0ae8bf0c1f8bf60c64a8990fd09111769c642072079df6b1b083ce305519212bc3816bcccb6ee89ecad DIST gentoo-kernel-6.9.8-1.ppc64le.gpkg.tar 70758400 BLAKE2B 782a74d7edd731773abdd128adcf720215c5bb7ee7dffeeecc9bfe0f04b0500584f69469277f5f86f9d4ea447975fff26403b680bc52b1d3e21e033f54cde94a SHA512 923badad678f818ff30fd753508d1bd53990a1c3166879a01dbc1e841355fc783a6e9c79e3d5a9ab075f223828f7206decd1a36fd2370a4ecfaf354d5821abd8 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.11.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.11.ebuild new file mode 100644 index 000000000000..1503fa4fb5d1 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.11.ebuild @@ -0,0 +1,164 @@ +# 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##*.} + 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/-2/-1}.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 + + # 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}/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 +}