commit: f33dd7d9d6ff8605ffdb1397b5f593cc213517ad
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 14:14:53 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 18:12:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f33dd7d9
sys-kernel/vanilla-kernel: Bump to 6.9.12
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.9.12.ebuild | 143 +++++++++++++++++++++
2 files changed, 145 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 155b59dbeed6..55ec41c056b8 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -66,6 +66,8 @@ DIST linux-6.9.10.tar.sign 989 BLAKE2B
c91b7e7d5d49fb3bc7563bfe302cbd1fef504da6f
DIST linux-6.9.10.tar.xz 144133252 BLAKE2B
e08cce7f271cfda05c5ad777d06cbb04b57fdb7992d10d24f9e0193cae185d02881cc089bab14639a058cae12d1f89ac79c7d0be528c077d8b09d385dd3fa616
SHA512
043885652363f935049744585d72fd7a1fac30baa6fc222f4ef8ca95b66d0ebf0c9492fdc9208009a849527076d1f6586ea557cde75aaa547e46e624ca759625
DIST linux-6.9.11.tar.sign 989 BLAKE2B
18272102fa858d3869b2b7a9482f557558c68170ff7893cb0d49740789afef627f7b97e7fd8dcd8c83e09a7820c0745b40687ed41bb5ae7fb1ac612b2683fabb
SHA512
b725a88bc1617bf888d15921e6a14fa7b5433271372daacc6631a692f993e1d5be553acc1c7f9c95b5b54d1f9a57d5cc05e36e8b5b2aeaa3aaee8ecf4464a08d
DIST linux-6.9.11.tar.xz 144133664 BLAKE2B
735dd14875b30e96f91e4b397eff9c7f0b06195497f19d3ac5a0450b12fe88d61363e5fdb1163684dc31a68ea76e841c5e19cdf9b378451521242eee4cc0115a
SHA512
642b37a4f3aac8449d892f19217c838d9eb27c52414cae4b9b4f02774759c5baa8d23bb4b29a0cf68309059be8288bd335eb107e4820427d719c99c817e2254e
+DIST linux-6.9.12.tar.sign 989 BLAKE2B
dffe1cb150dd1b30d231a31d574ab4138ea85870313fa51afb89565a0eec20367b9403502c2c01f40c9d4dfa62fb7a36b17f6155c8324358c67736f2ea1f3ce5
SHA512
14f339906705711e15812182bd56f9f4ac4bc86bcd6ed9b1a1a52b8128db76d359f3fe5c40444cf627f2038a6e4a81e93b08aa60894161031e9cc427cfeea86c
+DIST linux-6.9.12.tar.xz 144118280 BLAKE2B
230b834983401ae17dc12de045c4a6e9dae59157fa0af940cf58cdd673f3e3cb348c925470539abc05cff18853ab9b1e63ff66ff03f82229e1c85b83c6cbde95
SHA512
6b6c157625c4880a1c381d74fad636d4b57ef78068bc8e19387ab7dc97095b82cbd88287205472adeccaf322703a1aa30a1a45d6e82e9e70af969b8de433873f
DIST linux-6.9.8.tar.sign 987 BLAKE2B
bb81040fb2134eb33ff7f0f9d9d18e827d3828d53fffbccdcaecbb22edfef04309a2f42987220552422735af5a6f17aad603d7a5fd4c7dcb9ba2d3659fecfd8d
SHA512
7de43543511a017a135c4b33fa511fbca060097da13be2a593f9b912b7388d9e3b025854ddb91518cb5e96bd77befe7ea86f5766db2515db7c39addb0409ad99
DIST linux-6.9.8.tar.xz 144093812 BLAKE2B
3c3874b053d7076564936f2053ef666733d329c402999aac736cf64418cb74e471cf9d7ae62e8fab49e4e916f196c5b8317aa243691b1d18119a25196108dd06
SHA512
e7616207a1f08100cbfd9a3cd08bb0ea6cfd474c3a4cb95b3bf738461b7a8ae128270ba1bbaf512ae9c0eb2a409fa0c1d79317ab6dec9ff317aa9019c86d0c62
DIST linux-6.9.9.tar.sign 987 BLAKE2B
a1430dbb6cfd6536c859f5c5fd682b2caf8e940c57ed3d55dc46d67d8851be61dc4215a249aef0b644478622725bd269f814f15f315a5a58a09fa93d20a48094
SHA512
55add916efb2bcc69c294b34a6690dc3b99c7d01f5e4bb53c91f421da4175bd8b7b3ff0df56096f5d6708bb06daf25aecb623364e555276845a38b6d4ffed248
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.9.12.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.9.12.ebuild
new file mode 100644
index 000000000000..af94dd1c6327
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.9.12.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.9.10-gentoo
+GENTOO_CONFIG_VER=g13
+
+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[@]}"
+}
