commit: 7ccaa29ee0122eed05f39254c6b7bb6b53bae719
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 13:21:30 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 15:10:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ccaa29e
sys-kernel/vanilla-kernel: Bump to 6.1.96
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.96.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 32efee3bd0f3..402e862ad137 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,6 +38,8 @@ DIST linux-6.1.94.tar.sign 989 BLAKE2B
77fcb49b169cb0e4f83bf964e505df0065a8c390b
DIST linux-6.1.94.tar.xz 135201488 BLAKE2B
f1ad3dd9cade3cfc45f1e3732c21b62486372f8ed0ffe20e7c9bd4da20eea1d4db3ea310fb103e2bdaf0935efc1f5b290ea292249c23e66428bb1f9c4f84881f
SHA512
41e37c17215783da64e855eac89a014811ea2aafd6687bc0381727083d270df55d979493f62d264ba221d34cc67494c25a8d5e146dc38e5a3a66f104c9227079
DIST linux-6.1.95.tar.sign 989 BLAKE2B
abd402b54ac2dca9b1e6d7df1fd4db8690d584c13d214d4234182da12eeaa71903201aa7bd34538de3f498230ac7b71ff4626132c30629f8905256c7423c5804
SHA512
2ae944acb2482ce1bce854478e0800eeeb7970a1bd8ddf47e872f8334e818c1607a98f11f401928e07ea1f105cc5508460c1caf2b62a68ed0266d4085755b888
DIST linux-6.1.95.tar.xz 135134536 BLAKE2B
3334f93a646017d22cac7374033acda5fd0df41de9d415d172a2c31f770d28ec16a388bc61d0577b53db4642bb31db472efd5ecee354a4b36e64a9c2df706604
SHA512
b6997281f9909483ed16a1b3998da6ad9f64c1c524db558663f17ed38987f42d8b1431de8c6ba354e30f7da2f8237b675fd4fa341d8218fcfaf2a5b9ac84b2d8
+DIST linux-6.1.96.tar.sign 989 BLAKE2B
8167cab63d67ef0bc9280c97c7f891a8b06f3285f77665ab61f3d9e269a0e73a5654f419c326f6d1111f91ba9af9a02f50b0bd49329b2f429257c3a355270661
SHA512
4a74168588e9bbf9e2acd26e768994bd99883ba5f40ca0446f34b3932660fbe8f23d857d4822468867f71652fe68b626d5da7a79ea8f7ab5a4ca3b6da7943690
+DIST linux-6.1.96.tar.xz 135173516 BLAKE2B
7ec6894d6d7ad0f32d32214b50cb4e4aa4c715292af1acbc7c07017236cc7566084c20fc5db918a40f8a3d6d5203b4d1b702aa4b45e7b4b71d8b50e46063e44a
SHA512
d75cdbefaa98b3c29b8f1a6b297a5a2bd724ae0f9f868e0bd0d984e2a722f09cab24baccd30d6bba8e007a9dc8178f6d55552c561c02434f7dfb4c88f5482804
DIST linux-6.6.32.tar.sign 989 BLAKE2B
ddfd3ca2ccda00a7550f6f42bdebccdf3564a54516cc03f80a350e3d3af8a3f5d1275f0200118ae60e37e13bb3966c80d19cd422d5f4f4b77a6c6371c022ab91
SHA512
99ceefd0c2cb8540d816b558a889f955f562d4db911929ee20963b2bbd22b4b7d2ab415d6bf975662c3025e6295e6000139df0043902797e528ebd09a114fd42
DIST linux-6.6.32.tar.xz 140213376 BLAKE2B
6456fcafe10eae6c0cf962b651aa567ba9ad522c4df0c87301ab0060313b8179a818a1d305e0af21599bc5b7bf42e2f61121a2ee0658a065524d098eb2947f0e
SHA512
e8b8d05faeb0c8a467e36fbec87643f35bf868caf6f64d10bee2a2e18566bc586a9770c247c1fb82a6af811455d5c2d5f313703b05778069c95c5434b418b3f0
DIST linux-6.6.33.tar.sign 989 BLAKE2B
a4a5a8415012e7a7dbff8394c75716966ea3b00826240bcfd246e411076da1fb8989764bf74c0e7becbe475b5515fa46f1212eafba7b310ffff37b0383372589
SHA512
07417e3a151d7fadd0c3ab6d3522e483c8635562eb5d3b245849d4db2ffddf6a4b2ff19af89fdbbc2137944126b2a537da829f20088641a65c9f103c2ea5d002
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.96.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.96.ebuild
new file mode 100644
index 000000000000..2a01b55657d3
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.96.ebuild
@@ -0,0 +1,137 @@
+# 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.7-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
+ 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[@]}"
+}
