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 A46CA1581C1 for ; Fri, 5 Jul 2024 14:46:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 464522BC0FB; Fri, 5 Jul 2024 14:45:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 02C512BC0FB for ; Fri, 5 Jul 2024 14:45:59 +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 38D6D33BEED for ; Fri, 5 Jul 2024 14:45:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C3FC71DDE for ; Fri, 5 Jul 2024 14:45: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: <1720190747.6345bd5d6ba68d0676a4c2d8c0a7f1e0e04a85b5.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.1.97.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6345bd5d6ba68d0676a4c2d8c0a7f1e0e04a85b5 X-VCS-Branch: master Date: Fri, 5 Jul 2024 14:45: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: 0bc6fde9-b2db-4c20-b98c-b6a93a25e1e2 X-Archives-Hash: 7c09c1cba7d66162387ff3b4d0d78ff3 commit: 6345bd5d6ba68d0676a4c2d8c0a7f1e0e04a85b5 Author: Michał Górny gentoo org> AuthorDate: Fri Jul 5 14:43:39 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 5 14:45:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6345bd5d sys-kernel/gentoo-kernel-bin: Bump to 6.1.97 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.1.97.ebuild | 132 +++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index f0528e19d22d..d01dea8f6904 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -18,6 +18,8 @@ DIST genpatches-6.1-104.base.tar.xz 5452728 BLAKE2B 49a8765789436c1bdb34f72e8652 DIST genpatches-6.1-104.extras.tar.xz 4048 BLAKE2B 526ac16b6ffd987dd4f87797eeaa4ab1d25a8f27fb5b924f13651330abaa2a29bcc4d7d56d5be63b6d8f1c25c8f3205fd51ddbef1b324de89f67731271b24283 SHA512 3fe90150711eec1c4277e6b4cee2599e97edf0902ec7efae1ad836ccfe62233e2c6944f7abc30042e7dd5985ba1f8a986bc3de086739f5a8b64d18c2d7025742 DIST genpatches-6.1-105.base.tar.xz 5482556 BLAKE2B 65a6acbab40206722368b4953749ad24c826cf8792271853092c3dc111197ff13efff6beb25487a3b3c136e564f400b6ae2a0c43826ac1173a0275fa5792e1f5 SHA512 f9ad78ab70feb8ce409d0fd86de797adfe8fd95c794deb388d87664f7f3754daf83590637059904ec4cc06d972d668efbad4ff91a9e86b4fdf04fbfd2c34f438 DIST genpatches-6.1-105.extras.tar.xz 4048 BLAKE2B b5be2421ceb2e112fbc1cdbecc96656653192f37648d643832d9accb08102bb55bbd44051ba941a2fa45de9d73659bad5b328904c4367ca808716f7b6ddc274d SHA512 ca050960b5c56bdc5dc0dcd0d0258293b693b893f38964d0a1ea5ad291a07c410025f162596e7b26935c20a6b151ee387635152f34cde3e8a2109c890181209c +DIST genpatches-6.1-107.base.tar.xz 5516960 BLAKE2B a4c1128db49bc5dec2aad2999279356c5c9578c8a7a1bd30c6896392da116325a81937ded85fd2684f206283a34fa3247af17ede459d33717cea0a58444760ef SHA512 ac371501c5a7e7e1f7ae2325aed969e2bb2788faffae6742f08836eb4495a21646d6875125957703fd2225066eabab9034022cf27a63c026ff02cbfcc9b00f24 +DIST genpatches-6.1-107.extras.tar.xz 4052 BLAKE2B e37572e0575345470b87d07d8e3a0a7e8f7284d9ebb987152232f5a09c54508da833d60982cddce2fe5997e2791866b61a07555f631ea75c130d094bb5ed4925 SHA512 b0f2f6758677b163da436205f7493932aa925854446dfe1f687f829b0ef2d53b371992bf2001b217a0b4ec6c236a99833c98f168b877df45aae6819e39d0598e DIST genpatches-6.6-39.base.tar.xz 2117476 BLAKE2B ffc2263d43bf5e87e3a57c0370f1cd1ecfac87ddaaee1ed3213f36bedbe4441ecfb062abebd1312572971e9cc9e5a0e8d3e16c7af98862b087906d61fb4e1e10 SHA512 6db496702e671459f3b054ce7068bfa48fc3b2be6bd3cbc3b158f7d4e0a2fa2310b875e46d233adea870775358e6e9b4f19fe8940d146575df9a41bfafeb1ded DIST genpatches-6.6-39.extras.tar.xz 4048 BLAKE2B ee5b09ec6303feb32fcd38a500900d6c96922a7a4032bea83202d25f914f2bb55d8e2e8e8d3b34911d0cc6755dde1e4382365f7351ccffe9901a0f6f671554c1 SHA512 d73671c60a9b57de492432eac1eac98178e1e3cd6fc2b68f4aaa24e6dc0fa4345a91633bd400f78a982e288033c69e0d28abbffc90ac2bdddb3430d2ab3bae91 DIST genpatches-6.6-40.base.tar.xz 2364536 BLAKE2B 53bf04c020921c8d0c2e7ff8466db4cf5078ac8985e95b5b94c5fe9e824747d66344acd5d8675c42364704dc34268cd636fe10bcb02b657cac889ea8d0b4ae48 SHA512 c5852fc2db474fcf697818cec947cfcce0dcff834c57c042c42321889839d94c26d1994dfc275e64e0acba3055c90f0f0cc4e2a07c80a71a71f3ba99f6093401 @@ -80,6 +82,10 @@ DIST gentoo-kernel-6.1.96-1.amd64.gpkg.tar 72581120 BLAKE2B 2ae75cac2d5ef149a8db DIST gentoo-kernel-6.1.96-1.arm64.gpkg.tar 65525760 BLAKE2B e4537c337a27dfaa54b07c35305a5d2fd4fd1a9bd79dfba60ef189c4cbf467667d190acf1a89eb14b28f7ee9700a900be5606db5963cff2ee8f35914512d67c5 SHA512 969b7f89e80a6d12f65a9deb5f290592f99b883b7bb47cafa11130780e35a985f6249161714b55a0c1e462d2b162858c854f2ccc2a8fa34e702b16e69cfdc70b DIST gentoo-kernel-6.1.96-1.ppc64le.gpkg.tar 59781120 BLAKE2B 5bf52475dbd05533294c056b5ca79fbeb06fe46003f90d3b45e459d4e33d7a424ce0cc87cae973c68e43b0de599ad8454b7701737b05dac21e7af20d8766f92f SHA512 2fe07dc528ba090c59e5e8fed384850bf4e7c03d2f3982a8c1055e93c141ad26cbcfc801b90cbea9e648ae961d3227561318fc7fab223ee7e4b427c904a4d8c4 DIST gentoo-kernel-6.1.96-1.x86.gpkg.tar 62126080 BLAKE2B c613f5afec99730a56acd99330d64a3277571cb30830f311709585d7d37cc08950adab324f50edad99b34bb195f561425852d6da58fc33a9efbfde14ef705f51 SHA512 7a4a9b1a8774f9ed632107d316e24a606770da189ec5bbd06adaf4a47897cad097446ec9bfdf047cb1ab8347f845887cb8c673156be1ed6560ffe3dce57c70e7 +DIST gentoo-kernel-6.1.97-1.amd64.gpkg.tar 72570880 BLAKE2B 37b48f080b0ea5b406a0577982f2a1c9356a161136a772ed9915d081d8507d2aeb617fce9650147f4bb8c40ab4b52ac9317ee3546251df54a7015c13b94e81cf SHA512 c0e28548e074f19b95ca8c6ef9926cb16985c1e1f74c450dc6175eb3ddce96c42f19a90d8958067c66a6a415a819f3a6f0634585080e1248c2fe08f296a984d6 +DIST gentoo-kernel-6.1.97-1.arm64.gpkg.tar 65525760 BLAKE2B c5338284b3dd55d7ce6cf30c38e94cef40455f659102e46fba1bc19ae28b5062d2dd02242fbabf7e0dbdc7ce79657418c7c2a667877f44d00766b363c59f1d6c SHA512 cf34063bb5926723cf2d3ff5cc8a26ef3fe5a9e41352e24a30e1ec3a8c2298e0c26a7f6d6e26c68ce391fc8f0a775bd37ac0c96f16ad94f3a831ab7d22433808 +DIST gentoo-kernel-6.1.97-1.ppc64le.gpkg.tar 59791360 BLAKE2B 1d892038cc7cecf2b9c0dedecae1f60d703459698fbd0c19eebf1cc86c99e1280bcc163a0051c989491b0494d332a582bff9c8275a03e7d23fc3704da0d6f668 SHA512 28912b7f4993e6ef04c843a20e07c770808e7236826e3075781b1ccef155e20def488133a053ceb2b800f48cb660744c9de1ee4a240ca50be54a5edec334520c +DIST gentoo-kernel-6.1.97-1.x86.gpkg.tar 62136320 BLAKE2B 511445045990fa6fc459596ecd2c5a02a2ab229bf56e7b5bb2263d8c2ca7fa47e5ef823976be1505f0ed38a70fd1c3d9cd22847a08f00d462f5dd60c2f1c8e17 SHA512 f34a466d2f514f574d6a3cfeb23453f5ac91b8aed976d14d9c598f7bd2d9049280132c722e085c233f8c472a1451e97b66207f8dc1b5f146166c796361c857f6 DIST gentoo-kernel-6.6.32-1.amd64.gpkg.tar 147384320 BLAKE2B cbb095a73c7d1131486110b342904eb1fe2a712b56d361a027fd964329321451158ec0e5a29a1f6709ba3f455efe7eb858c629a8a0a4eca244f6827de7e0264b SHA512 c711d6c86a57429c91037c87945616b4b99f1ff268336638591e06dbe37b791ca61236edafb174346b6695e78247793dc2e2a714ed48fdeb076f9d450cd1ba3d DIST gentoo-kernel-6.6.32-1.arm64.gpkg.tar 119357440 BLAKE2B d84d3d0cee04a1f545b97b675b4c84d411fb45ee5454aa0cdc4407b396a1b5623fed095e1dae4f6519947ee9669a7f338b6c4a5f200d3c34507d41a4da93f04c SHA512 8e979b6913220cd4df4dcbf2ff84ea516a3c17fa141862352d8924a0e9b817d98a6368aceab4bdb0476203831e32705bec11314136b5761f68107513a264176a DIST gentoo-kernel-6.6.32-1.ppc64le.gpkg.tar 64419840 BLAKE2B f65e2d413cc9fd362b5708da6376beabc92393ffef64ba20526a71f31525d5ca3a4c8dcb6c2c1da7abe7b3327abdf32a297986763cfa972335a1c94023c88141 SHA512 a074ccea453375f11943ede64ccfe00ab2f212057c2beae20b67ec85038bf0c7b320ff0aa1aa9175c992c0ed35eeb8b26dcad1fea144730f69e1ea99c43840a6 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.97.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.97.ebuild new file mode 100644 index 000000000000..81911930d7d6 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.97.ebuild @@ -0,0 +1,132 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-install toolchain-funcs unpacker + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 10 )) +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} + +LICENSE="GPL-2" +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=":" + OBJCOPY="$(tc-getOBJCOPY)" + OBJDUMP="$(tc-getOBJDUMP)" + + # we need to pass it to override colliding Gentoo envvar + ARCH="$(tc-arch-kernel)" + + O="${WORKDIR}"/modprep + ) + + mkdir modprep || die + cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare +} + +src_test() { + kernel-install_test "${KPV}" \ + "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \ + "${BINPKG}/image/lib/modules/${KPV}" +} + +src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # 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 +}