commit:     c8b89a8c6402e5ecdc3d4e247fa5491dbc93e8f9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 16:14:46 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 18:32:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b89a8c

sys-kernel/vanilla-kernel: Bump to 5.15.141

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 7676deff1464..57e0326b8ff6 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -40,6 +40,8 @@ DIST linux-5.15.139.tar.sign 993 BLAKE2B 
4b83b5fad9d04a71b705ca26884044e800616f7
 DIST linux-5.15.139.tar.xz 126565840 BLAKE2B 
9e9172130da4a32e8a7b38e7a30bde22c127961364118c39c51d3fe9c80a24e656e7c4413273e51815fa8adc4e4095f9b6b8a65185b7ac1976bbc34445da657b
 SHA512 
a5cc277b6079f5fb452f32a11fd98d4398d8296ea6c294ace7e5eae543892f954070a1a222d2f93942cd652398bddaa86dd905f20480708fc9a5a04c75d3e109
 DIST linux-5.15.140.tar.sign 993 BLAKE2B 
e11c67a3b083d0d8c7305c2166bcf2e7805f09e846c8646715fb0e39da8d792c2a6767314900c0f64e720577835d9ee8ad2ff4b03b3206b088e2c510b0ff2151
 SHA512 
1dbc9170d0e1984aedd63d486e61b5eeeeb8392e9adbf3110c360ebd4018dc2ce8dac0133e3c0f2471d52f331cecdc519962cc6a3e06902184b3ba515fd418d8
 DIST linux-5.15.140.tar.xz 126542092 BLAKE2B 
1a41b0dcb32061d4df5afe22f34a3b60a7aa4e23427757840689a8c56caaf9289550f45cb8ed7862f8447de1c6740df84e7f4dea2a9f4a8cd2af8c66e8f071d6
 SHA512 
d30a0955efc40fae6e09b68727c22df8363d884a0fb9583ce4431fc00b89a8bafd964bf79cd9af0c6d8647f95f3ea007e7d79926be1cc92da4b3a04bf1bdc99d
+DIST linux-5.15.141.tar.sign 993 BLAKE2B 
eb1589149a908a350d309af91dc22626b2acc9a97f828df39b0de58b65bb3bce95d333e12737dd8e9bcc486662bfad160cf3b76bf7beeb738ce88f27e2f39ff7
 SHA512 
118eb9bff366d9cd1a87ac9a4a61df95fb7a7ed6bfc672d0108543b406a9f9b589c5d37f0fc4534ab99676ab2ec4c44b51ad64dc5a313278acbda82cc2cfddbf
+DIST linux-5.15.141.tar.xz 126572620 BLAKE2B 
8ac0b05d6412c7e55735abf7669f6f52734f3866d6252dae8abf9ad2a01091c58865832d8a3db858203db8bc836a01ecfc9df7020206ca370324767a4e66c9d1
 SHA512 
7ad82acc76ab073db4122a3eb6227c94644ff64144e4a1002a51130ab4831ef7e7805788ca9ce1091946ac975eef8523f5501e7743e6dbd4b26ef16c775cf2d1
 DIST linux-6.1.60.tar.sign 989 BLAKE2B 
ac930d10be651459fe169c44b4d7a2b5f1097e907aff55e6e6c48d42aa2b5976730d21e521c8a79a0fd74cdac0be01df68527b6ec11cecbd89b79b676342f1b1
 SHA512 
42146c56bf8270e05c488a5829baccf403a4b088b7312478f5fcb78b0e4742a0d20867e89ff17d3479f177ddab817dee832dca4fb5eedf0d8412ae8673b782d1
 DIST linux-6.1.60.tar.xz 134984880 BLAKE2B 
6d6723dd839b9003ea2a46be849e36516a97497ba3743860c8081795b372c70536465c46defd6ab4f97e81127b1bf40d78270b1a3a721a7331a935d1ef8417c4
 SHA512 
cef40235428a09e5f7807a8be83af9a5ab90e841049a04f9f851e69e602aeab5a50f523cae5d5928d345c11b728608eba7754b173be0c023c7ee564cfaf4b20a
 DIST linux-6.1.61.tar.sign 989 BLAKE2B 
238d6292e5e59cc6b64bc53c499fca901000ac247f3ccb8be897830113564c095e79da405bbd63bf76cee9c878cde47076c508d5ae944ad115b21ded340bfc03
 SHA512 
2bc5b580cd1ce5dce00c5ab0695aebaf29adf774f798a4232c74c7313a4114ccd25a01a30dae2e5db04ecab3b55c7591d8d7cdbdef58a8d1ad6cb98146233f90

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