commit: 97ceb170488f1f44570d59ba09b0211f101723c6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 18:16:46 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 18:38:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ceb170
sys-kernel/gentoo-kernel-bin: Bump to 6.6.66
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.6.66.ebuild | 181 +++++++++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 1aa08b03480c..19035fb74bb4 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.6-72.base.tar.xz 3928624 BLAKE2B
65d75de6e47496de435004b9cc85f
DIST genpatches-6.6-72.extras.tar.xz 4056 BLAKE2B
5c3a9d0cc988a15fb2ea4cc3edc0d807d7523814226cd22cdad3d82b7a67138cc860445006d32d34667ae5441201adbc28e250b4c9fdfb6340129e5a23aa13a9
SHA512
6712bf418245ecedd113c451b795be17c6886f3c081ab9204124faac97703c7d4aacb02c7b8a9d68b5d981cb280dfeffc0a168c576c68b3bc4f65ca9cba4702e
DIST genpatches-6.6-73.base.tar.xz 3928696 BLAKE2B
c5955b4fd604c01e2056f167a4e4510e5c450daddc49348fd2434c65f20aa2789cc1823d03623cca15c47840830affd035676189fab16db34acf8df320b79646
SHA512
aea78f633aa046e4e1bbb4ae977eeab8f276cd007b6f7283db03be621293a5f29a5b0da95e761bc72153875ccbb9f2ac88625b3f6a6ea0cc742f565760c93198
DIST genpatches-6.6-73.extras.tar.xz 4056 BLAKE2B
7258b54caee92901aef45569d8d45d218640095b622e0106a0cd640d13fb0c377e9dc51271e5d652922ac250c74e99d091a668cad526d30821e4db676f8314cd
SHA512
7b6995087d0f94c7f2cfec46090208bfd36cfee60dd26343cdc108a3e2e1ffb2e906f1e990cacde1f72d5b920a8746d4740f64c64bf39a8dfdae33949a35acac
+DIST genpatches-6.6-74.base.tar.xz 4055280 BLAKE2B
448044e3dd03bc4fdf50e99985b5d3907c0753969b3d3a7e1fbe52859c658b80f06f90cfa42172e132df6989ac8d56a9e638cd11618dca2671de188b792c2e03
SHA512
bb00296da7f6e87eb9f4897cb5bd705ed4fb15caf6664c19f4f3b3f054f767f6b561037d99281068124f7db31d65d933af2a3ed90c488ac9d2ebb0370a3ed8b2
+DIST genpatches-6.6-74.extras.tar.xz 4056 BLAKE2B
b706064bb40312b20005f2fc3d1f364789d8ab94c6b6893517098dfbfc18f9f51a5336ba492133f28f87daaeb5bd714dd4720b4cdcd2e50f60c0df330a6d23c6
SHA512
a113206e1c5cca4177b537a68b496721e6f51473967ee690e7a1301b285b73a1a1bd279f8df6c8c53b5fce1b2e7220e2d0e473bbcf2698f9993b1284fdc26721
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
@@ -82,6 +84,10 @@ DIST gentoo-kernel-6.6.65-1.amd64.gpkg.tar 267540480 BLAKE2B
f234f4c893c59453665
DIST gentoo-kernel-6.6.65-1.arm64.gpkg.tar 242155520 BLAKE2B
b7d12ecbf9a5be43fb92c678a659d239427ec4036a39402e9c665ec3cf75368cff35f955b72d84783a39202cf0da72b98284a8f2e07332331e9ddaf731bcaac6
SHA512
712d05b6d23330b6099b560481c3182e939437cde78299bc4169ab41878154f3e3477f14ea1369770d844eb2408e61bef902905572163ea95a87c817a314cb1b
DIST gentoo-kernel-6.6.65-1.ppc64le.gpkg.tar 64378880 BLAKE2B
cd19d4785b2d9c05acf10bb6f55520af06685ca87b7346dc91df8df7ac8135f02d03e0a05db150b6c273220e6d212dff7416f8f71286fb685fad6f55253415d0
SHA512
6ae638f90eace5b680deb4474d73dd1dc6543a29b017b516150f8b4dad04b32fc59f751cbd25729f7acf682d44f95172601f4195a5af6fbfc2d92491b5505556
DIST gentoo-kernel-6.6.65-1.x86.gpkg.tar 68546560 BLAKE2B
60c55c3a3d72d2cd036a5eb4a61b2685cf0159d04bd1a2dec9b27d12de35ed0be4be98bfcca9c1f2b3b79bc06548028be7ba6f641a264b50d1f1599ffb424d41
SHA512
0b59a20b8c07971b92b15c21a840100fb7c4798fd9c987f52a7723f3ae2147a7a1700f0704b72b63302fb544ef374b75c48bad566026b299ffb9179326c35cc6
+DIST gentoo-kernel-6.6.66-1.amd64.gpkg.tar 267694080 BLAKE2B
a5c96c54d1a61ce88494e23aced7f78aa5e6fbd33fc6529965b0b47428bfc3145cffd65765d30f4229add2dcc988a31d9a943dd8806cf5faa95b22776d49e68d
SHA512
01564759368ce062635ccceb0eb32325face525eb4922f4571b1d73787a0eb59d11bd2971544dc1aae35792c349cef253e82e56ad3c2a274b72d4f2f40b64278
+DIST gentoo-kernel-6.6.66-1.arm64.gpkg.tar 242298880 BLAKE2B
ecf053442a99d2e2a6f6d60248044b7e37482809f4a81790fbb3fead6c285d8337b0322fa29a9e01d13653f8c52a3b7581098548e255a78cad514b2a0d228d73
SHA512
75b15541a590ba3b1836e450571524ec35f65efefd14fcfb0c09a14683150827a4ebfbe1691be51791f9cf9b0deb82d3d98d202277cd22811d8bc549e3531c6b
+DIST gentoo-kernel-6.6.66-1.ppc64le.gpkg.tar 64399360 BLAKE2B
0af6792f5c51703c3fcd56f00ce67fd7be394b3b94dea853219b453a9cb4c9d547c42e14a4b7b0745c12bd54dff4fef9f9d14539d324b7d19c3154de5b030fde
SHA512
9035c4bf597a47556257727059f14aa2a2534d16388bbb76ccbfdf8751f3bec5e1f4a9c36bc6cdca1b20cff1acf66452af1e6bbd0dd7dae2c2fff58337fa7383
+DIST gentoo-kernel-6.6.66-1.x86.gpkg.tar 68536320 BLAKE2B
8b62b15893f5ea35bd605b24178bca6598e9316e499b259ea3d773c7119db746ffb5ebfc95bc94861a0264cd78f0de6a86e0fbcdeb85dbd8f882577105f821b7
SHA512
7c3f0fe6a78ebb1626a434088746e48214e30e4b7580a7231612c7b233d2eb9f02ae20ab34aa4fe77756b23657c0d6da75286cd93ac0740e08ae3ab6a83287c5
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.66.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.66.ebuild
new file mode 100644
index 000000000000..cd18b39c84d7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.66.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
+}
