commit: e0aabaa129426d1908d87854a1a1b8a956a56fc7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 2 13:35:25 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 2 17:08:22 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0aabaa1
sys-kernel/vanilla-kernel: Bump to 6.6.69
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.6.69.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 4ed3a66baefe..d99284eff03b 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -37,3 +37,5 @@ DIST linux-6.6.67.tar.sign 989 BLAKE2B
abc1c4de4fdb8aaa60819eb995ddacac505915bc4
DIST linux-6.6.67.tar.xz 140474128 BLAKE2B
bf0038d4aa9e1857a2dc866c18ed54b16e6ab1f1cd6a3f9636e1c60006ffb226acc97ac221b8337b70d0d1bba7d4b65ea4cb476c21a5972f5a194da8ee0e3728
SHA512
78d52b467d0f7d632efbc626e13adad0bcf87d0bb0acb8ec4aaf218fb35e13007e4b157939cc7fdc6668989554eae0c769684c6b77e0b9014d298afe56c5c4fa
DIST linux-6.6.68.tar.sign 989 BLAKE2B
d374d5d334585a5e5102c1eb1c65f90f34c683e4f8dcfd635afd64fe770bbab39435dcabeb717d1318c503ee8484ec179ac20f413c07d8b7edc28c2f6a531763
SHA512
795a0d4141ecec61597f01676569397735cc12b921ef00070b11c3af168e4e6f43970ac192c31a8ca4902c999fbcba9985f6326d78107b06093110d74e576df5
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
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.69.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.69.ebuild
new file mode 100644
index 000000000000..756c85b771ec
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.69.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[@]}"
+}
