commit:     81ee06aac2aa9585af199e6760bf18583e016662
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 15:53:03 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 20:12:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ee06aa

sys-kernel/vanilla-kernel: Bump to 5.15.99

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index dae2ad01452b..42ed6e8746ed 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -42,6 +42,8 @@ DIST linux-5.15.95.tar.sign 991 BLAKE2B 
cd8eb48dfa59cad29dd618573bf628d4e1555e7b
 DIST linux-5.15.95.tar.xz 126488596 BLAKE2B 
1a8f7f8f9e75db4f6aa55bf3278c65a3e4705adcfe471868b1757349a40d73e5bb484271bc865925437fdae8f9848b976ab5c8a8ecf5992989bcf766ff25dc8f
 SHA512 
7e983cee8c804e6cd90a812aa61777efbc4a8c102b9d2e8ffb07f22aa9d7f291dff409c359a9be0ad69959cd883633534e7a5a5af34e2f260807b13f98f1c613
 DIST linux-5.15.96.tar.sign 991 BLAKE2B 
77b4d5dfc5550559f528297e5a1bda0831141e0ddece7df7ce456eba0951468ab1f70ebc663032a6348e337ef5538ab18edd4a30b704b60f3742bdb3a231cc4a
 SHA512 
79381342cf374a5afb59e5ba54af96dc083cfc1ca64926da232352d565ac58171ea8fbd5cb06182f445fb0e703c57e8a7d9af933dd8520ad90ef3284c102d207
 DIST linux-5.15.96.tar.xz 126499164 BLAKE2B 
8305857503e00f7b3db7247dc2cc268eb58ad99989fc868b145e603d6ab80ea1365a292c246a01a84e9d192d162b3aca0e01307b4976c06b625565b74ae8f214
 SHA512 
ea5a98ade0877cb61d4439e54ac04c1f044890b99343a6b7c1bd9bf7b6ef1b0e0032937f25ab85313319e2f6f7807e84b5e1a9216e385867a1e7678d01b1726f
+DIST linux-5.15.99.tar.sign 991 BLAKE2B 
00833f4f466b48fb61f53b1de2a0b157b841722d46b1604a9be207c9c74b24ae27117b686a50b7a79e992334f7d813b6a3c058d61c7846a9f8eee1c8988f4e5b
 SHA512 
549e73e4d6b62a27d579deb62ccbd1bb7f9870b2094d8dbcebd0885259902f2dcd0fe8bd929651de671ed59164db51f2c36d44b2d6ba92ac745cc898ee8c0059
+DIST linux-5.15.99.tar.xz 126530160 BLAKE2B 
8e5854628b9af47f14b6060d9bf72ad2f50eaa54dd6bc20c493d32108a2b20ba3d312418b73e0c37ac3fca1b2f74bc0b397879c5b261815874eae54c36d44ecd
 SHA512 
985dfbb94f74f8b0ccffd1cf1e530554db5f60feff913ff6c2b6c505649af421c93c69682832a4ca5a6a22872e18704ac33a031c08f2ccd9e20a85401affb83e
 DIST linux-5.4.231.tar.sign 991 BLAKE2B 
ee6a28ae72164377649440f241ed431d6a49c50d26976e1bd85cf353651545afd80532ae27e270ef79bce55971d8bd19acabb0f43ccd6a84c4a7f2fa68f6a62d
 SHA512 
31d4dc8b2f56e5344b3185ea0340c73d95257b6712cc2ce3b8c5dc851cc92763e417ee9a51ce3b2e637d58e3e8c7035b696413df3facac5c78991646a4048bd0
 DIST linux-5.4.231.tar.xz 112992720 BLAKE2B 
228c7135bbf38fa0a84d41607a922e269162bdb385e65ab8fcc8f66ae30d5d1ff65075494de24e280dd9bc03fa8324696ab61a556abc0cce58b31d506af413b9
 SHA512 
22558009d6502928bca5eb93f086b7eb37ff2e742382ba27b97e4dfc77b3b7064b0f85e78d4cba4308ddb2ed7169e25bc62a82647ebedeac1b3df6977c096c52
 DIST linux-5.4.232.tar.sign 991 BLAKE2B 
0b5a5c61858195a6a51169a48a0ddf533c28e8ce32039753905e3c7d6968edf30880c8cbe12b45a3a415f9a12913da8e12573ea7a73af4f7982bfec658e38e93
 SHA512 
c8907a21b8f75b9a2df6e328bbdcd3140750f3aaaf60d27e9186a399100a732669987ca61435f2344c331d9b26e13e505115469581506abce8cd9da345a4b0e0

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