commit:     b62740045413239f8cb96648a2630f4e2a41427d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 05:02:35 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 08:28:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6274004

sys-kernel/vanilla-kernel: Bump to 5.15.152

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index e4b737da68c7..cd6c5b6283ee 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -41,6 +41,8 @@ DIST linux-5.15.150.tar.sign 993 BLAKE2B 
c96940a29280641acdb3e8eff8edc69c951be99
 DIST linux-5.15.150.tar.xz 126612456 BLAKE2B 
ded20dafa6616b17dd09c41e85fad6e955124729b928b39efeb35e44671bc438c3796d94e83ba4586e00f78395393f7ef4d2dfe2a17e38226c1a79ad4acc461b
 SHA512 
22bf5a89bf1a521685cecbc5041a9b5a9f9ce90dd660453a3f9bd1c2ee593144e16f20206fc887650b01a405f2406d722adf2f0f620cd7ec490191d838cca70b
 DIST linux-5.15.151.tar.sign 993 BLAKE2B 
b7c8f59c94161d615776f4a5ff4d5443e9277acedc67de00157c8d4b0013bd63563373f5401f2b642f09714a2dadd68d7b143f11cc8d1709a8cc6a47fc9d3555
 SHA512 
5704f471f02246ce9f42537611ca6feaf16706eb1bc354af70bddf5f474b2b3383f08cc5ef322b46cea9a0bb78c61a39f725d20d5b0da1f3abc764cd34a63e37
 DIST linux-5.15.151.tar.xz 126600400 BLAKE2B 
c661b84ae19ba50077fa30d35e8032ad2f0a29139984393f270058697300f0827b73ccd7d84da320633158099aa9600d9528250eab496e925efb0e239b3cc7e8
 SHA512 
25fda3b582871c834e467515b72eb300bf5bb1990d6458a270dfc95b2a8b20faab5345a22c2d0595d6954e270d21443c218b5f279ba14481a5ea0a8328361ef0
+DIST linux-5.15.152.tar.sign 993 BLAKE2B 
4a0b53b0146b65848725ee4a5c92f828ff5bbe6affb635bef1dffd3094a3dddcb7cbcd3108ab15d88d9375460f902c5137106156daca272a9581b427dbccef1e
 SHA512 
14c95179e59c2ad6411436888147235a6878d8dcb8fb3bda7953a45883457bc307d205cd1853c37efcead7bc9a3448c524d86a9e794eee4c764a7d3c0776178f
+DIST linux-5.15.152.tar.xz 126617668 BLAKE2B 
792184b2fab63e907dd1353d96f0d25f9f64748d814dd0b68aeaf7c23b9bd25042801d04712a3748a58560c11c5d661136d6dee6d5bcf71cc549862a391dfc1b
 SHA512 
b66d0c4e6f049011af332a1cacebdb10597c641d062488f12821e1aba0b922ea73f874d525670def3abaf43c153441ae88928cd76836ce4034370fefaf4a3e7e
 DIST linux-6.1.77.tar.sign 989 BLAKE2B 
bbfb161a4269d7604d60f8e7bfa3ac8ea0139e62e87e0d65df82276ea97a3c81355ef75d487d16f5e5f5ad7f71e23b2cf3bea5effd6082c7d5336464e2c4f43c
 SHA512 
05982dc812e576fbd99e41b64c9e3bf549da367fa0f0cda510ee018c8760b7870bb04e914bddbfd7aebfe4a6a146e72d58b356251543ab4ce03dd589b6818885
 DIST linux-6.1.77.tar.xz 135102528 BLAKE2B 
274b2becde7afdd1acecdce612d9e63dedeb493fb2d23c7f49c37b0d43700052ce23eda0206b3e9201f70e3b356022120977dffb8e38143146be3a3f4323afbe
 SHA512 
b5c27926ccab2f53af0d48aa2f4ffdeb30588fb2ac293dd58de554a79de8eef7da463272e04e6af384c80644a0e94bb89a59223d4b488815f83ee336798290b5
 DIST linux-6.1.78.tar.sign 989 BLAKE2B 
efb1b0e91972a07a3dc0b8ed46230566e880f059cb332fd3f3a16837655051f20c89af8b860195a3f5d7083c8f23dd5abf11506b66004b2660a01d87d922d124
 SHA512 
867a91773f97a928f25107a8837b231e50301f995d5609fd32c3cda12df0897422459e0f73588dabed8da96a75a96cc7c92dfbb7d0e9ee7fcee82f795e854f31

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.152.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.152.ebuild
new file mode 100644
index 000000000000..13b57074926b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.152.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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=g11
+
+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=/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