commit: 2f820877f3e454e49313d4b5717aaab795e2e8e4
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 16:34:13 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 19:57:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f820877
sys-kernel/vanilla-kernel: Bump to 5.15.104
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.104.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 93b7f8673de2..31923ae9b1d3 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -42,6 +42,8 @@ DIST linux-5.15.102.tar.sign 993 BLAKE2B
f2ae615654242195a00480686c8c7f3c19dd61c
DIST linux-5.15.102.tar.xz 126525488 BLAKE2B
0cb3ba4f76821c30ceea2af6378c088e86cf8f4a221a37e203d2d898902f22cfeac256d79d54b8a9cb2d3f44d98d0ae368f6b5eac78a011b42d8571f4cba363f
SHA512
699077c80aaa0c57e4e13411894db0e1aa01efefc30bc13e4289e2ba3916582f3e1354f90e3eac1b6b182e5ea751c9bc3fc46f0f062f1bc3590945673b12604c
DIST linux-5.15.103.tar.sign 993 BLAKE2B
b33ff466fe2278a5c1c777b18f2f9184ce80cbef7a7d3d1b1c398cdfc1c81fa1e4f27cb24ba51f0af8cae3b727b98ec217034dcc3f6cdb7ade73f84839ffea2b
SHA512
bbe25153152bd9ec741b415cddbf2f843a5eaeb081fbe50f0c66af687257b1b69c4cbf84956185e36d20f782f35faf3ae51a57ff71b823e6b06e2f75cd738a1b
DIST linux-5.15.103.tar.xz 126552352 BLAKE2B
aeafbcd79c8cec780fce4546535671fe2f0efc63d5f18d525b6289d46774165af469a50d12513b7dd037ab36bacf97e595310d679b41205e80dfb5613fd191f6
SHA512
a25ca32f1ca3c046cdbdcc2293dabee5e3d1e9b1a449b77fd1731f254ecf41149a9509f610a23a77bc8761fe781b982e40e5ae00021c82e23872900aa031aa67
+DIST linux-5.15.104.tar.sign 993 BLAKE2B
b57fb0c9bfaef7a6601ac99e108387dc80a66bff5f78eec2f29cdc5851277a081ed7b01ebfab7149da8b9ef22a5debeca175dac1195848b09e2e8820652522c6
SHA512
6fa3a34c740b7ac203393c15e98d9be8343a73ed57816fd3e5908fc7273c6d8a7cec3d019c203b02f9f681ec271b48f1aef08f7c112bce2a69176c603ef0dfb5
+DIST linux-5.15.104.tar.xz 126505488 BLAKE2B
6c4b1d1602a377aed34c739408728d040db4d777678557a6cdc0e79359c1b3f3a2375d3a2ec203ef533e945b8bf9c4b96c636e082db09371e96e96b2a5e23c0f
SHA512
4aacd04d0e5a4ee08465a98fab9adeda453db60861ee86dd7b2507aadc286a3769912b35e2ab6b2be8365ac5cb71f33b1bf1a726d07a9381f986bb58a09a5f20
DIST linux-5.15.94.tar.sign 991 BLAKE2B
648f4c183bf955ee25efdb575551ef1e9c20e0b3e3fbe0ae5cf5d1c08cf5b4bc5b5a6cce603f3f17d9ddfce976fa42b480f93ac8ce2ee6f64d5ca11f56e899f5
SHA512
ab6eaf5a44df0ce2dd7ccfa4c72788ac212ef42eb1c4d8464f59b73638a08cf5361792e6be5fced152343f4c278e45379e76659a96bf623e7da33f13c3b16133
DIST linux-5.15.94.tar.xz 126497028 BLAKE2B
e300a52339b587f58315fbe49ee3a856945b2ee34d9f367c67ba42234875de318dad8bb5f2ec35c7309c91a7b3d4c43d36fc8fbbadaa3b68e6c8e10014dffdd1
SHA512
7ced15a23345dbf17f51a8ccaca78559acfd907b9fe811bb44a9930ae2f64c528db61cc1276fc0e44ba1c76b4f5223145d3ba7fc01924f38b629eb868492b6a9
DIST linux-5.4.231.tar.sign 991 BLAKE2B
ee6a28ae72164377649440f241ed431d6a49c50d26976e1bd85cf353651545afd80532ae27e270ef79bce55971d8bd19acabb0f43ccd6a84c4a7f2fa68f6a62d
SHA512
31d4dc8b2f56e5344b3185ea0340c73d95257b6712cc2ce3b8c5dc851cc92763e417ee9a51ce3b2e637d58e3e8c7035b696413df3facac5c78991646a4048bd0
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.104.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.104.ebuild
new file mode 100644
index 000000000000..f68caf0fd433
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.104.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
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/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[@]}"
+}
