[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/

[Michał Górny]

commit:     5ab96b6740bfdfe2d29ffea9acaeb0c51d4595c0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 20:18:28 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 22:28:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab96b67

sys-kernel/gentoo-kernel: Bump to 5.15.3

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.3.ebuild      | 105 +++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 323b29a50839..ae9766c336e7 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -32,6 +32,8 @@ DIST genpatches-5.15-3.base.tar.xz 9472 BLAKE2B 
209b41dbff1afc55ce8a563328050198
 DIST genpatches-5.15-3.extras.tar.xz 3840 BLAKE2B 
9fb781e2ac7afd8c56ec3af5d4dc8ba8c1577716b429b04d81cf070debd3f8762933a8388e836007ce4fff0a10be76f97e9707b6f2893f1767e105169b0a3c41
 SHA512 
93191bce6b2c6d029b1a703b9edc77f8f9567b791a425ad9e4be108747f398083fa9adf0a4dcc92b5b140f60fdf74ed59260ca7bd630837a88bd4645812dc94b
 DIST genpatches-5.15-4.base.tar.xz 20904 BLAKE2B 
01add5a35e7eb969a41239254c8a5f3a70f7ff2775e2c3b8e6c3fccf756795a11c5645c0382c03f8225a36231671570cb984382355844c080c7607dc4a5901cf
 SHA512 
6482bbe1af3c60b065541f6cfe1eb44e4aa3ef375533397c58372ef68fd418dd1eac21d2505d78950953c833a28fe2a03105b6ee5f7128e4685d7f4f568a596b
 DIST genpatches-5.15-4.extras.tar.xz 3844 BLAKE2B 
211e9120645bfaf52f6e4f23b16775ea3739bc75795ea95f0795b1289f207116d3c9697a7dda3968c1d63cd1d66d097c94888789c7a5e6fcd837d8fe78aee295
 SHA512 
846b56ae57977c1184148bb6cbc22da2dd7052e68446b963f149e3bb8bca2f759f1abc71198d10b8561a4cf594bed3e6936836bab17602e1d4174e023e1f2514
+DIST genpatches-5.15-5.base.tar.xz 294364 BLAKE2B 
59f372c304cff219647a6bf84965e13ea13b0062be222109d3baffb2e243a93905b85fa336a1592fdb2bc48ddb29a34df9d139521a258d56c363e5021f34689c
 SHA512 
4fc8490701f55113f51314805114d3c225525b2464addc29642d337f6cfc5797bfcb0052a7f7b4045bc8b2e48fa673f5334f1c10fdd3df0bf7bcfa4bd022e36a
+DIST genpatches-5.15-5.extras.tar.xz 3844 BLAKE2B 
95d55709e177684475f4b580be19811636591f6aace5eed83e61ee2939325596b3e1896d9e573e4c85cbc991f846ed8a916c09aacb1aafdee7dc011f08034729
 SHA512 
ce42eba5f5fabc2ab20124b2486ed458ea503af43e18f31c2a9a87f8a3872354dcd589bad2ac3fea8bf6c11026b6c9165c8de9c5c71e7a03ba719cec5ab6ed60
 DIST genpatches-5.4-152.base.tar.xz 3987788 BLAKE2B 
ddc01301f5c778230159b9ea8ba107bb992ef7a8bac0f3068c40e95b5dc32eb701b0c11f4b5ab3dbda6e9f3c29c04612ecb623aade7bf38c7f852aefbba14432
 SHA512 
bbccd15725d1351be6f5feef202b3ae3760346092849902cdf3ca5cb3add804458244fd8b8cfedf39e1917e1a7dd7cba9873df2ab449e36e32a169b1640d34ed
 DIST genpatches-5.4-152.extras.tar.xz 1784 BLAKE2B 
f99caae6094867a9535056ddb3d5cd9b9154f33417a5cddc53dbac79d5ee3f430e5d84ed4607a5bc72c2217049f7677fd3d19594096f61880d6c31e925bf5e92
 SHA512 
cd69e6dadad1eba57a6184cc65330c6497f8b822a025190a80d10d4d7c669bd4d9195bd880ce99f8384d6aec5237358b03e45ad8449f1c394d5743ecbb0da4a7
 DIST genpatches-5.4-159.base.tar.xz 4064516 BLAKE2B 
c2c8350597d7cbe7652cea4b5a3fa92376259f1f4f15c3387f80f24b31d571cbb1094a27f52b099f0c61ce0187c3f498ccd4898cbb63f03c7367df39fdc475b0
 SHA512 
31116496b8d570d596a91e3408db055cbc602af2608ce579f5ce5ff41c084f629edde49c1efdf6220289451286f8a0b68d2937b916886f51b9a7d0529f130d2c

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.3.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.3.ebuild
new file mode 100644
index 000000000000..09500e23556c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 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 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.0
+CONFIG_HASH=ac22a7ccb1707c38a74189c47fc991414cc01bca
+GENTOO_CONFIG_VER=5.13.4
+
+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/v${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 ~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"
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       default
+
+       # 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
+                       ;;
+               ppc64)
+                       cp 
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               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
+       kernel-build_merge_configs "${merge_configs[@]}"
+}