commit:     baeee27c8a6725de0b6c8ef093e8db449edd3c5f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 06:04:35 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 07:16:30 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baeee27c

sys-kernel/gentoo-kernel-bin: Bump to 6.6.74

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.6.74.ebuild                | 183 +++++++++++++++++++++
 2 files changed, 189 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index ccc210610281..c06ef4197faa 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.6-75.base.tar.xz 4089936 BLAKE2B 
f88b0f84e3d73f87025389a3a66ed
 DIST genpatches-6.6-75.extras.tar.xz 4056 BLAKE2B 
6e2e14f16a7ebc675e84b180a8f26f485aece3f22de1d27bef60b414deea8f3744cbd95536b58722d793aee320b505d5ca3c0af0b1e20f238b02c29a12abada9
 SHA512 
c8030df10b17675adf3c48931f04c59d1795598c955eef39c7b3dd4f36c1af1d79e8d7405004952cfe4922cf100aa95d2fe3d7c6f6e0d683276d5382bebce399
 DIST genpatches-6.6-82.base.tar.xz 4255664 BLAKE2B 
812e8caabf0a73991504a728a8abc5a61a0b51ac073be06bf18b87e6de0291fc568ce4dd2dea506ce0db648669f2341843e608d0184cfb4dc233d71d57518137
 SHA512 
5fe4f880baab09d51b2fb36f3501298ecdfa382f09699f64c887ac39d84788ed4c27a9f7fd1d5766dbbdf8135956f0f81b4adc09c2558682f8f7dfb1ac7ce6ca
 DIST genpatches-6.6-82.extras.tar.xz 4056 BLAKE2B 
e2f0c26e84f51fedb421fdbaf2afad1ee5c456f3b700ae9232ed8581ba73db2e5de69f685651d8bd7e9ee547a34712367ce7515facb33c7cf4c707c5e10e6883
 SHA512 
36c6830ed793159fc09139b85f87abfa7c195726be667076be5c2fbebeeb75dd508db52073395b9bca3a53c3496cc3c49e59d9717db8ce53a301f17ae9deee24
+DIST genpatches-6.6-83.base.tar.xz 4270596 BLAKE2B 
f94c4d0387957b4384a893f37bd232eba24dac57fa73297f4c25822c2aaaf6e9616c402624e43daab655c31677a59129dc853914fe9817125281ed40139b0bc9
 SHA512 
7479e6ffc5e736cd36df2a3f66079514b016059a273ef92d2e120f8da050c0383f8249dbd9f45daa1ee192117942d339b0bbe1a6afb1eae6e118b483fddbb8a2
+DIST genpatches-6.6-83.extras.tar.xz 4056 BLAKE2B 
5b28f9a1750f3aa6dd30c976f1ae8431a93d44967c52dab2bce6b3cc17c75c063ef675765da94a212eab94dc64d144283049570d413b5d7acffa7be207249557
 SHA512 
27a91748aa74628c3fdb78709e39166858280a4cd80f4d3241e96158d1267b79c0a6a3cbc9b70fb7ec9069e6c8c7f7210efa174ffca4aaf3234ec34083fdd61d
 DIST gentoo-kernel-5.10.232-1.amd64.gpkg.tar 63672320 BLAKE2B 
43d75308443842d0dbc65d355c09ae0806c187c4ea3e9c87d5322a236081aefa6a1af8661ae1d6203fef60b574996b0dd53699bfe07eb67b08b58f1aa20c3995
 SHA512 
f5838299ec65113eeabd7e516375641857de9512e9b6bc4e85ecffffb91519baeea4b0eb2769d5e675740620e431fc9955d76fa04524c50f1c292518e8c42d33
 DIST gentoo-kernel-5.10.232-1.arm64.gpkg.tar 56852480 BLAKE2B 
6f628a7d0b7feb82c903e2814b2f02ceac867270356ffd3d06ad5bf03a55da340e089739fac83ef727fa03148a7adcef5f00e295a26f7f88ea46cdecb7183b94
 SHA512 
dc06388259a4d5878c7045eeece9393edbd0981538ae9b7208e3dd4aedc49d9b5f71178812765242cd0383145529af4a273de165c15c1d72f2e852a18620227c
 DIST gentoo-kernel-5.10.232-1.ppc64le.gpkg.tar 52828160 BLAKE2B 
1a77533dc0bd3072311120b62246fe8ed2ee57c06354cdd1aa3657ef2aa21f3adaa780910a3f357804fedd6d65006bcb5ba29d5786d291f51acd1142c706118e
 SHA512 
de8aa68bc5960b5dcca618641fdb570dbb77b83f4f02a28f0522f491af0a7d83795879d9b50a1a19c780ef6d4b941019d9cc945af31b8eac7219f5647ede6440
@@ -58,6 +60,10 @@ DIST gentoo-kernel-6.6.73-1.amd64.gpkg.tar 270254080 BLAKE2B 
2f6b7c07d0f76b4728d
 DIST gentoo-kernel-6.6.73-1.arm64.gpkg.tar 246190080 BLAKE2B 
fe33d999d1d820cbb7010a9485b8b6babdef8ebe0733a8b7c031b09ba0b1f24769ea19f33eead0cf887996128e69a17c96b37c885e97b8deedc8165063d1a3e1
 SHA512 
e54fb54799f21e031cf34426cdf9dbc2a93ad991c8b1a5e7225f47cf924e3a680ad30d9733816aae0005ebed290f67e08d5021e853d905e2b7c3647be815db97
 DIST gentoo-kernel-6.6.73-1.ppc64le.gpkg.tar 64409600 BLAKE2B 
b7afbf8f549ff0f165aca125c86c1dd1e7cf2f1f212b65f99d5c58b643cd4e2e8eaf6690d1115a7458381c738fa81c5913507bf1243336da8657f160388cb05c
 SHA512 
7ff67dc6c5aa31400e46e13cd612fbf2fdff55db553151c1950a37243226fcd79dfe09be46a3855de3f1a0f6ffc11228224657c4d12e59dbf3db6a47e9d425d7
 DIST gentoo-kernel-6.6.73-1.x86.gpkg.tar 68567040 BLAKE2B 
78f4c3bc87510851a87a52298ab9f0d9c7e6ce81c37f39d8c52590a3880b3252e32bc909fcdd6e70a6367afe15d4c149d51f7cc58a6d5931cb2147049e469ba9
 SHA512 
f7c23b381c85db2d3b6d94fa1ca782e24f7491cbfc6fd51782c81040cdfc01538135d4ca6e52633fb65c04abbc46536b1f6536039dd50e7b17890ed5ff3131cb
+DIST gentoo-kernel-6.6.74-1.amd64.gpkg.tar 270028800 BLAKE2B 
e74b3ccc5ba74a5138536eeaffb699cd7130b6e05fedeb4e85464def2eca67e153ddcc61a43be9eb6c46b402024411578b3abdebba26d4cca3444d1e84e7fdd6
 SHA512 
7dd5bdc97bfb69ab6d859d52823f737430d4cb5d16f20dac7c081706ea49b05de6dc4f17d79a87666133c45220e5d02f82255e7e469feffe0aeb3b7775257ed3
+DIST gentoo-kernel-6.6.74-1.arm64.gpkg.tar 245944320 BLAKE2B 
d113815afd6a696630525b13775d625c33f087c5c6fa817149b478b94153414eab8f413b236144b3989a043329b82c0f79f38679e1e6d65fab7c8fa4fb15ba43
 SHA512 
9f855f1882e40a1b596041c1370500baa1119ec3e4987ef500487dd87f62c1b6527eca4b23df4001cfc167f9375101ec938f783d717460ecff8fb218c371bbc6
+DIST gentoo-kernel-6.6.74-1.ppc64le.gpkg.tar 64409600 BLAKE2B 
439c66dfb35eaf37b5f21d7a36f728230861cbf1fd3e4e7420af87ca2d8b45fbbf0b730ca17670c513b4a7bc060d5e13b3f99db35df4e8ad619940bcb4886ee5
 SHA512 
673bc0a287737dca8079466e1fe2fb1f07d19ca15f05aa4c5537f49dfd486d7ec73172025f43d8474707e48814407980b0b842ec410257241b5710bc169074e6
+DIST gentoo-kernel-6.6.74-1.x86.gpkg.tar 68567040 BLAKE2B 
4b98f4057bf8edc596fdbc90e18fb88c9a7811a078cf7f83fe552b3daaf090f715bf547cd7a10dd599b472097987db8cf7a5c204610bc2553594327da3b09720
 SHA512 
44c8f9ee2f432d2fc0c703c47401e4a8cc547189181f629cca6fa418a77b91c49b7c618c4c0340235e69187e2eb27b56cec4b03a231f6399762aab03c7e16c0b
 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.74.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.74.ebuild
new file mode 100644
index 000000000000..7ffb1f6159f9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.74.ebuild
@@ -0,0 +1,183 @@
+# 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##*.} + 9 ))
+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 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
+
+       # 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
+}

Reply via email to