commit:     9dcb6334926799fde6c78e608872fc32d600ce44
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 15:57:34 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 19:10:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dcb6334

sys-kernel/vanilla-kernel: Bump to 6.6.26

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.6.26.ebuild    | 143 +++++++++++++++++++++
 2 files changed, 145 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 035a7b5f8ab7..0ad711b8034d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -61,6 +61,8 @@ DIST linux-6.6.24.tar.sign 989 BLAKE2B 
368cb5156a8f2878deb7c20b7afca7b81b321553b
 DIST linux-6.6.24.tar.xz 140178888 BLAKE2B 
0f4643c758bb3857396f08b0cc291e1cf7cc7d120fe53791ba8cdaa32f08f20822353e04464551b88e8de64e367de6900da01504e57bc684d47390b51d001285
 SHA512 
3e77e73ce9b2d108f35aaaef43b4d38c5758382eebe80d33baa75e7337e62d369cad5e37f8fec0faee31efe6b8cbbdd353883d44343f426dcef0056dffb55283
 DIST linux-6.6.25.tar.sign 989 BLAKE2B 
60a3dcb318db58b16ffb67304aeac369a4c4b7c5a9596caa491c6a32d89ad0bb4e20d14396fab0efa6394685e4c822de83f0888c71e6e2463e8df060cc99d924
 SHA512 
c61e1aa376a46f8d7ffdaa1541e3586505f83e56971d122a982196dd8141348274a49c0468c14793c3e97d0b9cb1139636e2493fe209a3986bbddd3a710a2688
 DIST linux-6.6.25.tar.xz 140148856 BLAKE2B 
d744ef7ea55202d5cb9adad2d7b22bc8be81bb4b5a03fe52e063192557eadf28d5e62612b6a517ec3180441d8fcec3582a53383df644c32bb45f3e969298af56
 SHA512 
1f1c31a104aa399cd7fd67c0e73c5037e95112e544b00ad70a2a809b52d9d190c303e3f946d67d805125181004fe7de500ff2069dcacad94f6b56bfb8f180f6a
+DIST linux-6.6.26.tar.sign 989 BLAKE2B 
d2925d5bf95b4aaf6c4a57f0015130b1937773f6e32aac8594a027b09afe63f181674d2cb80375e9c0a1ad626ef8d42ee7c5586a25c2d878b601c71cf81f7df6
 SHA512 
f6509f72defdd42f9ef5d16c6e2b982c1bae80c57a0840d0826733b40a8d9f4aee64e919baba538c0dca764217479568ff76e428cf93f64c477ed17efec25e8e
+DIST linux-6.6.26.tar.xz 140179612 BLAKE2B 
633ef0a386e6877811466c9ac937440709ec878b6ed4d26df874d524d9d6e3d92e0d73a6916bade1fffe297345e72253274fd57ccbab5addd461e10569bc702d
 SHA512 
7559f5bc1384c223f1d63ec87215d91835db49a477fd9948524fb6bb8bc4fee38e99aac7824f849043ef2fd39e490da8ca698e65b4ae0cedd48b8758df5fa4cd
 DIST linux-6.7.10.tar.sign 989 BLAKE2B 
a9d9072cf6e90ca3e4f71f29b97b827e9f1730fa8fea9ad61a38b31c625db5925135441c9698c8ae58664a2375366447d2ad23b1dfe99f714318da18b3102eb9
 SHA512 
113b82ec71d1bc181c866100a712f5635d4ffb7e5f0254ad221236dd00d0cdbbfb4078088086182df66b9d0c65c220a76f594ae0051303a7987b5d995e6fb561
 DIST linux-6.7.10.tar.xz 141439484 BLAKE2B 
5bded11de8e9e22833eae75540c9a0c7591afee00cac0ef4f6e584ac898bebd41c3b51208f0f88210faa17da99ada488c719c7dba8e0d39610b9a84b9c44fe53
 SHA512 
7aec6065f63a7278e19811035cbdd9f80392e89dae49673e79fd6aaf5785e6617df720483e445f3a7bfe4acaf8fe97b305d541b4fc583e5e8c1d320c5366e7a9
 DIST linux-6.7.11.tar.sign 989 BLAKE2B 
8173704cce39bdb444bf1f4802bb89c6fdbd0d5541154d7f4abcb2f18cdce0d62067bcee2750f30bc82ec68c01668111bef2c4a9b067480deba55b1a964be1e9
 SHA512 
6112d8a88d13c67623f3570929860d13b6396c8a1156dc1fe66b05640366ca6ee5b226b8217a944ce18d606abd8191b3faaf55d09c5b903eb2e7e6221e34028c

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.26.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.26.ebuild
new file mode 100644
index 000000000000..c3a2f8b2f96a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.26.ebuild
@@ -0,0 +1,143 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.6.12-gentoo
+GENTOO_CONFIG_VER=g11
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+       https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+       https://www.kernel.org/
+"
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       
https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       verify-sig? (
+               https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.sign
+       )
+       amd64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+       debug? ( dev-util/pahole )
+       verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+       if use verify-sig; then
+               einfo "Unpacking linux-${PV}.tar.xz ..."
+               verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+                       < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar 
-x))
+               assert "Unpack failed"
+               unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+       else
+               default
+       fi
+}
+
+src_prepare() {
+       default
+
+       local biendian=false
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm)
+                       return
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               hppa)
+                       return
+                       ;;
+               loong)
+                       return
+                       ;;
+               ppc)
+                       # assume powermac/powerbook defconfig
+                       # we still package.use.force savedconfig
+                       cp 
"${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+                       ;;
+               ppc64)
+                       cp 
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local myversion="-dist"
+       use hardened && myversion+="-hardened"
+       echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || 
die
+       local 
dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+       local merge_configs=(
+               "${T}"/version.config
+               "${dist_conf_path}"/base.config
+       )
+       use debug || merge_configs+=(
+               "${dist_conf_path}"/no-debug.config
+       )
+       if use hardened; then
+               merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+               tc-is-gcc && merge_configs+=( 
"${dist_conf_path}"/hardened-gcc-plugins.config )
+
+               if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+                       merge_configs+=( 
"${dist_conf_path}/hardened-${ARCH}.config" )
+               fi
+       fi
+
+       # this covers ppc64 and aarch64_be only for now
+       if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+               merge_configs+=( "${dist_conf_path}/big-endian.config" )
+       fi
+
+       use secureboot && merge_configs+=( 
"${dist_conf_path}/secureboot.config" )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to