commit: 1977179fcd3c29f34cace92dc3213a22e01e3a7e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 18:22:13 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 03:12:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1977179f
sys-kernel/vanilla-kernel: Bump to 6.1.111
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.111.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 316778600108..8dfda7408dba 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -42,6 +42,8 @@ DIST linux-6.1.109.tar.sign 991 BLAKE2B
a47f2eb60b86a73af2a7edf256288209702f195f
DIST linux-6.1.109.tar.xz 135193224 BLAKE2B
2ab7151c193bcdfe0664f94040675faec1cefcb44df524074c9b06eeee1184fb07891c1d6bbfbe8ca53b8d52f332a17a14854602ef046897de692eaceef8e5c6
SHA512
a435b89320e8af19532bbd40c30c5c1e1b6f796f062a015f3c1bcf7a30b00eba4c51a568078c6dac9fc60040153305237910e6f9d701b9a7bf86475bd0a61dfc
DIST linux-6.1.110.tar.sign 991 BLAKE2B
c93c23243b3f9df9da66cd9c3d1c65d6cc09212b53c3a19d4a565ea9566d2831938f3aa6c25b88fe7e85268aa0bcac8bdd5cfac472d610b95aaec2ee2b39181f
SHA512
9fb593858e2af689e2e1d5171e70f2b707a4bc77ae721e6950115877b084c49dee340e77f12bf40761793a2cde306d513ca2e151e3c159e55906e129d458b8cd
DIST linux-6.1.110.tar.xz 135196940 BLAKE2B
a4d78c86f74c0684a3ec53056241900a0fec06862fa47b963085ed7e797a0c5c8dc8d9b5e6d83d5da412e8ae8f820bcbc2f83c2a049ceed81e545fb0733ad582
SHA512
48c9515d32bbba034e3a477554bac627f131533a9b47ec55c8ded5f464c7e57f0f27c1f34ec92403792680d1019baa4472b2c55892c5e1d8edfd04cf7bd79eb4
+DIST linux-6.1.111.tar.sign 991 BLAKE2B
f65cdcfcde31e4e281af4f6efbaabaec9f347d1be4b801e839e372c608fc8cda925ff4fc7da6e2f4c495c0ba8bacb41b5c4540e97f1354225a5884f7fae9e7f2
SHA512
4a575810a76953383fe9a20071f3c07af638537a93edf10a7cbb452931666079d99314a15b15cd37016ff9e73057dfc23686887f1f044d7d7116734cb64f4954
+DIST linux-6.1.111.tar.xz 135180332 BLAKE2B
4e60152884277015e12e9830da2fd4816507e36fc263506d270a17bb641d4811c83ea358c7fec0d3204a02b5cc3d47c3a935a52a4a5ccec869a96e458ff86d89
SHA512
239a37cc75c6f19d9f8480cc1fed27e885a60b1d68b127848d3e00ed6e2ffe3fe5d9bea0ada95dad1e39c6e829446f10722b2d8ab062f85aab189ee74512ca9a
DIST linux-6.10.10.tar.sign 991 BLAKE2B
f626f460b08be2045dc47c33b50766e20b63c4d6e4dc842214584cb41b9b20c8db6ca4bfa696fd906b7ba6a9c4d8a1c67118207665c635e3639cb7c9028feb79
SHA512
807e761ddb21f7445dca7c34cea33113093a5e303d0b5069da4c8de93e3443abb62ec6b9f7e9806a3a2d2dc57fa47861940cd03cebe5e08d41d6a4ffeaa46c73
DIST linux-6.10.10.tar.xz 145139280 BLAKE2B
8a15910089d080886046b1fd8d57ef28ce872bf428e67ccbc9d5ca92da794d6dee7ab83cc914a499b40962e2990c3b1e5b11ae7d12c1eff7bec548c9a67df03a
SHA512
affaa3690150ca13f0ee14f91f0e09a5ad3340a7ea6404e34286dfb4bd4fdfe12fcac47e83da7878681bf28a8a8b78e0b315e1563408885dbb07aac5bd2e4dce
DIST linux-6.10.11.tar.sign 991 BLAKE2B
45a05ada9cbe48948bbf1cbd581eafa6ace4f2b1f9b8d3dd0d6059f6120ff15ff55e0b1a74d3819105294e8abbc1be2c8c806e4c9e04f69cf5e7e6bed80ee06b
SHA512
f9ae418c735b250c55444634375dc9bf5481f2709fb70bb3f3b939100325274c60ee52fd3e2294b1277d9dda2e3bc5574f3c867029aec2e4a414f5b40ace47da
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.111.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.111.ebuild
new file mode 100644
index 000000000000..857634f8cd43
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.111.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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.1.102-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 ~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
+ arm | hppa)
+ > .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
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
