commit:     6fc811f0fb7dda62326f49e91ca06d8b6894a52a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 14:56:22 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 06:11:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc811f0

sys-kernel/vanilla-kernel: Bump to 5.15.102

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.15.102.ebuild  | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 6255ef083898..978567735474 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -42,6 +42,8 @@ DIST linux-5.15.100.tar.sign 993 BLAKE2B 
f188ef5014dca3b4474bd1e17e4e47464589bd4
 DIST linux-5.15.100.tar.xz 126525956 BLAKE2B 
2629f4c53c5fb51118961e445e5660213e26a454d645246c4601ac3a57fa7ed1cd50a71986600f37d231d712080790c533f916ca685202d49d7e3b31c3140e4d
 SHA512 
2f9d73c8b8c38ccdff29c52f4d7d18f3fca1d48ff0cc747f75a616ac7964d3f7bfe4a22329ac6b28b4c6e9e44a79ec30104ea3c93cde98ef95e95fd61f4ba5cd
 DIST linux-5.15.101.tar.sign 993 BLAKE2B 
ba6c399f8fc451ce88214532d029c8d0bc78b8e1578c29cddd316caf097b152d2d9d9fe0b4b62427cac7e68b61f7520879524d4c230e60c2dfc6814f03dbacd6
 SHA512 
a0ae887591a7a9a68d242126c90f5bd6b58b502d8ae66828990bffb69bd7b21868c1d1c7a82919a3eaba0d953aaa5b3c57fdc360d714a69f8acee2f51659b85a
 DIST linux-5.15.101.tar.xz 126527848 BLAKE2B 
b7bcaf924001ab82c76485a84941754be36049b27dcf51caa7b5948807eaec414f4c0d8051fdc9d05d9dff5309041171002949151750750b5d6ab83e76cc8e52
 SHA512 
74863357fdba51386d45397521095527d14a9c1b81e3441fdbf4f7bb5da9e315670e6ec477cc8d3181a58cfb09e7a436d834b8583cb8742289985a22f7472323
+DIST linux-5.15.102.tar.sign 993 BLAKE2B 
f2ae615654242195a00480686c8c7f3c19dd61c01fe04de208105396734b43dfca32c14257c39d7132213b2506a1bd4b9a96829baf022241cac845dc21264e19
 SHA512 
b7d8629416cb813bf37ab7c84e1ac85ef8ef9326e16f94de8037b81bb6fcaf26d575ded1cb75f204a8fbd1c5f10b2dda1eaa046e4b1d017c1885334e38fc9a72
+DIST linux-5.15.102.tar.xz 126525488 BLAKE2B 
0cb3ba4f76821c30ceea2af6378c088e86cf8f4a221a37e203d2d898902f22cfeac256d79d54b8a9cb2d3f44d98d0ae368f6b5eac78a011b42d8571f4cba363f
 SHA512 
699077c80aaa0c57e4e13411894db0e1aa01efefc30bc13e4289e2ba3916582f3e1354f90e3eac1b6b182e5ea751c9bc3fc46f0f062f1bc3590945673b12604c
 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.15.95.tar.sign 991 BLAKE2B 
cd8eb48dfa59cad29dd618573bf628d4e1555e7b29c38c405fc78ad0fa1cc9a5740d493b9e03c38626d5b96853f16930285901300e47aad82af14a61100b7343
 SHA512 
69624979b835765c74aafd8b7487a99d69bf3f67dba6624498346eb33c9dfa8698231b007c709feba5256d519a2566a0fe1f6d112d5cc4685a3fed36165ad7f4

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.102.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.102.ebuild
new file mode 100644
index 000000000000..f68caf0fd433
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.102.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[@]}"
+}

Reply via email to