commit:     f933d99a0d35903324b94c1f34dd2f5f251b69d5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 10:10:32 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 14:14:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f933d99a

sys-kernel/vanilla-kernel: Bump to 5.15.148

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 38bca7255d8e..1c85d0db0965 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -26,6 +26,8 @@ DIST linux-5.10.209.tar.sign 993 BLAKE2B 
e1f53144ef2022b2b15cd5662cca69c83347e7f
 DIST linux-5.10.209.tar.xz 120627600 BLAKE2B 
fe5b84a852bf013f563259fdb3288ef53e7f5f4a154446414cfe59ba1b2b6d7e95c0ff4130e5fd8780864556399bb03cf744e655d0bda36989da64796381f6b8
 SHA512 
85f0957d052c8321e5b4fa2aea19220f0ef581e25d760746315afe70878353b9d4597dd2aaa1fb41ef2631c649275cd19fbb92b8ae9ccc8f86c6e17ac171b1c2
 DIST linux-5.15.147.tar.sign 993 BLAKE2B 
8ce7e241fb18e88805a947ccd20414b073e90ea6a4b0c09683a3a5f56d8542ab262b26842bd3b3a678937b4fa01fddffb8910c0db7c9015bafa8c8b8b707feec
 SHA512 
0390a4084b356108f50750e43bea4c1924ec042d149a4bb3e5ef63c621a0913ea3c3dc6d7275b1a78072c5804a6bd03d103d342f38b817a120637303b9b4a586
 DIST linux-5.15.147.tar.xz 126590916 BLAKE2B 
9393691267076e27e5b46f7e734e67d42839380c5d3054dadf1d2a9178f3061d710cab1ec14f2c6641ee44cd83a0df8881a1d10ccee4e1e7bdf9bd182a3b6c49
 SHA512 
6942be1260060544d27bfceff143d85b9cccc801b5f97c82ac75527fe9e0bec245e17bfde932f6886a1b0c76b1140af558e6467ba9b750ea3bff651a27386340
+DIST linux-5.15.148.tar.sign 993 BLAKE2B 
d3e9ad563db2c234ffef669d13d1e3c05957f5e4a77e3137a187fbc45b6a70465890f9657c10a03150e739d9184aba823ddf6dc49b7d25f8434417e85d1008d3
 SHA512 
ba9c24a7e033b908631b9888dba379cf0c0357c1fe7f7f47ef02cee5ce02f898da31409891161143ffaf73d5602bddee26a46eaa80b22c72fea588fe7b644944
+DIST linux-5.15.148.tar.xz 126609064 BLAKE2B 
8b77e48328e963e75c85f47f72cf9acb65853b45cbc3277b4f3fcaf773ef334c671a3080905662ccfc318c4f7941de2ece4d19dd438b58a8531d884615abb705
 SHA512 
5f6f448f021afcf6154f335e2a44f2ba1a1705afecbbff99812341477f9b3fd1152c6760d85db63507b1966aa6a4e75f2dd4082e54ed2ecca4c52c78854ffd21
 DIST linux-6.1.74.tar.sign 989 BLAKE2B 
32f15848046ec1e61b4f34a9f54fdeacf5f7e2ff7201bcccc9aaabf50ae6b953fe6acd725745a44bb1898bc982b82c4ce1a926ce59fea0c8696dc3ea30008ae6
 SHA512 
f1a11fdff28c068ab4b9d0e7b5b79f4b644e78f8454fd4e50d868a0ae52351d3549ae80e22ff04158900b13ef5afe34cb7eb3deb7488bcb215393270828f0a5a
 DIST linux-6.1.74.tar.xz 135058956 BLAKE2B 
6cd7622d64d930ce14a4a4ff8795f4762699df9dd610068b3f9b4160c44fb46dc3cd8c2d1b694b0d0bb6c9c66b1aa75751aba8575878fe5130ea3aec0e3c35b8
 SHA512 
470a821e04c3d1c64b22ebd132df869758c9999633d67c89cceee8aa494b0b46d4ba57d260e20367a06f49807bc37f191450134117e7ca924ba4d2a471b8cf4b
 DIST linux-6.6.13.tar.sign 989 BLAKE2B 
dfb90ac9bdb9f4eaff9eb507dab9a0b111f5e036d7c60128e2f0a93a033cfdfe19f2832d067984316c968bf6ea395d4d32d47c045a68399e93f7c166844b2ad0
 SHA512 
4af33314518079fab37e9973fdfedff0c08289b1b25932f5b9e83912580cc3cba26dda2591af80dfff0115d969fd714c34195567dfe408657e7b365f4e6f1b03

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