commit: 0fc5d55ebd249cdb619a727759f4f4cecb83b6d3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 13:03:54 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 16:38:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc5d55e
sys-kernel/gentoo-kernel: Bump to 5.15.31
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-5.15.31.ebuild | 131 +++++++++++++++++++++
2 files changed, 133 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 074613eef654..ecad0a89cb69 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-31.base.tar.xz 1285168 BLAKE2B
3ca09c8deeb3487fd69fe1b26ba3
DIST genpatches-5.15-31.extras.tar.xz 3876 BLAKE2B
47b21170f3fe46257b20f4cd63288a8f61a3600746883baa2931253d2924696e4d445404746f1a656adfa390ddf8f24780ec6688aa835467deb75dfa0d9f2fb4
SHA512
c0f866410b3436f5c45c117f1dc49e3b1d99d77d41de66ca6d08213daf6bf3eb1e8875e75e1674c3f78c7beddb6dfa2d47dc9fb75f8dfedd169f1c3478b74db1
DIST genpatches-5.15-32.base.tar.xz 1289524 BLAKE2B
4fc3b82df9a96c5e91cfb93bc68597afa1524bc8c1a49f9a803d72610307551b9675b4e014c5ffd0b3e273b2a660546f274b27ab5425e9aa6eafd03719e5ed74
SHA512
277957056d9c8c8cc8f6a5a26582f35ae594c26e6e29b755b9214a91624eafb2917c67a612c231d8862831f4aeb34a725502c57e9063432d9597e24abf913947
DIST genpatches-5.15-32.extras.tar.xz 3876 BLAKE2B
6dc352a080f10cafc7a24503d515a451996a3c6940b7cb44dd661bee0125ff993b1c4594e808a087b2d15e640b8b921b37a4607e0e8312645fd0ba5c84fd214c
SHA512
8d6565a8a5a39267b682d592cf757dcfe2e7f33789fe26a596ad5d400f1821f37081a37bd25cb6fc8cea28e83448cef937e772b138314fb239ba83a288e94d44
+DIST genpatches-5.15-33.base.tar.xz 1296164 BLAKE2B
25dce9e6d4047709a0995ff75999f36a5695accfcfb3b378d0e1a0782b6897035dec5285b678f79b71d05bc573ced2a49c2eaa891aa7201b1930049a95cc410e
SHA512
e49f7e08120c2dfabe97107b15885e46dc469bb2cb537fa395e94518f1db8f326dac2a6b6176aad0d63d54e2e5e92a7689f3f54dfc64ac372a55dfc7ff75c655
+DIST genpatches-5.15-33.extras.tar.xz 3876 BLAKE2B
4a7d695523ec637b847c28eb168bbd7543706ed346e863930c1c824b82087cd531d86b794605b26076000e67661f5894d0d8f081ed031b7d7e27b2f85a0d152f
SHA512
f8b5b9264f917f79c6ea34605511d1b7e5a12b6336746495f42aa64a157b5879ab4fb23704e625eba53d9ce1c5a5dbb3bbf259e08c4bfb81edbe0ac6cbb1f55d
DIST genpatches-5.16-17.base.tar.xz 753196 BLAKE2B
8f4be6ddb70a7407f6515d180ae8a65eed54c7a7aa3ffa4175500f532036bd13dc718a77fc9cb442f6053b1cf0f8e3bf2de2c0954a5bbfd8957a99162675980b
SHA512
9550fd794ffcb29ed26be5f99116f8b53a5bc9ce3a9fd6a79d221e7f7e5e81be809eda7a8becd253361ac069526b141c414e132f11d8e1eeef84f5737c03afd0
DIST genpatches-5.16-17.extras.tar.xz 3800 BLAKE2B
9224e534e09bf58189462be87516fa21fc37228fe60399ef670e40320a8bcc5edbcd0371b5da5ed445ca84c0127ae6541a07999edd62f67a8619f977c70d08bb
SHA512
92a0580b4e38c43c3e594fcae0cd6ad1c04621e8ea543ee7c039bd47bec9229c23f72585d98d4f237e5c80fd1a3a21205a4b688ccd67df77e048d4b417dd3884
DIST genpatches-5.16-18.base.tar.xz 761144 BLAKE2B
f4d4b5225a2ef03e422230497861714663b430397d3118c8e1cd880eea9fbd2393a4b6848c674cce8892fdb145c06e4b3d828be05836d76a1c56501e07d840b4
SHA512
472f456ff01545dad0a9e21a3560eadca63dbbaa5dfea0cb4496d3ea8f10fc968967a97a7d483ab573312de53b6d719f8baa21761feb7b7474597af53e50abd0
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.31.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.31.ebuild
new file mode 100644
index 000000000000..4534244b9df2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.31.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+CONFIG_VER=5.15.14
+CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+="
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+
https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ 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 ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+ debug? ( dev-util/pahole )
+"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+ usr/src/linux-.*/scripts/gcc-plugins/.*.so
+ usr/src/linux-.*/vmlinux
+ usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+ local PATCHES=(
+ # meh, genpatches have no directory
+ "${WORKDIR}"/*.patch
+ )
+ 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="-gentoo-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[@]}"
+}
