commit:     3400cd0f791a6b2c4bab11651df9a7090b699f0d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  9 14:22:11 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 20:05:47 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3400cd0f

sys-kernel/vanilla-kernel: Bump to 6.6.70

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.6.70.ebuild    | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 18829054ecaa..40c8c2b59e9a 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -47,3 +47,5 @@ DIST linux-6.6.68.tar.sign 989 BLAKE2B 
d374d5d334585a5e5102c1eb1c65f90f34c683e4f
 DIST linux-6.6.68.tar.xz 140431644 BLAKE2B 
bbcd2e647aba409aa6191a5887becdaecb47c99d0e50bb35974b907fcf2c54fc7ef124e64ca70255a7d309617493ab4e1e273a2b2fa45bc56e35214d906fd9f3
 SHA512 
d02d15e32d4f36535cb140b530127d64acdf80a83e39ef44fe9f7c9a745ea01cecc0c727b34ec2e50f42bba8fe1d5dc55a2fc38fa143d9397f235e0eadf0aaff
 DIST linux-6.6.69.tar.sign 989 BLAKE2B 
0231f7a32e2b3488ba00cd6a6fb71a580e0409a0679d2086f18f8ee61f1e7ad2157a98e4fb1a952c27e4d820776853dc221ce74442446a51da3f7e624a9d17c5
 SHA512 
14f71a85c8e623678bc3b187c7d93341c81e0d0a3a169622a952735f1452d65481646b69cee7134f39ba6638827baf80f0c996daaf9412622c56891db9f47c8c
 DIST linux-6.6.69.tar.xz 140462484 BLAKE2B 
93916e63a6c59a8a21ab46a6951ebdc9a1258b3c760cf5b57c980cb0bc4ce208276581d528987e70b2fdf5c3317c5c3fd49999a5aff533450314ead69d554360
 SHA512 
438eb343fda4e214b3c4443d8741f8b4af2cb9020d6d9c73d1601eb4346b7ac1ef86ef39019fdbcefbed05fcc9457e93303363f69ea92041a0d0270562437a69
+DIST linux-6.6.70.tar.sign 989 BLAKE2B 
afc4ca406214dd444dba859ef21c002ff49012bd521df6eafb607384e1c259d0c796955509b24c1bfcd0921c110cba1b69f0d5a080c255f1c2dc8567d9700bfe
 SHA512 
e9fc4e52eafa2669ab7ad16e65ab7dcc2edf5823694b480056b8c01f00f14542e2b24a0bc6ca12c5a564830a94ecdcb30f15ade500dc14bf95de3ebbd306b8d4
+DIST linux-6.6.70.tar.xz 140448644 BLAKE2B 
9fbfdff887a35a1d0256cec0ab0d1e20ae80208cc08cc60549b4f3d5980bbbb4293f1e26de74f10455dbab2ebf7541c1f858e11c77ed2293d34cdbd1abcb2596
 SHA512 
870768a5d4add6c46030dbd8a0966ec6bd8c4d61eee7921d2910bafdfd2f68a3357223396cb50cf231d9e63513ac199ed8f9c2499384a0f929ca522fbbec0afd

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.70.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.70.ebuild
new file mode 100644
index 000000000000..756c85b771ec
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.70.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2025 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=g15
+
+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 
-xf -))
+               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
+               arm | hppa | loong)
+                       > .config || die
+               ;;
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               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