commit: f203288fae10cc43c473029d95f16c24233d2416
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 18:27:03 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 30 20:24:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f203288f
sys-kernel/vanilla-kernel: Bump to 6.1.31
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.31.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index dd747d7b2407..cfdf36078156 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -53,6 +53,8 @@ DIST linux-6.1.29.tar.sign 989 BLAKE2B
05e26bd99c7d5f7a61d83f5b438f342c9a1bb1cb6
DIST linux-6.1.29.tar.xz 134881816 BLAKE2B
b6cf62bc9f1a9120f04857911e2a8fcf3fc5416f55b7d7bc61ded730941220f6f3202d1a86e14dc9f38f6dd40ef7614d52126d9089ccd0cc1eda144df6b102ba
SHA512
be078b38ea343b8bade634aa3c75a0f8aaf70964c5ead73d658a0f1a07ca541de5e7b68fca2ede0638773d345a0c7d89c4d74709bb1101e844f3babc1c14b83f
DIST linux-6.1.30.tar.sign 989 BLAKE2B
f1c605f30fb3a85882e59c6d2a813518da804bdd10ab3d6c243915231b2600000944d5f52e102b920f86bc8fd46aff10610e877c411ac01b4336bae13a1db270
SHA512
2afa5bf3b3ae52b1f5ad74520f23c1c33138c7e9f39c47b2be819beb4711b15fd9ce5a57d1b8937ed596cde69e5d30d2916dd2e9c1f70b157e33e4e6ce8c6be0
DIST linux-6.1.30.tar.xz 134914908 BLAKE2B
d3c4cda0bbd978ad7e39a44e03789f38b7a48a92405312f90fd944a670ca438e1dd212af2b075820896b25405027be92071dbd24455331de742aa5c9f2ac3407
SHA512
0bec5dc11cc591191c1265ecb823283c026fe44f1843f18316df9a8997836ed1aa45817db8167a60b28325a639c866cdb28cd1aa00335d4338bb6bc613e50b50
+DIST linux-6.1.31.tar.sign 989 BLAKE2B
86b86704f8e01a31c70a607d572a9ec2d1014cdecb321cb1b7fac56410692697f018c6237e77cd2aad6f53758f27e8177e39065e73dd0f274d4047c4f80e6c30
SHA512
f9488296d96f54490c8a506df7018d4804725b102959b070bd0c9bc64c7ea2d517d4f39273b4ecbe975ba75d712fbf9fe0affa4159546712fc4f0f9c1bf5c3c0
+DIST linux-6.1.31.tar.xz 134903408 BLAKE2B
a3eec74aa6313f387d22a57d72737cae6c5e60125596fc265c0f7bd90bc95b6f5ef5192028802995a3cb50e739be328711046aadf3adc93dd2047e4b439d4a01
SHA512
1202a47f29eb17ee074ce22289c6cd488acc381a59968728aedb6070874917cf331a2535629775f5ed3c442b5a82ceb17ed41804e719c2d3f81bcf249261bc7b
DIST linux-6.2.16.tar.sign 989 BLAKE2B
1e61250c6fb0c9d2e2419a16748b85cb804ef039f70e3c4b4f558fecb83c62eaf7c80d5c25692082e1da2d9efa6d47aab80a44445f4422b0f73c5b081a76cb82
SHA512
026b58ce329173e9bcd0203c298be1d2b095b3370d4e97b4a7b342323a615de48a6cc7ab9b4f5c4a2dae6d23d0c773ac545ef1aaa1f1e445c01eedaf24bf6661
DIST linux-6.2.16.tar.xz 136509012 BLAKE2B
3357159d25bdd7ac95db7830e22be35e7f8b746673474b3050baea73e90e52e42a4723e6c19242fcb26e579bf52040ab726317fd74a85c37f722653e60ea4e61
SHA512
7f98d8ee2417272e2ab1517f6b7150f74033622e24a9426fc924c75aea46ab22b8ec8c73fc2523378fdb80f8899a3c6a55036a20dd30e438c1d6d39ea036f2c3
DIST linux-6.3.4.tar.sign 987 BLAKE2B
b61e9860c2fdd710bfec1b71a4d6bf96fd905ab52d40c3d9e0f0237297488d48b1ddbcc6c59cd048aebf4ea3f3fe701d5ad44309be82ae99136c66fd1f2b54b6
SHA512
d21eb8559aaa66e8dc78f2e5bb9434eae89a208d50af9f945de4979195a0aac4ee0c0018867a2d6ed5ed1d3e14830e750b7a3c87d3eccb3c40e5b10fb7a0cbf9
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.31.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.31.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.31.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[@]}"
+}
