commit: 2459bb38f00f21653933310af511f622b923fe5e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 12:43:06 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 25 14:38:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2459bb38
sys-kernel/vanilla-kernel: Bump to 5.15.113
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.113.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index ae81fbdf06c8..3210d49bb0a4 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -37,6 +37,8 @@ DIST linux-5.15.111.tar.sign 993 BLAKE2B
e2514bc633ce65d36b8d6b4c9f2e826f0d50284
DIST linux-5.15.111.tar.xz 126541212 BLAKE2B
329650e5b90275105806b7d6810301775cde7e667afd52fcf0c82357a1bc055a07f651e0f41b9d4f992d239b61c0157cbb6a62e1207c8efdda3d0a7db9c29801
SHA512
b56e6f9fb6f968197d5bd593c4c68c000e2197dbeab748902775e481b075c5e0a54af0f72ec67cd53dbc8ea4c673efc9599c80bd878b0afabf43682532c44fa8
DIST linux-5.15.112.tar.sign 993 BLAKE2B
a4cde229d2e9ca63cc9a6295866d3ba21b1755751b836b190c9583f2273e7dfecd17f5523fb38dddc12c9e27729c2b3dde2b59e9c7831d64f90c6b4f975239db
SHA512
4d48b108a3d6c957c690499ddac8010146fe0fc99768d7310605a817aecd7107f7228e9cf9937ebea30f4ae1ffaf62f5e4bbe0e2620e217541d1b285dbb09012
DIST linux-5.15.112.tar.xz 126518660 BLAKE2B
10867ced55615163d3d719cbfc9193a185099bb062fbb33849763a1153ce6be8c063bdcdaa96b1e64704f43e23c2abd87f874c0ed4266e6eb40a185aae681bf7
SHA512
5e9f444c3f17480eb7b783cfcc0d3a8526c0d2c0e0928043e15bc75f3f9c402fe42f8df8fd4231cb965c71512e1c5a34400081ce305b288d0a4a979c9186e0c4
+DIST linux-5.15.113.tar.sign 993 BLAKE2B
45807aca09b119bd3784a037c2d36df8ef6d1c8c8c9bc8973b5aa4e91aba237b4d9f07318e68a9443d6df07398c0a908486ca7f4a5091d5728b4ddb7ef07057f
SHA512
29a6bf4675715ca0e2814712bcbc8cfcf57f20988355c88f2e1f864a571c8b8a8e56b0972e0b4e32eaec71378b2268301740a443bdd9328e40b1070f65be3f1b
+DIST linux-5.15.113.tar.xz 126528360 BLAKE2B
073d8b9d7ceb6e843182e26b3fad7586afbb29cf7a7ff16ea2d5cd41172d4e1d3729b6460230fd0ade24fbfc8eb8f0b93a11c5665727bf4b356e5f6bfb1198c7
SHA512
d4ee0aafc6532408a33ae556c521ff58eabd2fb39021e07ca343893788db2147aca4de81a3e27a9cb049b9b6afdf5bba65e6f6bfcde4dec5a79e68613ec8c939
DIST linux-5.4.242.tar.sign 991 BLAKE2B
4dfb18636791da74779de3c55aa8a9491549567eb50a408f4a8a77d3d0d8e94a572b85f245fdc28362b557783b3ad804fd81c114c52a1df7919e47296def6a34
SHA512
632e7ef33bfae1595c8bfe375fdb836becfd03346c1ee4b46c503756eac0dd47f92d9a559887207e76ed54f1003a3e3ba92b9db15c645aacc2f941939c578baa
DIST linux-5.4.242.tar.xz 113000620 BLAKE2B
b3d2ab4c1ac9aeb3d7ab7d34b5fc71097fdaa947317f52ffd8c2630d07314b94db33747bb2046818e086ad5b82fe64566900433c60a7837e15a4f405cd0f44a3
SHA512
7b4b55b696fd134b720ab7d0253c7ffbaa7284e5d6fa89b3af37e8e2a98d927fa508e28bcbae1937acfc3d795be38017f1991898c83d116ea2e9af99e82664ce
DIST linux-5.4.243.tar.sign 991 BLAKE2B
c289f3171230e343848ac748ad345c2082e0ff6e289b83eeedc4ee7a3c510cfc59dd3c8b2afeea60fb1aeaa305e60006ac5526ebf75c4d0d85820e3004891eeb
SHA512
ac49bd40f185da3ef1c5ed1e6342603a147664fb5f89ca567a37675d8b3b4b08ff47f01de095e0453424447070338635c8cbff4ae84aab0d30d35d0be294ba16
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.113.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.113.ebuild
new file mode 100644
index 000000000000..f68caf0fd433
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.113.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[@]}"
+}
