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 2CBE9159C96 for ; Sat, 27 Jul 2024 18:12:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D81942BC0FB; Sat, 27 Jul 2024 18:12:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 B12E02BC0FB for ; Sat, 27 Jul 2024 18:12:57 +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 B98A4341B27 for ; Sat, 27 Jul 2024 18:12:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 036821E75 for ; Sat, 27 Jul 2024 18:12:54 +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: <1722103958.c98f62801c4053bea0945b06cc987cf93b9cff10.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.10.2.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c98f62801c4053bea0945b06cc987cf93b9cff10 X-VCS-Branch: master Date: Sat, 27 Jul 2024 18:12:54 +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: d983bf2c-f62e-493e-82f3-902e5c3a63a5 X-Archives-Hash: ccaee349253db40c46e26f72d280f1bc commit: c98f62801c4053bea0945b06cc987cf93b9cff10 Author: Michał Górny gentoo org> AuthorDate: Sat Jul 27 15:38:49 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jul 27 18:12:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c98f6280 sys-kernel/gentoo-kernel-bin: Bump to 6.10.2 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 7 + .../gentoo-kernel-bin-6.10.2.ebuild | 164 +++++++++++++++++++++ 2 files changed, 171 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 6fd0ca498c05..06a666efaf71 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -22,6 +22,8 @@ DIST genpatches-6.1-109.base.tar.xz 5540948 BLAKE2B b6fdb5f6641ca8617c976f69bb73 DIST genpatches-6.1-109.extras.tar.xz 4052 BLAKE2B 562d5137c87031ff9f43b4d081b26b35cf4bd3c5fe074ee826edc8ece2ed074eeecf55c8914ca728267a9f78d907a51354c3688186d442d9fc02340224a0c71e SHA512 0370a5cfd83a1c87828396e49f003b29fc68dea1568f6de417fe488aaf045e349f0b84695f3643ad9811b4f57ef31237ffb9a97c72294139aba94557e1f67a18 DIST genpatches-6.1-110.base.tar.xz 5564556 BLAKE2B f479e7fc7a12222c9b0268825fc8200e5bc3d73b81cd2d5b64bd321bc66b4563ae17d2bb66a0b0610dbac3059564b856d16c6ee122ed51a4c72d18795575ea65 SHA512 a0e8beec29ec7c63fbad02d13acf561ae694847d482f34a9120a06692aa4df1440433b19027484d3ef6a50221411bf34d175a4c833cda56aac4578da8b0b67d5 DIST genpatches-6.1-110.extras.tar.xz 4052 BLAKE2B aeded3974b119221fe8546f59eaa9a89842b24c0dd7d1ea45be003dbf91a62194b04d01e9811abb4a4af21b0e7b77e35b521a94f6042954f6fc09958fb41a84b SHA512 729ba854dc3513d9149860015013ea8e539bbe6adca5a28c53184fe0cb722307e96998c26dc1966e25d232e19e3188daf4adece4692d2804132ef956267629ee +DIST genpatches-6.10-4.base.tar.xz 15672 BLAKE2B 3dfb069409ca8c1cc8022daaeda3f45443c4e11ab1b086d8178ae4bd7e9a77fdbd8016484324248370bfa4b92e1a10cfa67d40592fafcd8540cc917c60b52ea1 SHA512 ea2f80b065c59b485446c8acc174b93a688b9e6d5de8cd9bf307a43811f6087368b528647a2371636b22dc082735b57e470e9c5d1092972c3890a9c628db723c +DIST genpatches-6.10-4.extras.tar.xz 4056 BLAKE2B b1cc5a0d37760aac34837b9f7b26240d92afa816b5456a334deaaff8e911cba25f15c5e168bcba86b80d9fbe006a4b07cf4aa963e68a92e5152033cbcb080be0 SHA512 765b58ae1ce61678dce39b27e9212844cfd991e222384c7650355a374a236918f622549d49d5d483bfbc6dfaa74120b66976e85bbfdb6b54b0e871f1d5d5ec60 DIST genpatches-6.6-42.base.tar.xz 2474752 BLAKE2B 074b24c3848ba0b2521d364d67222ab324cfacc3036b2c3b9ceebebf03afcf21d963921841f6f987422e904be35653f9dafc2a795ed6eaa050d6a37595bdd111 SHA512 6ce7c93c92a5f2951c9a60b7a058560dec8c3f9c16f00ac4b58c23f88ceaf9cbc519653320bc95f45039219eecb068247f3c27ac448c8695ed8c9e93022fdc37 DIST genpatches-6.6-42.extras.tar.xz 4048 BLAKE2B 0d86f11ef43c33b1014423a4417be73e4ace2eb5d9c38c7a63e8bc424eff7399137239138de1b89a70247f1b174766c9672cb05743aeaa14ea66d8bab67593bc SHA512 5d264209a734c4cbc48dab228b7d8570b735748b1c01f80beb2803dca3027ed78303ff937aecb1d8e3e6f2e2d4722aa0c1b5c77a4d45f2a9c53cfe1c0ac0affd DIST genpatches-6.6-44.base.tar.xz 2571884 BLAKE2B 117eb333385bbff1ec4056dc9fd7374260a33f243fe20462b914eee658a57b90e9115e9edbf5c8935890ddcfb233eaf88b3e0062245cb838953749c8bc674376 SHA512 e8bad736c8566bbdc081600305a4014301e4f6f74b73ee68efd818fb92e2d49bdbf0b7a2b66c5cd5aa8e56e7d183aa03c2a02e7328ba7e0c71fa1646e6868cc3 @@ -92,6 +94,10 @@ DIST gentoo-kernel-6.1.99-1.amd64.gpkg.tar 72591360 BLAKE2B 6fd503939c44f96e3bdf DIST gentoo-kernel-6.1.99-1.arm64.gpkg.tar 65546240 BLAKE2B 0af7321ddaea5a9b7d4d869adb3740b036e67d25e36bace334637951d10c41acd9f0232037591dc5c1e0585261349b5a1503bb2e9a1b5f7ba7548195b43035cb SHA512 47d63299f0ffb62dff610854c9099826e62a24a1d61a4f0e9db38aab1622121c647d514f295cc01cfc98152ed8159b0001a8077b484dd3d668500b052d58a918 DIST gentoo-kernel-6.1.99-1.ppc64le.gpkg.tar 59781120 BLAKE2B 7b986f04225db692031da3ae115c911510631cc6601d76a336954197ba3e0bfaeb2c3ef338eca34a64d95aa6b901ff96a8c06cd4b9af348813b7859b325b7a72 SHA512 5b2e2da18d64599b2418efc7e0d56aba57af4462ddd1ce0b691e07f5c08f249f02d9e5989f261b3b4836ca43a9eab20ad710caf4ed7639860cbaac1c4de268f4 DIST gentoo-kernel-6.1.99-1.x86.gpkg.tar 62126080 BLAKE2B 6280c49eba83e32abfb9630139f5291b88169410b1e892e50d82b34a3ec60ff8a33a0160658ff196133bfd19cbaa959f818186dbe0458f3407bc00ac5924c824 SHA512 674084d5e25c0e93f1ca0b7d61e224da5c2036951cb31d520abbfdf451a67cea4b09923211579937420412abbaeed6226b0029676fad4ab5b55504eca218aed0 +DIST gentoo-kernel-6.10.2-1.amd64.gpkg.tar 160737280 BLAKE2B d697e43a5cc520e2895c65cf86401357919ea8be6f0d54d5319aac4ee0450c7e0f5f1148ad5ba83de9ec6a9395370a3f9ca69b1f4261bcdd3c6c84faeb14c4e9 SHA512 150743684d808ebbef34e65d16aefc243fff231b0777a4d2f060f7e3ab53c6fea22c718bb5a5d60857a058fbb2a5e33bd86b5467911f19370b5e1cf105ab8856 +DIST gentoo-kernel-6.10.2-1.arm64.gpkg.tar 131891200 BLAKE2B 3b46113a10ff8b7a57e4f436aaa2cfeb4d95e9293fc158a70e52bd577ec5de573e17be05e5015a444a9da2ca5b768b6ebefd4a69e6dcb29dad31b82aad96ec56 SHA512 c8f3ed9fdbe4f761308a9109354c52d2ca1f65ca6289ac1d033ea28930a8cd94c313f5493a2e74f2b132bbc730de3b95acbed4330152bafdc1fb18f9a40cc574 +DIST gentoo-kernel-6.10.2-1.ppc64le.gpkg.tar 71987200 BLAKE2B 4609342bf865984397f6b166b786c4ab3520f298a92027679584c789f2545f7c728c4710fe817155b33be1c637c1fd26c46aa979258aba552755acb892d5bdb8 SHA512 9faccceeb88e902f8d43edde4d890af3274f849bff7fe7cfc176e1061778fd9856e701d04adb04b99f6cb8ad993d3bb31a65ab80d79c50b046a2eeb519b00e2b +DIST gentoo-kernel-6.10.2-1.x86.gpkg.tar 75540480 BLAKE2B 0ca33e131b3b86a4a3d49b54a95ac90efaedcfb187c1f1c169a448c7cf271690242ef8013e93c89d18cddb2217210f2007c56617720af2ad4f755be449d8ef6b SHA512 15fa48ea4cd43ccad8b8542a8ce2bea57ccd8ff8368fe234d7f4b5f8440ced254c3e14be1eda7b93bf2012ed61dcd6ea41c58f108341d69e9a149d5ddb4208b7 DIST gentoo-kernel-6.6.35-1.amd64.gpkg.tar 147220480 BLAKE2B 45178fff1c0cdf75499f735666eb89ef0a6248ab6182b3e4e9d85688aa2eca5322310363038f64d1d932a6fac244fb16d64b05b146471fa663f6f0350c647832 SHA512 91f81fd1ffc6ed01bbfc94fe52395c8c5f3bc10c7f7445df2c1d6c982c81b0154ea7638c5322089c2119363c8a810498b111d6e9562e6de7ce0672a41509e95e DIST gentoo-kernel-6.6.35-1.arm64.gpkg.tar 119214080 BLAKE2B 3342aba4c25236a26179d92a24938ff96c771c6b2da0e3590c37a06a5516d8005a7ac97fa076dcab8191abd2d8b07813b59b4f48fc71e885de2714b681e8930a SHA512 183c5557d19e6690bb02eb5f55bb1bd8bf16bbda9e69533b84d00c61d75e4b62d66842c753f4a9a8294c8e6127d428f3958f7d14661620e9c6866862546a73d3 DIST gentoo-kernel-6.6.35-1.ppc64le.gpkg.tar 64256000 BLAKE2B 89441b1e5b8b5de47e2e1b176e3cc51d1a4b19b8d7200c5168d40a3268b7e5a8b5af2a858ae567306ae2e4ada44046a55a72a1dfe7a3c6133592c897f2a28d77 SHA512 38a106716a3169e9a316d458ae541069594b21c494476876aa99661c3061f34e62ace80e2ed6028111790b9d504788c5b1c8a7494ee8f9b66b6ba52f37864896 @@ -139,5 +145,6 @@ DIST gentoo-kernel-6.9.9-1.x86.gpkg.tar 74874880 BLAKE2B 1d1cda231db1bd8341b1301 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 +DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.2.ebuild new file mode 100644 index 000000000000..8ab605ac59f7 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.2.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##*.} + 2 )) +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 +}