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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A2FA6158042 for ; Thu, 17 Oct 2024 18:50:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8149EE09AD; Thu, 17 Oct 2024 18:50:23 +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 93B7CE09B4 for ; Thu, 17 Oct 2024 18:50:22 +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 568ED34307B for ; Thu, 17 Oct 2024 18:50:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C18A2468 for ; Thu, 17 Oct 2024 18:50:17 +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: <1729191011.72f52741c29ac8fd388127921bbc6c72d1816b28.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.57.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 72f52741c29ac8fd388127921bbc6c72d1816b28 X-VCS-Branch: master Date: Thu, 17 Oct 2024 18:50:17 +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: bdd728c4-a572-4942-b885-47cd1ea9b401 X-Archives-Hash: 2a72fff360d1688535e574bdf412ad09 commit: 72f52741c29ac8fd388127921bbc6c72d1816b28 Author: Michał Górny gentoo org> AuthorDate: Thu Oct 17 18:30:36 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Oct 17 18:50:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f52741 sys-kernel/gentoo-kernel-bin: Bump to 6.6.57 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.6.57.ebuild | 170 +++++++++++++++++++++ 2 files changed, 176 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index ba00ba006dd2..d426906983fa 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -36,6 +36,8 @@ DIST genpatches-6.6-61.base.tar.xz 3347520 BLAKE2B 1ae6cdda7741b2ebe6c835e98d9a8 DIST genpatches-6.6-61.extras.tar.xz 4056 BLAKE2B 9dc9a160fe6b5b73ad7f479a8edb246db66adcb7cafb1dfa770e0ed234d56eb16bc782b42b17e80bc8048ddda986a219dd3e018c97d887e5e249cfdf6c1137be SHA512 780145505ba77b93db165495fdb66ac02687ab0f15d9e0718970557e9b3b12e913abb33fd99db74c68157766f144811af6bde0b99baff62eaf4277144867d066 DIST genpatches-6.6-62.base.tar.xz 3451484 BLAKE2B 526cd644a849da225bea9e77c91320c6fd28c26609e47123051eacc13827d9307b8bce1e53c0ec7ffbaaa9424c2da8d6573d40fc6ac18b4ab99f471b2ee7818b SHA512 68e0423803d0328bdde104b8eed06b144cd9aea0a6f8af8698c9d954fb3301a600de0bb9c48e084f957ca0efcbac5afb6520d234b8b2daba45cc203514931393 DIST genpatches-6.6-62.extras.tar.xz 4060 BLAKE2B a475e52b151241692f6db4b41b19d6ee0212fafa1570ca47bd9c1b6e3a3b00a00f3a12a023f5c13f519dac46a01147d513ebfe37011fc289e9b3590fa2fe5a69 SHA512 dfcc7657e7299fca6d3da30fa2ecbdcc00cc1133607d3ded5d2f8f9dbfd5877906e357368665fe3757ae6b873ae4313c321ff79b8cda5ed213b7a1866dc9009a +DIST genpatches-6.6-63.base.tar.xz 3551092 BLAKE2B 8edca00c49096ef4682038389b19e312773d3a56e29a03527e8f39ae835243193e2afce6411e0f1404af899793e766e108134d990dc666f15eebf02d6dfe6475 SHA512 0b51ff04cf01262502c3b1651288a87f235f3c1f4cf8b92699161353ddd75cbaecc27b8f2838375d77a4cf99a746a2175eab6fb0d23fdea67a6d4e9b89279ca3 +DIST genpatches-6.6-63.extras.tar.xz 4056 BLAKE2B a7a361bfe180362510300753b3fea12bb0ec1014a3b7307211931193672db1216abf994ba8cb22cf365221202dd93f4b49fff6970c8eb88b7a77ef7bd02d1f12 SHA512 49574eac90eb749de544afaa7102163607bc24e2214ccc3c84cb6bf8f60773c45831da93bb5598aa4b933f65455228649afcba6d93107a81a666828b0919b18e DIST gentoo-kernel-5.10.226-1.amd64.gpkg.tar 63303680 BLAKE2B d7fe1733fc5686e91cf3cd086e64ab3695f61f71d053901fe6b3bf8946cf67858b6fcec89ae4430b3d033c0a8c2069d3ad2c85e9f3dc12cf0fc3ed637fade62a SHA512 0b267771cda36cd5597d2e6dcada6b1a17dd0d89df8602bfa822fe94d7e844f0d81bbc1177b88a54879b273bdfbcc9b479c6210ed476f65b075c8e52bfd384f7 DIST gentoo-kernel-5.10.226-1.arm64.gpkg.tar 56750080 BLAKE2B 7dd5adef82039d4aca30824168d5eb56d95dfc0672e7c401e6da9dfa3cb1bc4c4eb0e56a2a3a769cfe92e3c71d19e35af5c7017567cac6d5026b3b50e280b513 SHA512 fc19ce80ab64b670b48d67913ac81bc953e73d91f9e84f4421e6e7aea4302f6ba43db786b8f83626d89b47b881f2e88cc1794aafce5e75704f4d141a09f3b12c DIST gentoo-kernel-5.10.226-1.ppc64le.gpkg.tar 52766720 BLAKE2B 830c15ec760643c636c1294a8cea2ffbb0f46589196cd10a97c09e4d131a2e32398cf18f3f4d832e0ba1a123f031953ff3f931d86a60e6e6d80d8f7f5f0c446d SHA512 e1662eaf7551b54afe01a0b23f88447e3ee7684d17d6515fe4cd9e6dea28293d440b677a1e55b83583c74c5362d6e9bb5939314368c3e7f6bbf462b60e055dae @@ -112,6 +114,10 @@ DIST gentoo-kernel-6.6.56-1.amd64.gpkg.tar 264222720 BLAKE2B 9744f94c6c7d3e450e3 DIST gentoo-kernel-6.6.56-1.arm64.gpkg.tar 240455680 BLAKE2B 3146686d24594a64dc98e38fe66f556fa420f7af03e3881b92bbbec76902fb7e5d5e1eb0b07758732d5894bb9b78d6d5773cd84af0efa284125edb14c5c6babe SHA512 c3f463b8a05bd79fbeaa8ed16b093198d51177ba669fd4b275160066ecd17e72867b3ed0453dcc0f569044cb53889c3a0cb4e18b4ff18839f12c49ea25493964 DIST gentoo-kernel-6.6.56-1.ppc64le.gpkg.tar 64307200 BLAKE2B a5931dcaba361d9746e52c0678d9bcf4683790f8ae8774a077cc6e6581b675a54e3b81f51c9c4d90943c1be4981ff357cb2f2874ec0514572cd1fa0fd61726d3 SHA512 2caec2de3e2b7e2b4171f4573228a06f3e05f18bf72c576fd88718b2f5d1e124e746b32e05c80ac9e7cdb30bef0a4cf124badff06e32918b7168e302335c57df DIST gentoo-kernel-6.6.56-1.x86.gpkg.tar 68321280 BLAKE2B 83c9050276f6dcd7b5a43d48f2de4c5223f426fa4be513e6e108456c73c9cf380ada26a35ba00da03643b6afceb6ef595ab26e3063655c840046146b5edee35d SHA512 4503abad28c822948198231c406c82b53ff8df2924a4c05e4f1f742ef336b5c71d007b5e45872b8eddc2308a0fa6dcb8f3941499532bbe4df54e5c67b96e4047 +DIST gentoo-kernel-6.6.57-1.amd64.gpkg.tar 264243200 BLAKE2B 6929ae1df44f7ca9ded205e42ded2f601f6252adec0cebdeedf2f4343a2f4d62c904ffb1b1c30b948dd5928d00ddea93db1382de1e06e8cac71749dc3120fb9b SHA512 a55c92d767adc3186e25d2ea652432f2ecc900e4c2d7da8c83264cddc4661aeb4ccf7c1bfdb801cc53bb166a900ed2045120646fc9018fa89de9d97678827dc3 +DIST gentoo-kernel-6.6.57-1.arm64.gpkg.tar 241264640 BLAKE2B 4f3d7c7e1f4027361bb2705e12bade25342e4b38ff933e81bb4708f6eb77e7096da69912a86c12e2e5ed3cacc1c9fe00cfe31ad4e8d46f2fd406c4fa8277eb59 SHA512 68ba3e5736dc0c98fbc8c14b75246063710f504d36cd7aa4ff4c7a7161d0120a67ea0d6d3b5e7162ea734d959b77398396e7b00a833f6056f8ef94c98ee8cd6d +DIST gentoo-kernel-6.6.57-1.ppc64le.gpkg.tar 64296960 BLAKE2B d679aebf79ca62f5ff7c01bce794067d74b53fe7b60f42c18a644039fea55ba4de95c2f4a75060d38f276353c037575cea6c98668cfd1ff3adcc26f12dd84973 SHA512 73c659ace206fdbe9b4abf2115670afa2416e36c489f45e332cc8fa136f889590a329acf959df8381fd59191677799b6ff4469052a0368d8c11d5bfc12b9107a +DIST gentoo-kernel-6.6.57-1.x86.gpkg.tar 68321280 BLAKE2B d577962982fb92a7a1aac507891dfee465f28d6ecf7a8dbdcd28ac122dab5f379150602d80b77b27e41cb73b7c1ab3d80a6c8cf383d70f0388eec0ba1404ef43 SHA512 be0e41ae412b3b08c5f38690ddf17ed506c0c00e1e97e637f9c666f0d58cb769d765a0b683f19cceb129597fc180067a82c6ab42892d8ec3dfa6de99ce154983 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 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.57.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.57.ebuild new file mode 100644 index 000000000000..9f37dfa41127 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.57.ebuild @@ -0,0 +1,170 @@ +# 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##*.} + 6 )) +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" + +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 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 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 +}