commit: af37b174c2c07f06076bbccfaa1bf0d60b99130c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 7 10:57:40 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 7 10:57:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af37b174
sys-kernel/vanilla-kernel: Bump to 6.1.52
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.52.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 46cd8f01c942..ca5c58712109 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -60,6 +60,8 @@ DIST linux-6.1.50.tar.sign 989 BLAKE2B
aaba4a2613ea96a54fe0374f31b55b68769eac82e
DIST linux-6.1.50.tar.xz 134972988 BLAKE2B
dfe44d14a1f8773776338b46b4416ca2240eebff4e9e954b4b46c3ac050cb424eb2d3dc3a856193d9a79216c2ef970ce6982d122ec0226a896984c7ad0690f31
SHA512
d0157286886df388f752e367e30254cc7f615cd7f6e435a99f43055d143490edac316a5bbb826a0006ddc4b550376d67b624693faa5504fab160969806c81607
DIST linux-6.1.51.tar.sign 989 BLAKE2B
8924bef89e5ebed655fcfef6a58a09cd43fa741ae56b6541a6ef002af3571d8096b9ea8e55e36bc2e2fdf69ce6135080970930402dfed977899b890cf6d2b04c
SHA512
65ac5c31b1a59a90ff1142bee8160ee71db11a2af9f8cad0a16337b1f22fa065450751cb50f1e482c5a0626631a40307c669c7fe846dd220551138394d64b221
DIST linux-6.1.51.tar.xz 134971724 BLAKE2B
3df246015539f69190a230a84251d5bd956d21f8a488b4ca7648c76ac5770d01a13af2961cdb1bb5bf8a876e31aed256153aba81faa522063d8360ec6c09c96c
SHA512
82404e9e4ab7d12b83241433c02a0be4ad4c7e9c1452e5783956eb44e8a99ab140d78eeb294743a6023b24b5ddc23a7b3ed7765ca0dffabe9f3802bb896fab8a
+DIST linux-6.1.52.tar.sign 989 BLAKE2B
c178a9dea9034ccbd3e9de6ba8538050b449a18d1e93fc9a412fdb99f8cda47f747406eaa4e3516aaced749a9c1169b56e88e57a7dfd64ff71a489f92a56d98b
SHA512
bd6830ffe938e195e60ec3ab314e3df3fdac90a97cec6f86e87c28af54361567227832cc5538f0f67f8610928e8a31dc67cf26c087c7904244b64a3f70610416
+DIST linux-6.1.52.tar.xz 134984832 BLAKE2B
1846d76626ed122323f0ad54b71cd94165beba4f6122af681ca4c44a8a31bf3a4e8522bc5e2c410c33236477b9f610a577d991e01245628183142a5d8ec8770d
SHA512
41150440b32e89912573bd1d567eff483d901ce4fdf77adda022ae5523c90a5379d1835c1baf3b1ec53d46645e9e5dd803f694dfd4b703a5b460d11207ad198a
DIST linux-6.4.11.tar.sign 989 BLAKE2B
b8b55a05aa9d5249365a17faf7c0654d6172988ba2894d6bf21c33a8c175dd220cce190415f84235175eec729a05a85b25f2ce9f240e59f81172823ed3a60eb9
SHA512
c4d218992809cfd6ed6afc324cddae579bd2d1cec66f40d04c1d182ca4dbfa8487539cb63b2ec432528b28f30b9e156fc0ce243878ac8c6607cb1e83c01b5888
DIST linux-6.4.11.tar.xz 137836952 BLAKE2B
dfb97f2c9905a150c0890b9c3d464bc13986bec7bcd038c333f4dce443e0a1988a9075554219f9f419ef71af98827c05fad4a62aba1e58aa7f2ef8249f140175
SHA512
b3abf1d7c6b03644ddfc0a1994c88abd9b6db71089aeb4ff8749e9eed5d3772bc3468eabdeec99d998ec091898e5c81a84ef839345ba368580509500a3cc73dd
DIST linux-6.4.12.tar.sign 989 BLAKE2B
598b2dd8b0beb25db5b0500547bfcf7ea669c06ff4afaf6252f996d0bb519f5d19da96a1b618ae7a03c4e27a56a5a1540d2c1b66bef9683d14aa964e0d768d39
SHA512
d1941097b97dee631cec1487ecdb9a3a4c145ec8cfdac325776e9e890bfff2f559140d178fe5ec27b0482f04df2713cb2d6da59e20a7bdbce8ed50c148f3b585
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.52.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.52.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.52.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 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.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+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=${BROOT}/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
+ ;;
+ 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[@]}"
+}
