commit:     63bf8e1fd1d459ce9580a9b5ce07967c1e4bbff0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 13:48:15 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 17:06:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63bf8e1f

sys-kernel/gentoo-kernel: Bump to 5.10.113

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.10.113.ebuild    | 131 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 4866d2da1904..ec937c1538b9 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-117.base.tar.xz 3165564 BLAKE2B 
0e41b33af63a5b6da920d194166
 DIST genpatches-5.10-117.extras.tar.xz 3872 BLAKE2B 
bbac7edcded53e4205c58e1404692b753d57f306b98bfd7e718206e25a947b2e1e565ae33712b64f9b24333df30c32c975af71c5a9d11bfb836216a27dfdc782
 SHA512 
b192de56c873740d963fa6689f7d9dc177b25cbaa2847adff2d3a5ea7c6c541161c4518f389f7a5f2294b878dabc0d06844bf4e45cffc87ce8f9649d55a4312e
 DIST genpatches-5.10-121.base.tar.xz 3366696 BLAKE2B 
121f7445e184846460c5501e9d2cacf0349da8bb47c60d3528cc526385121f97b60b11706502d696e783b9649795d3921082076788325189087ead4c1cc48be9
 SHA512 
aa75a7c32373a0356488ab21c1b090c2ce6a63e706f5e61824212397d56aa474126bd21f8b28e10f3dff1445ecfc3bbe6d3e7ca249e1eb161fa80e79e47db796
 DIST genpatches-5.10-121.extras.tar.xz 3868 BLAKE2B 
8ac8a382c1d7bbd47dc8761e26ae63ccb501decdbf43e4cde641441c1e08a711a9734320cb9a28e46c3d22a0dbfe5f0d2b3360f299878e5ed46c7cba2fd7b64a
 SHA512 
f050bd3cf40e8d4d37a8652ab2af932fecc38a834c6baceab1c79cc6aba47f3a19e59aadce250c5b5302830e440001bd7a4c9a380d8ec35e12527ece903a69fa
+DIST genpatches-5.10-122.base.tar.xz 3383656 BLAKE2B 
78310ae21efea3a38f91ee0a511b08be4f46ce75b0f265c7fef1f758f7aa854a69d05195e7bcd541e19712be59b80ba9b6758390630e716886164437020ac014
 SHA512 
52cf938fb005379f27df23d59056330b672aaa8c732fb324a0a65fd41a077305797440b95b95300c0577822e64bd557173573c543ebd83d1aefe6c4d97f51a4d
+DIST genpatches-5.10-122.extras.tar.xz 3864 BLAKE2B 
d8525daea96a3cbbce6eff0ff46be6a7daea3e5008f6805e2a7ede7e4aa2211b52da3b413fb2b542e8720410471aa938a5733305d925e8606b6321c39472b021
 SHA512 
452582a28be8c6c340052fa1d58a0259c11bd686abdce28b75ad117586f557e5bb188670599a8373a8b3ea01057a8344ca0f70cff13e854adbb8b9c3bf1edf29
 DIST genpatches-5.15-35.base.tar.xz 1306764 BLAKE2B 
5ea5655e825b9196663a7bb830ef34d74da7c9f922f7a71b46f7bc8755adacddd3b55f57e85b29532d6936ca481699ffae36642401e34293b4c6a445abb92db7
 SHA512 
50030f2dafba3e7fd16df7a6dd275fdbede772273009d1f1055dc904dc7afe947e92e9a32274c337938edd35073adc2e101d18a6ccd39529461d703af3e20566
 DIST genpatches-5.15-35.extras.tar.xz 3876 BLAKE2B 
5b14c88d66ede25e8417bdebc3c822d2f3755a13f21cef8a95088c97bba42a44357c98d13ce5a40e3aeb128ec0716540e893b108bf1f73256cb45250cd7ef43c
 SHA512 
bdd8c5a700e9902cb7db17094fcc220eaca4774639d73e8496ac061fbba9fb80f6aa136aa9e87331a636af6146737fdec3c21249da7a18b5fec4d82de559e24f
 DIST genpatches-5.15-39.base.tar.xz 1659952 BLAKE2B 
f40154102f23ab2b7774a998c75633598ce83daafe720930ce151a4af2a6e3647da249ffa299c7abc95c7644f51b044c4e6ea7a2378deedbf09638243c6cd30d
 SHA512 
7646cc2f7b9467cc56bcc3e0e80475f3137eca6633800a8160d66cc81aaa87968f9f5fa6b3760a1c0ff7351d77582776a2c1a24875933ec0001ec0caad8818ea

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.113.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.113.ebuild
new file mode 100644
index 000000000000..161f70398d65
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.113.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##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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 ~hppa ~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
+"
+
+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[@]}"
+}

Reply via email to