commit: 8f11f98824d0a1684355d43fc340890a7bb1d35d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 20:17:06 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 20:18:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f11f988
sys-kernel/gentoo-kernel-bin: Bump to 6.6.10
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.6.10.ebuild | 161 +++++++++++++++++++++
2 files changed, 167 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 7a51577ba39c..a2d83468ff59 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.1-80.base.tar.xz 4275520 BLAKE2B
b52031561d29cf853f17486ab4ba2
DIST genpatches-6.1-80.extras.tar.xz 3816 BLAKE2B
9612466a57c8b6bda84fd8e152de1daffd413214a51fe43274c9051a1ceda511faa7a6acc90264115a786fb9225f77b7fcfeaaceffe308237b5ac1643f1331a9
SHA512
54a4e8eec2f8034fe202b98dd182dda8764838877e0fde11f01c2a69ccd340f39fc0cab1b1d6b93c5592f5238b1f4a138b433552f7009cd5b0bf60a25bec6c6e
DIST genpatches-6.6-11.base.tar.xz 649760 BLAKE2B
d435eda1a18196b24c451ae605c719cf5a45c255b2017f1b7ab3612df3f4101c003e615589841d02329e44c3411b4cb27b577e8ff05f09e9349d38e622b823d1
SHA512
b06c66f730e4a43d8730c5c98661b6061485696375d2bc623b818303b0f6f15d9ad9da318bf9d3153036c3d8a2215fe12c5fd8b789775027c5c21f2ef8d93c4a
DIST genpatches-6.6-11.extras.tar.xz 3704 BLAKE2B
a5ec7394f611c491ae0867c4694fdd000a0a53d6353832ecfb702f6b86711d7c955f0e4a8d10ee2cde6f2255a6e180fa26e3b1088f04902affa51d29f590fe82
SHA512
2ea475f922c98a83950441e86bd6805fc958f44c77866431b28da13d522d11841fc778945b253e292c8cd09ee378bd7e0169540ef12a9206d6341ec69ff463c6
+DIST genpatches-6.6-13.base.tar.xz 669256 BLAKE2B
9474c68e1558162a583278e9ee510ff2fe8412a1b2b2a9c3745df47c97a4d6e5f29a8e890a5205f43f2a2985eabebe2a5fdb7567f399f0301e58d1751eeeb5a3
SHA512
fc96cd9ed40c05f2e8ccb821206a26612970c92afa0bd893870cb0a54e5d588d11c6368dc166a2e835324ba066e4f64a03be4773dda0270015f3031d7fae05db
+DIST genpatches-6.6-13.extras.tar.xz 3704 BLAKE2B
846cd76f82b38f2a55262fe6b56ec5f9eeeffea3da929e83338ea3b4d1352435c928ecd222b4167aab080025115addd8bcb559870328c16c3aa74d90ef2442d0
SHA512
9dfad8cabe8176606ff8c81c79bb628e0ed4195f486cd10f34677702847d005bbd8b077ba6646cadf90cbe799238c996f7d0e242908cf242e3acd7acc36e225f
DIST gentoo-kernel-5.10.205-1.amd64.gpkg.tar 63252480 BLAKE2B
52cf3967ac881aa557da92d11a021c2509b5e6920cb04be415c626bea66e08579481b61d6897d8e88fd830d18461e6c41423aea398fa1f00aed581300cc1403a
SHA512
295945d6ca4ed5322918662531b353867522782f243aba54f3cbbe22b515059e54b40bf124020c1d8315c27a491d7af894a8331e1395f44c0d763297d36e58a2
DIST gentoo-kernel-5.10.205-1.arm64.gpkg.tar 56729600 BLAKE2B
62ecf66572c0b5da944e3200f7b0d1ba3e12231e66c5e90b1415becb0fd80d49da34b57fa5d20898f7c0085be25edc9ba939daa400e7587d6ac9836ede944f94
SHA512
5b5530f160b7119a200a4fb7c247aeff76055e92be92289d02be37f886dc522c076a19013d518df348f5fe352c758343c6ad61d7b0a819609f8020e2321de6e1
DIST gentoo-kernel-5.10.205-1.ppc64le.gpkg.tar 52879360 BLAKE2B
2ba47d25e79ad05473f8ae87c08039bd858daf5d67ba6746f01bc57b6f7515a76e91c34fec101d514e81caf4a4103f65be43a4351a5c509056fd53da98f0da8e
SHA512
4817b60666808ed734d84f2bb0f2e2c051d3a908eb24c70ef8607536d3aff782925aa231bb0d8180e53224cdf30c426643ff375e7b3f5f047d50411eddf6d178
@@ -42,6 +44,10 @@ DIST gentoo-kernel-6.1.71-1.amd64.gpkg.tar 72581120 BLAKE2B
bb3e9a9f6dac7427f04b
DIST gentoo-kernel-6.1.71-1.arm64.gpkg.tar 65617920 BLAKE2B
5dd4b18285a116d0b5d58997938f13fcc992b1808ed280ec3087b3b614d12c44044deead8355da96983a80a7b149afbd2e43a386fb943e64c39375f431805586
SHA512
4bb2107d8434f7c5bfde34d749e6f87206a94873a7b4ca035944b14be076fb148b5a6a15346cdc79249a0288416a15f9731545cd4b4cafd266f0345f5e287efb
DIST gentoo-kernel-6.1.71-1.ppc64le.gpkg.tar 59863040 BLAKE2B
05244d47d742ff380cbb1495515b105e3f5047d71adf92ad4447a42eee0fa98db35f7ad5fc05bba15c4bed873003b4254363769760edda3847a5002a408b4c52
SHA512
797e0fe888d4ca5ccb0f981c2fe613d073ef56211244d9e331ab124269753ce1a850d1cd5d67ecbffd86572a574565d24eaa693e835b6410dda75d57547e0fdd
DIST gentoo-kernel-6.1.71-1.x86.gpkg.tar 62167040 BLAKE2B
d1df70d56e4e46ee1d8d7f13d354f13a64f94ff032379d76cf82166135f653a1649e39dea5ef829f5881f8bedf9c7a9c6338500037a2fc26a31a33f79b527744
SHA512
5a278f0a1936ddc19254c65974c5ee4b676455373652bd146a9fea017d0c5b2eee7491e693502f00698d1bf66f8cea606a3a79190cf5696c36f1d6c19fc8cb6b
+DIST gentoo-kernel-6.6.10-1.amd64.gpkg.tar 145674240 BLAKE2B
084fa55f6227d6e5521ef2395b6e41b5145b60e407f0903af184c262745b25db5f73b99fca9c304e4f33ce89d09d1e50e04c8cc03306b93b41e61c48794ab305
SHA512
b30ecf5b8136d00467c7de69229f470190e486cfbc8442aa2cc48cb9dc877453e8bc2b74a34a9d94f1bf8636626da31c86836fefc1a7e2b084721fb1093e3a2d
+DIST gentoo-kernel-6.6.10-1.arm64.gpkg.tar 118558720 BLAKE2B
5926e70e85e9f5404ea4b2077415744f717d4565c9fcdf5b8469208bf56d0a558a15c4a320b09b1eef723647998cbca6d17bab1c0bc54941095ba94bf7efc429
SHA512
c5b79221f47f814c0d9ad70a268b70bbe0b2b38d9c8d252d3a9be30cb2dceecaf28d621fa3975f838862a03cbee7eec12252ba52090a985d34420aaa2c04815c
+DIST gentoo-kernel-6.6.10-1.ppc64le.gpkg.tar 64327680 BLAKE2B
a3ad4f225f87b9818f373dd447032f66ef760d011c6ae691aba547ffc8307d9c59eae812e225defdd35c1311b4ae55a491a355b75e43a72a94442fd65998ae6e
SHA512
0f0e87cf92933dafb8cad758af5b5debeb7c507ff03ad9a469d750886020a065db60d34585a59c4355c6bb7a90496ea1bcfa7fb11e81899affc48d1aef78e3df
+DIST gentoo-kernel-6.6.10-1.x86.gpkg.tar 68259840 BLAKE2B
dd5ddcd78411de7bc0a86d8da14fd1917c613d700c35ba3255a3b69983930015658bef4b2606241825d1a0043699aee1e03523a06fd99ad2bc6bd994a40d2e4b
SHA512
c346fcb37c77a181f38ef31e224300c0e36008dd4862beb8d40b6d03066a6a01fe6c3c524f012578b491512d50b538b4ef8aa095b36054d8990f710b351c7211
DIST gentoo-kernel-6.6.9-1.amd64.gpkg.tar 145643520 BLAKE2B
ceae9156ae6c37c45b0105e86a8bc29b562ed11c58a2f8c1d38e38b6b0c5c9e4f29908e633628a18bcd4180ce5def1ddda5e75dc5e25422ca4b108675e30ea9a
SHA512
3ccec88ed280714b2e26e0c7cc2a07ef3436bb07502bdd704c005a4e54f9469355ff1d543956b049b52f8b3277f664bbdc353f5983c16cb046f49b86b7d26d12
DIST gentoo-kernel-6.6.9-1.arm64.gpkg.tar 118558720 BLAKE2B
170d7f90400b9bdc0d4e98f7871d4f7622c670bac8baefd77ce531a11acfbb34e5ce4c4fe727918009b2980985c6c8d5d15d1859f2e129762c68efba3d3a621b
SHA512
e7e56d77eb5391579fa1e8b5a6ced2c383e53c56b4079578f14a0ad5364405fc2e0088c6ab0851e5f8eb461912bec0b3d377560cf551b35cab3039ba750f76ff
DIST gentoo-kernel-6.6.9-1.ppc64le.gpkg.tar 64337920 BLAKE2B
93a44b217ad4a3d7c1ce253554238e5d04da795f3eaf1c94fd44294eefe1c56130bda61985ce759dbc98f851c7da910934a777046f22984b6521867db6d69a05
SHA512
1d55ac1965e86783a290437bb654d727899a19d3953d428097fc9b169bb732227d8042ceadde85449278aaa323dff8827bf751c520cbbc8f36c7c742298d486b
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.10.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.10.ebuild
new file mode 100644
index 000000000000..d21ac40c3dee
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.10.ebuild
@@ -0,0 +1,161 @@
+# 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##*.} + 3 ))
+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"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+ sys-devel/bc
+ sys-devel/flex
+ 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="$(tc-getSTRIP)"
+ OBJCOPY="$(tc-getOBJCOPY)"
+ OBJDUMP="$(tc-getOBJDUMP)"
+
+ # 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
+
+ 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
+}
