commit: 7fd136f1d9eba582cdffde8145f66d163d5cc1bc
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 9 18:58:55 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 9 20:23:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fd136f1
sys-kernel/gentoo-kernel-bin: Bump to 6.6.64
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.6.64.ebuild | 181 +++++++++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index c92a15a6072a..a6151a2e8927 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.6-70.base.tar.xz 3723176 BLAKE2B
19017743aaa0e1c717746592f253a
DIST genpatches-6.6-70.extras.tar.xz 4060 BLAKE2B
65cc5e2a27894992dd78d6cbfe5601f2e10b21f6e588d8a8d75f1f265f1fdab3ab03dd4d5c18e3ac5f48a6a72f021e2f125c5140224b26f0caeba3def4054042
SHA512
728495f3fa06f52f0ececb3b5e69b1cd4c7aa29d8ca02bc7a537616a2c1cf81859b5f624e125332a1def8176f7a878da58843ef8d363a5d622009b31548879c6
DIST genpatches-6.6-71.base.tar.xz 3745848 BLAKE2B
ab33221175b500bce645d302fb32095aa15a536ba475b866c41087d963e57a713579ddde608d93a5f2ea823e7126850599b49522c8c7112cf9435fd85897805f
SHA512
eecd342f586e1b594009f91fa1ac12399d90a164dbdbdb454414eeca9bd47ce04a78e0ceee28f889324ccc505112f6a3bb4cc093f88ed10a4c521869769f4e07
DIST genpatches-6.6-71.extras.tar.xz 4056 BLAKE2B
def4ae87c4a1b9221a7f8a38cc1b5e66867f599dba38f57b2641690a80ece90851fe9e4484d85894c5d41500d736fc5564c30669becd582898db2b8d3da3dff4
SHA512
66225121d986d43ef542899b32845867f22a9165c2a6ea7d891f6d8d35bc9dd6f6a0aee82e945a1566cb4c523b9b821175921e436f7217c16acaa9a1685bc307
+DIST genpatches-6.6-72.base.tar.xz 3928624 BLAKE2B
65d75de6e47496de435004b9cc85f29517583accbe8b795774c3cc48a9886510b2032a8234da1ef02f28ba42573d3c2ab3aa60e2bfd2bf4a2ed0dff4366c804d
SHA512
3432d58a63d5964f7c45b83d108825254bc7b2cc93dbd797f517d18bf3ac37b258503fb544781d8d8fe9ee6d335e7aad13eee5cad45cd68d45b11499d26f32db
+DIST genpatches-6.6-72.extras.tar.xz 4056 BLAKE2B
5c3a9d0cc988a15fb2ea4cc3edc0d807d7523814226cd22cdad3d82b7a67138cc860445006d32d34667ae5441201adbc28e250b4c9fdfb6340129e5a23aa13a9
SHA512
6712bf418245ecedd113c451b795be17c6886f3c081ab9204124faac97703c7d4aacb02c7b8a9d68b5d981cb280dfeffc0a168c576c68b3bc4f65ca9cba4702e
DIST gentoo-kernel-5.10.230-1.amd64.gpkg.tar 63324160 BLAKE2B
62af76878c2adad51cbdfa4f7fe6b508ac77d58490c807b8d800e971a6c60d32a0f6d8478bfb6d3a167e118d8a928a4da5c338a00d4bab3fae59a391d4a74cc3
SHA512
5a8eed28b0e8d49d5a45a4aca5e11c5f39eda93ed854fd9237c3cd6b90a511bc0426383b0a65293d6a5910bcbd27e67a26626e7df6844ee41797de527e2d2144
DIST gentoo-kernel-5.10.230-1.arm64.gpkg.tar 56780800 BLAKE2B
5e294f0fc44a4df76c251be2232b85ec94a613bf59a116b7753373532d7d45f845809df0d379108ac6c75a8ecf290da47abbb574453a5595a05fcfc3d143fa0b
SHA512
ecaac1adf2e5727edf3d1a0dc4c3cbbebc9fb6f8d574749c8a2c2bca7b0a57b6d66d4f28b9ee7378052cab4e7f671affd7f24d777f978b55396470ee071fe842
DIST gentoo-kernel-5.10.230-1.ppc64le.gpkg.tar 52797440 BLAKE2B
da3ae36a895bf2b8135098be61b6b1712dda4ad0ce241306b65d877bf48494f71d84ac209895dc73054846e23623c77144fdfdc6cfdc43cec9516f0be78c125e
SHA512
b352e0e7df9e1ac907b840348b3c341be45a0dabbd539ddd89bac158c11517164414c73f528c7c9a0a5b6c92404045e1e41ca906a393ff1e2ae8d17f0e6422d4
@@ -64,6 +66,10 @@ DIST gentoo-kernel-6.6.63-1.amd64.gpkg.tar 266588160 BLAKE2B
7c027dd6ae51c0dd7a9
DIST gentoo-kernel-6.6.63-1.arm64.gpkg.tar 241684480 BLAKE2B
0f106377785dd6abd9b38bc0d1284c0c7f3646f46e682487ac6baf520bdb017d743026399c48d9545792d70ae0d60faa574c10c7190c4cef917843a87385f61d
SHA512
369524dd39b1839239de8d68bfd059053fa7f0f8552e53ac103fa6ac4c4176f9c8f42e538225fd9392917116bccce0309f79b125afd9b2859793bfe7ad189ece
DIST gentoo-kernel-6.6.63-1.ppc64le.gpkg.tar 64337920 BLAKE2B
a0b9d53652113f5988b8e836d3d903e688980bc46cdad43039124249cafb74cfaac6195babf64917dc7fedc6889dfd23b971c1c772f7daad49e497a4cc3f5128
SHA512
81b0582f32c45949e5b38e3055804b42e38b2702e127380c993df3c5cd05aa6f8f5a58da737bbcef4e371dc968770a223785cfcc76fbfdf5828f83fa7ef0073e
DIST gentoo-kernel-6.6.63-1.x86.gpkg.tar 68341760 BLAKE2B
f13fb306fa881f8498955187f133f75ac437b68db3819fa251dbc0abd340ba51c049a72a5327d29624369b6e93e68770599aa5a5cc91a264f79d8f45d4276334
SHA512
6096fa62135d592b05850265a2cf755e4624c1377d3c471960db12076781bd0e4d000b5373a4492198ebc773129ad394e94030b66e02f7d3e57b66a7610c56df
+DIST gentoo-kernel-6.6.64-1.amd64.gpkg.tar 267520000 BLAKE2B
180bbbc82fbd8f00c988f50dfd42413401d42fa31d8a44d3124785bf49e713432219ee4eec850c084aba05a694337f666484ea465e490db74fd49d73780abd29
SHA512
2582b8255001738f3a9e62719c182a28c28330807ef2dc8e16443c95986df174a253fa36eed691862f97a9e7a7abf73b8d62954d692b2ed9f6504ec066593586
+DIST gentoo-kernel-6.6.64-1.arm64.gpkg.tar 242135040 BLAKE2B
5c43ccfd15cabc703f60998579abfd7bbf6aa35b07de57798f32e79d73d739367acdf5ffaceae6c51957af0dbfe85f3b6b195dbf51746f0afd387e125df9ae8c
SHA512
bb6c89364785f223ca6ae0994ce54b707ca88182daaad2322e5501645c10a8a2410322706596e8f5cb3901a59f6a2742a4fffe709cb2b91e7eac718e6084fafd
+DIST gentoo-kernel-6.6.64-1.ppc64le.gpkg.tar 64378880 BLAKE2B
302b2c567ace8d87738777519fcd00cce9eb0c53370be987d439e7ad14e21868a101101be3d315e0de137a5df18b301628f3ca92735fe92fc42bbd64980ad1ee
SHA512
295320344086ae14205f831c7f5bee5a0e70649fc5984834270067a9d0b820091cd3cf11a936466ef4aa0c36f4378cbf43fe1f71aef22f7083326e48c3bcf425
+DIST gentoo-kernel-6.6.64-1.x86.gpkg.tar 68526080 BLAKE2B
839a5c742a7a9a3ac1fb49b533f9d5c1e0ea367d68f3aedbf1709fb37b15448b1f23b2b3e277d9ed783b277cc3cf7cf40c448b9d2760f23196b5cd094f230b44
SHA512
67254751da697663e8e14171334e0a17d7f9260819d5fe9e3e9d601431ec79329b70125855d2f4cd35872378b88f499eac7c054fb4cbed9071d4eb3ed7c31b9a
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.64.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.64.ebuild
new file mode 100644
index 000000000000..cd18b39c84d7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.64.ebuild
@@ -0,0 +1,181 @@
+# 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##*.} + 8 ))
+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
+}
