commit: 45c27c9082264e976725407931ffd656f41c50e7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 6 02:29:52 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 6 12:31:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c27c90
sys-kernel/vanilla-kernel: Bump to 6.1.38
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.38.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index d6ce344fdba9..82f73d318a1d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -78,6 +78,8 @@ DIST linux-6.1.36.tar.sign 989 BLAKE2B
113ed3f580dce2cbcb6520337fd60a1df351602cb
DIST linux-6.1.36.tar.xz 134894004 BLAKE2B
d58b432a07f7e33b035fd9061dab907255ff0b2cd2124bc02192c6f37f6088d85f50669f9a0f18f49eefda9f5e21c7c97e6f41da97b25c35c45b7b856415e490
SHA512
8a09a99ddf146e8ff7c7961cb57da18ee06956ca86cccbf16fc962c1dbb0e433a56a00a1a1c9f3bea56a1b818a07b9cd20b298fa0171e9678ad11a0ae744f02c
DIST linux-6.1.37.tar.sign 989 BLAKE2B
c140affd7e1d8119a99e96916a04f2b5305019040908e130c3f798421bb275339c09ede6cd031e3ad2c7269c74f3608b4c0cc3880e08f67777b38c5d98e142d7
SHA512
c3dc05d764c1b1457f6b03061fad66ebe70755de4487b28fbc48c8090534d2c714db8a6701d5fb800e4a47e89e6b4cfd963993131ac6c0388bfee94e9fdad4e9
DIST linux-6.1.37.tar.xz 134888260 BLAKE2B
9ea4b47123c21b658923f46d3f7d6b911f49e8616f038feefef860b3bb8756b2cbd0b097640b18333d79951b99c37dc32c1a4357263ff69641580c4d3ab4bc56
SHA512
c0abb4548a6cae8eafce7ca60845d03ab30c03a8656e8ebfb5d7a56506b0fdd6300594554eeaef5cfcd5b0e570a2af1dee1deff1b9931972a14a480dbe0e7f37
+DIST linux-6.1.38.tar.sign 989 BLAKE2B
9e1710fc446d8cf5fe7cf9ee933650955c28b2bce1dfeec592ab9462acc25be2f5fac2d24009c491a201d4d209ac5c98589f81c1047d44d713a8989c4f2a3559
SHA512
ea0b09cc4ed64560ca2ff32b51a4a34ae6a45841060cc562ab5136657855744493ab35f33a4621864d5f2e3cb74bc02f2ca06f414ad6359be67e54ea2504dcbc
+DIST linux-6.1.38.tar.xz 134926628 BLAKE2B
43f0fe3f8aeb03e5a2bf46b358b8dc4515765b70f56fb136847c78a80889bc2e163768d941500c285f40f705634b5fd3d6e0d81c10521fc351596c95db62490e
SHA512
64834b8760d2ef3651ae293c499b110a1fe07591d956c8d5cbd8263fd8c173b6963b3faf2bab4c5e0583550185339c005775bd94884750e28fd7be6a16a17af9
DIST linux-6.3.10.tar.sign 989 BLAKE2B
f663bc86f8db7732697757add308efd7c87eed512734630861bfc7890ad88d1bc36d9a32e5c9da8b9f7b3edb567eb7107b7e16ebad786cfc3b6b000dc929b3ee
SHA512
86b7ea543960abbb8e02769000e19d0ecb7d373c00876918dd4905d6eefc1b9d15147898e5e63bca0354dbccbf279479940ecad7e1e83b6c850eae696b34a3af
DIST linux-6.3.10.tar.xz 136959244 BLAKE2B
995b555eee4b47fc53580d830adda183533c4a7fa5151276749cf238adee654920eeddb18f93f4d3b00b054acb9b121fd1c2bc6f4e0530d095777bf3caf8351d
SHA512
20930fac15cd77abdd1e39dd5a4397a8a5c73bfb59a8f091d9ae849bf60431858df6bb50f1c2bbdc0b9c9fcb4687d68aa7a5a444b58d3b7718f16ebe733b31b5
DIST linux-6.3.11.tar.sign 989 BLAKE2B
04e2e5a967e73f0a129dc09ebe5abdc054f6dc349cb6af3548dc19b1afb22ec9d50468e124eea601738f65d0bcdb3d15a4205369e0f42d67c57c28ef57d4e996
SHA512
937e412b8eddc3182363a3c5215ca165fdeaf6d09405b48da0aee68f4102dcb3bf5099e87e1a5cd6675fe0d5f777b4525dc22c0851c55f114f40540c0b2ecc35
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.38.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.38.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.38.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[@]}"
+}
