commit:     6604d0bc62f18b398ddceaf01dd6bdc5c957426d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 13:37:33 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 18:39:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6604d0bc

sys-kernel/gentoo-kernel: Bump to 5.10.160

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 68a7fae0078d..17013e9c1f16 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.10-167.base.tar.xz 4477064 BLAKE2B 
35b2dccc482e167393c2aca9fb2
 DIST genpatches-5.10-167.extras.tar.xz 3868 BLAKE2B 
31508844298f272c02ce06f341597d4e75013488ea35409ee51f2af6dcebb14b2e3c17b7e27ccb766b051f618107aab113a6174959313d504a40456ca6910dc2
 SHA512 
808de5319a1dae4c6297a9aa6b249d02476870d9b929a2e7528d709cfc49d14e5bed78bc13167ce8d203f3e7ebb580d86382550de97690c7ae5ffb7d0fa0f777
 DIST genpatches-5.10-168.base.tar.xz 4500132 BLAKE2B 
c613cf38336ac3ba3b51af3308d111ffce729694ce3e5d6730c20c97c9b5f5a6d88d1c2d6a6d86ed66522e9617fc4cd94db99b7c02e695c4bcd1a19fcfb00634
 SHA512 
23c394c27a97129e24ebb46a85f52fae3b31e50d279970fd5af3081b6df275f9471d5513a5fe302ca8c7001d09b83af5fa7a17ea41db6652fb434859a257f0a7
 DIST genpatches-5.10-168.extras.tar.xz 3868 BLAKE2B 
86fdf10638b04700b3cf4fbd6ca570ba6fed2db16cc8b447f3661589c779ea25c0400538d79834814236f463c923f754033bef963a6f886ea447ce82349d5a86
 SHA512 
12f20ceb292d0f347778f6b65174ffbe0420e58857671fde768e1d14c7712cb2ca14f84f2e615ca8a2c2981495f2939f843d82dbf9172bef0e3bb7ac3257602c
+DIST genpatches-5.10-169.base.tar.xz 4503176 BLAKE2B 
ca2bf2e3fa51de6c261f94bf54aaa3e0d7f89e4caae3b0d8b0e7c202f5834c8488fe4fa1239b88f7f1e59dc344112b5633a2968a4dd2d811afb330934861c154
 SHA512 
2086d7afcd337d6fe029c24c8c8713fb1764627abb975f412009e8a760b9eba39944b86380ca70b8568f550ad8ae0a82e8cdc1474196d5f4edfe6ac02f458c47
+DIST genpatches-5.10-169.extras.tar.xz 3868 BLAKE2B 
40ec1739f6cd6cc27b4b5671634aaddd650293e361e3de8fe512652c9f5e7a314d1b9d73c652dca1b6787d24260aebcc8686cac6d85f031074400330ecd6ce26
 SHA512 
1a474298d6a77c5e1aa377bd92ed0066e2eaf0a978db3e2e444ce3f308fcc8043c7d5a9c23b7d1ef5cfb3a9a5b2a0d5d7ecc593b2b5db95b79ccdb95944d78b0
 DIST genpatches-5.15-81.base.tar.xz 3257712 BLAKE2B 
66e0d129053b2cf3ba59681318be5c6a62d469d6014535bd4b47d5368a7718db7015ec1dfab34e4db324b4d626f8f8a9219231b2908c3fc2c2d51a3f99db999a
 SHA512 
f43d637c799216e2bb99cfbab9c51b935d02f2dadaa0f2fad238f14393340420523c25927c10fd6b69745972cdf4e7f3e23cd56eea799626c69f4fb7d44b8e49
 DIST genpatches-5.15-81.extras.tar.xz 3932 BLAKE2B 
0783c48eab8d9f53d07770a3df525df2ffdab8f36d3d7db2d22e2fc5b0d1fe904644b013a3d1a5ea3d967636d4ff91b3f208ea8f004adf310134b98ec5cdd0fd
 SHA512 
be4b557066d8d2327724c8be440ebcedb01d0eadab7bfa0f9f230111cba76a2623bec0945fc887b91d6e5c73eec3eec4fa29b2e76606e7871e81a91fdc4b2bf9
 DIST genpatches-5.15-83.base.tar.xz 3328188 BLAKE2B 
5d8da81e1c5f936ce49589d1dd10f41246a6059c410c0215b495ca7401eb618aa6c87d2ae23b08f27e3be5dd6b7f88e5d4e90ec9950924db9a08375d45cb2da3
 SHA512 
fdcbf6bc1e17f04df9d8334c1c75f21e5ca60fb99157708a4c599e43ed20a58664fe54fe8467924623d612ba2ddd409af4840195369fe274a4f55a84fce12ade

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.160.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.160.ebuild
new file mode 100644
index 000000000000..c2fcac174860
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.160.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       
https://github.com/projg2/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