commit: 4b7ed48c6118db79e56eafaa0d413a7a92acaea1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 2 16:28:36 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 2 17:08:32 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7ed48c
sys-kernel/gentoo-kernel-bin: Bump to 6.6.69
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.6.69.ebuild | 181 +++++++++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 3429cdfe9aa2..83b31fa53038 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.6-76.base.tar.xz 4119292 BLAKE2B
643510f5f01b8b7ac5c24098cd65b
DIST genpatches-6.6-76.extras.tar.xz 4056 BLAKE2B
51631e3f138ac1f5146bc8d70f3381ad64e8341336cb1d706b2b3f838c6b5e884a1c60745bebf73ea25ae7ec26ec049d76db7e260593b3e7a4795b98d4488734
SHA512
fdff2ce695891603f3b9bd6b3a44df526559f454edde20e5159c9e53d73fc9820eba1836ef81b22da9d3adf7906fda16e9b6e6a3df65bff56519c40dad56ccc5
DIST genpatches-6.6-77.base.tar.xz 4120472 BLAKE2B
99c511e049d8b375eb54c8c00688e695d22629a758234fa47e11222b5ab2a448c22e2fc29bff59c95e1c39992e38a22286e791a9dab16b0e3acf59f1681c6adf
SHA512
1626b4b76bfe3ae1c6c01d11909fb65fbec2e570d987268aefdcad5558aaf2a3a95f3f159b73e1eeef4d66abc5f42b965d3c9200224433b788fc1a3400a3b9bc
DIST genpatches-6.6-77.extras.tar.xz 4056 BLAKE2B
72ee0f92105f7e24d08e54614b5fa1514ee8ff75de5781474f56a3655665c5d3152771e3379bb431fb73ce19780620de72858cf64585109033c851be05efb0f0
SHA512
afd1947987efc0268727e6019910aff4f8860ab60707a32a289a454253519137dd7e8da92ea2743706b124ef873f854ff8ed6b3eac719523ca5ff94f466b261e
+DIST genpatches-6.6-78.base.tar.xz 4145152 BLAKE2B
24e2e975f186f08be3d9b75f08e9c8a2e3081f1cae68ccfc8c6f68aae46f8b8806ec91c8dcf7d0b6decf1e402c545dfdba5ee17f09e6d6fd220c62f6e01de939
SHA512
306d617bab4a327c062f2d6d2017dbb3110e8f17484b5a3de4fd9d805cafbb51410ab4fc20f93f4b35e9b6917ef015b0e6280b3f6a76790d4c546a6771765271
+DIST genpatches-6.6-78.extras.tar.xz 4056 BLAKE2B
464b1eda63d76013d5fa0eee1d89b135100f69ddf7e1d773cad3e021d197cf1170d66a3de6a30045a789cc03a6b69913ed222c640201c1b9ce8306ca089b564f
SHA512
71a9421ce799323791d0d616204b0095b4b5c799ed8b1c2786bd65cfe2c10b801200d07b0a1fa2c1ccdbe75f0d2a6a18ee62a528895bf5d4d804e42af89aa2c9
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
@@ -52,6 +54,10 @@ DIST gentoo-kernel-6.6.68-r1-1.amd64.gpkg.tar 267929600
BLAKE2B 0c528d6ce1ac12f1
DIST gentoo-kernel-6.6.68-r1-1.arm64.gpkg.tar 242442240 BLAKE2B
16b23d8610329efded5161e971373ea6d79235dd15f09f4f07b2b9f4bd6259762e13d379c861660813313c0f478ccf56e74b70a2003739108f3baa9c940c214e
SHA512
5d657ef9cf777957566ee55e480b10e420dc0fb310594e3457a37c4736a9ff283ba7a1156aa07adf4193862eac4ed4c1739f10dd9ff61737618b49290d5b5d4c
DIST gentoo-kernel-6.6.68-r1-1.ppc64le.gpkg.tar 64389120 BLAKE2B
93e588eebbad6af84c947b6466397a17df1a0ff1d4d0bf98fe4ee777b87556e4994c8053ac8ae146898e7a0f909734797cb964d4dfeb7f2917e22e51908ece94
SHA512
19313998663719837d05c3a0140c0a93ca5ed9d134e7d324e7416fdbda00957954c817897750a71c1568f00bc8482c6f2d0f7555e528731553aa66726f998145
DIST gentoo-kernel-6.6.68-r1-1.x86.gpkg.tar 68546560 BLAKE2B
52f703001f82e8ad0e4cc6b93ef6ee9e8869ec5addaf2901b41471a92c6764c2f7c3911542ad325f0803a4327860d90f8fdc2eb2f2bfa8e8a75b39e33fc9b8c5
SHA512
c3df574696f672c04e89478905fed5be470b8881090ab3b665a22a377ff4847da311d27190b6b4ad13cdd83d73f63a0907582c786c4280a9930cf3c03ceefa0e
+DIST gentoo-kernel-6.6.69-1.amd64.gpkg.tar 270131200 BLAKE2B
27e5e7e0e330d7174ab81345188d109bac0d979e1f2c17e2e945b39417e42b31022cca21bb3e004c734c3c7409884eb0049c8b4c3a2fe5dd2ec205f9a88dcac1
SHA512
004df2c2c29c53bde90dc1bb64a974495ee070bf03ebba1fa58a4b29115603099a6ae744716b460b5b5a70c398ee86c0b73c696a961ab4b240a84e18bbc06fb4
+DIST gentoo-kernel-6.6.69-1.arm64.gpkg.tar 246323200 BLAKE2B
2bbc570c961a505e169cfc8b4f762001838bb100bd1ee544b089218c9f1299093dc8b818319ab925abb44ba1a8795f74da706c71de0706fa8647d361464bc635
SHA512
4b37192c67872701447a4872e038f02876f19abb78ccb16b596e90a46d33654fef9956c4b1a9cdd54aa3b23df7302de81927c772b1cbbc1c16f6101423d7ae05
+DIST gentoo-kernel-6.6.69-1.ppc64le.gpkg.tar 64389120 BLAKE2B
38d41d95e482e9354f83eb71e3c552b87f40971fe1fe7c758aae16654304768b5089cb5ddbfdb06a7cf0a3cbf1e90ae3ba3e50c9046c13f40c1fc5fefa102183
SHA512
921d1f4a7c7dadf4c72541240eb550b43e0463c5b15f670f6ddfec41e00db464acfe5e5526ccce884b138f973f81ab454fab3a32f1f2ba7d9c52fc205f380352
+DIST gentoo-kernel-6.6.69-1.x86.gpkg.tar 68546560 BLAKE2B
dc98e8d52ac1442f480e11e918e4cf8eec46868a20122db3fe393e9ef7b03a857aa48c86e97f2daa1da98934267b0049331f4ce10c72e076da21305b84838b0d
SHA512
1c88fb1d1f817956824070b4f43836d471a04462d0026a88117654ca5f8b594937b35ad49e16f4a06c265f09cf62474b45659748ee998a40bad6f13c97768e99
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.69.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.69.ebuild
new file mode 100644
index 000000000000..a0a5780715fc
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.69.ebuild
@@ -0,0 +1,181 @@
+# 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
+"
+
+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
+}
