commit: ab9430ec1af0420ca6fba2d014ff1143b3a40093
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 15:19:46 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 17 19:30:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9430ec
sys-kernel/vanilla-kernel: Bump to 6.1.29
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.29.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 65cc5f1f5cba..b78d003ebafa 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -37,6 +37,8 @@ DIST linux-5.4.242.tar.sign 991 BLAKE2B
4dfb18636791da74779de3c55aa8a9491549567e
DIST linux-5.4.242.tar.xz 113000620 BLAKE2B
b3d2ab4c1ac9aeb3d7ab7d34b5fc71097fdaa947317f52ffd8c2630d07314b94db33747bb2046818e086ad5b82fe64566900433c60a7837e15a4f405cd0f44a3
SHA512
7b4b55b696fd134b720ab7d0253c7ffbaa7284e5d6fa89b3af37e8e2a98d927fa508e28bcbae1937acfc3d795be38017f1991898c83d116ea2e9af99e82664ce
DIST linux-6.1.28.tar.sign 989 BLAKE2B
c3ac2b197c826885b5b03eb9e908cb3d4465ed53cb5434af045ba7f184acfb810b5254d16ecb72ea47123efa7fb8ea03d67ca945df4ae3b37858f4829674aa6f
SHA512
31ff5857d2055a0c289d049b873e428757b8ddbd2e7978751ba4dd1161466f8a5965062b9e0c0d0186a8cc73399140d272fdf5d78063bd52c355d141b8b76462
DIST linux-6.1.28.tar.xz 134884320 BLAKE2B
f840274d9e1c5af90292bce6afb8b8b1a81b4f8ef82691a1cf28ca2d6cf680913c2668ddb086e1fa4ba4112e9d8118a674231374c14a06a911ddb3d2cf8ac3fb
SHA512
7215e62df10847e8bce432880e0756e8a5f56eb8b8abb54f9e1eb8871ce7bd56d765be0f9a40a8dae4d135b2f9a0dab7f6b3d2691d73b0c47f05811194dee8bd
+DIST linux-6.1.29.tar.sign 989 BLAKE2B
05e26bd99c7d5f7a61d83f5b438f342c9a1bb1cb645bc21b014f10eab37cb6cc17f5378358cf99ce6f2bb2d6229595b17e9b3966d763c55391271ce0089d6957
SHA512
8627c6c439cb73b696781de019755e7c0ca795a3573aebf3625ad9ec9df5a9975b797eaa74866d0820bc3d1a9e251f64f0bb00cddac3f330195e2438fb718627
+DIST linux-6.1.29.tar.xz 134881816 BLAKE2B
b6cf62bc9f1a9120f04857911e2a8fcf3fc5416f55b7d7bc61ded730941220f6f3202d1a86e14dc9f38f6dd40ef7614d52126d9089ccd0cc1eda144df6b102ba
SHA512
be078b38ea343b8bade634aa3c75a0f8aaf70964c5ead73d658a0f1a07ca541de5e7b68fca2ede0638773d345a0c7d89c4d74709bb1101e844f3babc1c14b83f
DIST linux-6.2.15.tar.sign 989 BLAKE2B
08271f45e6928778d074f9f8db4451c74b6838babc816b862b114ffe01b531f845395945f4daf85a0b455260e0c3ec54489701715dcf22282434f7ae0c224f5c
SHA512
38dbb5f07227d2329fdad438b8be7eddf6962bdbd563d4acea9c22224f12a58c4db30fa2c97c346778c423ceb8394539c9291d2f05a0aa1fde90ba3bee8c37fc
DIST linux-6.2.15.tar.xz 136531432 BLAKE2B
e9e0f83ceb47a8cf43ef56592fac0878c840868827fc902030c1e11597e3b8df5626059977887d4f66160b404eeca584ed010e131eb6bdb218e3c465d094d57f
SHA512
6e98257946424fd5d511ff7cb9f18a09c228a3be4bff3b06a82e2b7afb5881342314014cd7cdb4a42101ff836ff23930cf6b2d8589bc4651d3d7bbd651a2439d
DIST linux-6.2.16.tar.sign 989 BLAKE2B
1e61250c6fb0c9d2e2419a16748b85cb804ef039f70e3c4b4f558fecb83c62eaf7c80d5c25692082e1da2d9efa6d47aab80a44445f4422b0f73c5b081a76cb82
SHA512
026b58ce329173e9bcd0203c298be1d2b095b3370d4e97b4a7b342323a615de48a6cc7ab9b4f5c4a2dae6d23d0c773ac545ef1aaa1f1e445c01eedaf24bf6661
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.29.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.29.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.29.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[@]}"
+}
