commit:     37d70337a6797d4b91f1f1c50a1d941ed2b5eeaa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 13:42:17 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 19:12:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37d70337

sys-kernel/vanilla-kernel: Bump to 5.15.108

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index b13f9c6306f8..058473f0a336 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -35,6 +35,8 @@ DIST linux-5.15.106.tar.sign 993 BLAKE2B 
be0eea3e6c2243f6535e330fa93b87440ea45a4
 DIST linux-5.15.106.tar.xz 126528672 BLAKE2B 
a7fd77e1b85edd22b3b45d3b19d103897b89c6253fa1357a1897dc96c793b8bc9652ae8c5a36ed0a4bf28d2a803dfc876decd7ddcc4adbea51bb76476d4fd71f
 SHA512 
4cc6ce0edfcf319091fa271b0e9f484bad5e46d6981abc0b691ff85c63577497b6f7048309e082966eebea1db2a2e7fcd7a538e8e93d1a37a9dbf533514d5077
 DIST linux-5.15.107.tar.sign 993 BLAKE2B 
917d11ef8c99670e556d31faa26743ad89ee3a6c5233e8f32ab83321dc91dd96f367c5fdf8354fba69d862d8c724fbcd68983b46a934fb923923796f661415e3
 SHA512 
4045d8339c1248c181df20ea58fcd92ed431b7038d0db4967d50892eea01a3eea8094a076b9705a7f315fcf0fa665b877aac90bc90218b6db00fc5d963b3e54d
 DIST linux-5.15.107.tar.xz 126519572 BLAKE2B 
0986cc144bbae9321ace74f63e57a3399776fd5858b23f172b90bda63f89b9838ba71d0774d255c6df8a0c0ee35db71c4ec2aee2fef0be81d3d7849fc70ae64d
 SHA512 
d309b0e60e640f70f23ccadb48d22401a8a8887912e3898ed7674a398d30384377956c596808ea5fbb2b2436e54424a1893cfe6df5e56ccd0014a2bde1c66274
+DIST linux-5.15.108.tar.sign 993 BLAKE2B 
e42cbfea3f70d6b30c01fbbc35032f4bbd78f1715620f30a4ebe7a4dab9081659337e839b515d7cf70d488be00c810d0a1e00a511eabb83c6ebdb8978d8ac748
 SHA512 
18ab60ef7b68a8cda5a249dc67f91da7a9dcd47a87271da8096fa0344f5a507bbeef5a8908f3733976117cbce72f80b09a7669fe32454523cbdcafd2dfb116c3
+DIST linux-5.15.108.tar.xz 126551292 BLAKE2B 
650dd6d6df954f7f25412fc9ae9f80859647b456f38db4c18bcbe53ed5abed01c9cffecbcb20e4a9f6af8c953c487088c30ee3f762bd5b80d85b87b064cb8ad8
 SHA512 
e17cef4c7453ca6240e64e8864adc506628664861e5249785b5f4f7359ea468af80f5e1719f9c6528dd1adc9ba15649a76139e1d70949ae8522aa45bdec9438a
 DIST linux-5.4.239.tar.sign 991 BLAKE2B 
6dc901f43c6ee083b5898b8f58d1725a7ba403d26a65c06237ef6d50978619f9030132f3398a5e6ac84edfa6ea4b5ced3d026f508f968875f0f64ecdc856ca5d
 SHA512 
9c80955017aca33cf0fbf56b230ae9565c4641eec744aa39842b331230d6be42c9b5580e45611e9302118e3b3c49846aa764cb0836657ab57a72332b1065baca
 DIST linux-5.4.239.tar.xz 113011896 BLAKE2B 
068c6d941f4e5ddd1669321fee63a5580e551e5f07841130871201f0be51e31d228b19fdd72faf23af1831cce709b8901086a3c0206cb36e5223f818cde7817b
 SHA512 
27b8c474803e89b3d919aceaecf885dc16298c1b82b28d5b9543d8eafc59c29a9b5e5835d4cf2c3c8175f0805aed54f115321d841dc514899c592d68e90b96c0
 DIST linux-5.4.240.tar.sign 991 BLAKE2B 
a3298b0e17137892a663db0ce7c492a3bacb7b2b7efa44f92a8a4483a2b7985fcea9ad16f86e28ab7ba4ee1d68822f8e3941fcd45d5cc74c368cd3af6470b012
 SHA512 
ffbd9efc3d55f22219ed77d1ad267663c835802b13bb4bbd2d052394cbb9a1c7046e0232c24eb681f6ff59e067c7124d838c6849e6d5f0d20af57f8ea55681ee

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