commit:     d88689dd4cfc7e9b764002de4e0f0585a363f7e5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 13:19:06 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 18:20:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88689dd

sys-kernel/vanilla-kernel: Bump to 5.15.167

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.15.167.ebuild  | 134 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 248b7450fe03..e3ccda38df65 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,6 +28,8 @@ DIST linux-5.15.165.tar.sign 993 BLAKE2B 
4c8ddbb7540bd7b9250360c3b55d1dc6c06a396
 DIST linux-5.15.165.tar.xz 126684752 BLAKE2B 
cb5efc3d57473da217b35f4e870c78fe4a647828031271c0300f8af11b041bd61ce6c3a0aff9b65e1fbb1af0d6895637cfa8dcc258172b71143116c940284a09
 SHA512 
37c8f7e88727b3be43e03d889330d70d5f3f87f7e11b9cee98e2812b5dfbe97bfe18f655efcbc2c7fbdd883e6d8d32609021aa054a6da53450490bb1c7855d49
 DIST linux-5.15.166.tar.sign 993 BLAKE2B 
4f50d975cb77f23871dd402b61a07998deb0705df4b8baec9ac0d3228ed2c39995c03d766de31aca6cd2445053184b653ddcd88bd2bd91d7175388e870ea53c4
 SHA512 
db188fa382c4fa26e37865c8415640f5c7e0cfb20d84cad855fdf97b874d09fa6148a328cb277d215b1933c95489402c81f7798174069b460dc1100d1e1c57ae
 DIST linux-5.15.166.tar.xz 126683128 BLAKE2B 
52688b940aaf76d28516e05138b386da95738a8d0da7979ff27a8dbafaaccd7e59df18320540340dc661d8ec88c44458fe578ed93f4630a1d391a03eef2cf859
 SHA512 
20a7de0aaf3b2deebcaa4bb5926d979c7c758dcec2d8263d11477f18077518ec7fa8900a71ec09c8494a2d5c7291902e39b42cb0b483e7423bb2953a8d9c8320
+DIST linux-5.15.167.tar.sign 993 BLAKE2B 
e3a74697c175bc3b6944b05a754fb015edb1137d053039b4d122d43b2ed02c55218736835877f37bfbddcc42b115259049d391dcaa4ccc319b445ed9b21d98d9
 SHA512 
c42daa300b5b95ca1b3e5c1874e0112ea66f2c4d51a2d2df59ac0b3094945a39f98324d75b53a2e29a564ce2a091376dcbc8ae0166df78aa73042d85552fc605
+DIST linux-5.15.167.tar.xz 126681812 BLAKE2B 
24acaf9a064f4b2af4a272f49ad63ac565fa55408d595f4c15ebcccd8a44a2ab964e5bfbb9b9b10f765d741da541c9e3911aa7dee3164c091b203cd06c5ad08b
 SHA512 
3ce1848fef40dcee6de3808574ab236c72799aed5aa5a295d169b45ed529e254b43df81c9d9b15902723d7316c3d1af366aeee815ee9be985cd2d380e360cf0b
 DIST linux-6.1.106.tar.sign 991 BLAKE2B 
d74c3e31e683255ea4f222ccffa62c755e529aecefcf8a60eb2b3b844f1e753c3ceee1b8f1b0728e1d92d78031bcf6ea6d8829d8c30decdb9eaf36b3c51b1d91
 SHA512 
225eb6e616f2f1d496c294ae09130007d786b2ad7e4ac40b7e0fd8bb36190cfe774d9d7ea0827bb7303fc584a3289935656297dbc0bff59312b1f5374309cfb6
 DIST linux-6.1.106.tar.xz 135145020 BLAKE2B 
bcd4bce2bf35411fc1e13afa5c6935ee5cfbb13e4395fa7215d34b6f964d433c54f1b5a1022ee57bb439593b5196a9a4733f79d5590b05defda60b62845e4eef
 SHA512 
0ca73f9ac725dee2ebf7aece9ea0e5bb890ed7fa836eea4d1fa97417b2a2735dd5dbf9a5970683ca09f6bb469aa03bb9ead7927bd4c2d2476190be5f2f3118f9
 DIST linux-6.1.107.tar.sign 991 BLAKE2B 
00fb8cbf46cd3f7f9a725d8db49d6c1c7318ff880634cc13c1ac662eb52afa0d3e8f172a1d9bac9ecbb8956e7f1cb0b06256f3463755ab09df15f8b089031bdf
 SHA512 
cb2dcc57b30ca63b0165cd286ef62a7d34cafc6f516217a4584f69b2318d7a1825c4187149211a0dcf023455f150067106ea0d07eea131961f56cec4c79c7d0d

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.167.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.167.ebuild
new file mode 100644
index 000000000000..857634f8cd43
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.167.ebuild
@@ -0,0 +1,134 @@
+# 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
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.102-gentoo
+GENTOO_CONFIG_VER=g13
+
+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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/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
+               arm | hppa)
+                       > .config || die
+               ;;
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               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