commit:     8ba6ca11523ba30f6d2729e847431c4b3ad53857
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 10:40:23 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 14:46:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba6ca11

sys-kernel/gentoo-kernel: Bump to 5.10.131

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 7c175cccb52b..fccb918bf5a0 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.10-138.base.tar.xz 3762688 BLAKE2B 
44039c709108f0b9a9ff95ffbcc
 DIST genpatches-5.10-138.extras.tar.xz 3868 BLAKE2B 
d08d8e425e323df25f3bad59bf71a0836b00b11855028d131d34a25938d9783ca85cb8ef5c9cae65eeec2a41280eb2cbf8816b94ee4c48c7a01d55dd4224f9ba
 SHA512 
6ff612c0e8a050124a7f2bdfa2ff64f99bb0250e32f79b57855d9a95d7ea3182913ee016e63ae86413872791342c8eaea198929ae413dd0eb92eaefab4b953cc
 DIST genpatches-5.10-139.base.tar.xz 3775368 BLAKE2B 
5ac003f1346c1e9130511cdfb7ee75127f4dd67084176a6042c0c6fcbbe4a5c5c60fc26a86f21def7fcdf23116cf8b9b9680733ac657730af3f01e2a709749e9
 SHA512 
9719ef4cb81f0f2814b8b88a756bb4883fc33d5e8641f251796ea4edfcecb80240533b4737f2e81bafa7e495ac99da0764d013c6d767e6a6710c50352306488f
 DIST genpatches-5.10-139.extras.tar.xz 3868 BLAKE2B 
d755c5346ea1fdc709f830a2a61e1b2c13fd5e5d180c9c7631e62e362db9610ce741d1358dc2b8a0104a83413bef919455390fbd0464db21b6bdd24701c8e62d
 SHA512 
89152c2be3383630b6f69715f9ffd298015dbd3f46662d0ae079017d73e49e1bd7e5256e59fd688c3b5e9a30de95a82cf885866e40e4154b4e843a87017ab7b1
+DIST genpatches-5.10-140.base.tar.xz 3775232 BLAKE2B 
1ea0b94e5acece92add1bfa728fab6f4252dea9bdf75696dc52afb4b9422a404fff906dceb31e3a21f6712eaca6ec61ff296d3619e257183db40e52c500e8551
 SHA512 
568c171f612ff5c59b8b56c2fec29fec36e05c7d35050b687d9a9d7b862d1899bff2fd505094b46969569921aeb69605fda5911883c6583f28405bae96348ad2
+DIST genpatches-5.10-140.extras.tar.xz 3868 BLAKE2B 
c5f78c7a2c3eb68695c6e2b0810addf286c66f94f53d1953efce2f12e69b04c4b0a43932d5114dec915342594750f0c40ad74a277f198c91c6ba6e5e5c1a6544
 SHA512 
98af36f68c8eff7432b4969d06c0a2a0d1ea00a18d18b0dc86f360d69bba2ecb08bf59eddde1534341cfe0a5e0de09fdacfae3816d7df1f431b70fe871eea8f6
 DIST genpatches-5.15-56.base.tar.xz 2245780 BLAKE2B 
0f5e5d7c8a29f590598f4721307e3b1a316342cc31b8e5ab5496ed58b65470d19bed59ff40cf7b26bd4970eee04581ee8ac544eebe63c54063c161a55c828cea
 SHA512 
0a1c4edd8f863f2c77a14cf48d79c35868ba8b2f02fb2436e1913e97c8285046ecbedc33e6faddf02a0c813e677492be0fc972e3731c733e488006602eb6119f
 DIST genpatches-5.15-56.extras.tar.xz 3932 BLAKE2B 
2b167a35d9dfe16a18b22318ac4597147fb25bef53a66108c2f2e4d6e6d3df1c9d4b1fd6d63ba4a8078f94f8cd69d14b359123355ba266ef72b44f7d9addca9b
 SHA512 
ce91556981720f3718921993eb15f5af623cad8dc40a36bec6cbb0d52153fd1288bf97927daab1b1e3ccd1451d4295b109ead0160c657a00c62c2d6f25fbc09f
 DIST genpatches-5.15-57.base.tar.xz 2275504 BLAKE2B 
23dad9d2e9dfc1f77f6e39f8d9e68a6e3168d581136d50d53b3503278bb5e4abfc25e2f9fdab63eeed674e370bee8ae7cc5c54058f6942abaa4eeac49258d765
 SHA512 
b675437c320b28f4b4ee979fff5c32ea607fd795b090206b49d66fdb95fc2ca1b959fffd33b9e5241a160c2f19902efc8218f2c39eaaa312a5b4149282e08b99

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.131.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.131.ebuild
new file mode 100644
index 000000000000..161f70398d65
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.131.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