commit:     165ec26ec6be45ccf68b5817f924e41df65269ce
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 07:01:02 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 11:50:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=165ec26e

sys-kernel/gentoo-kernel: Bump to 5.10.154

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 601f93662b0d..4dceae2b99f5 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.10-161.base.tar.xz 4314064 BLAKE2B 
1f083e3d49ab20680612144efb9
 DIST genpatches-5.10-161.extras.tar.xz 3868 BLAKE2B 
4bee960a0372d930fd91c93ef6e25467e814fab8afdcfdb19a5e31b0b900b9189322efa84fa02483a1db2f25477a2b1a3cd2e5ccee50a4db1e068f6a4ceac11a
 SHA512 
fa2eb3d7914620282810ffc65a2ba9287c19c5819e67969d0800e7ebc9e67e9b2b8fc239c913b9b38f28f2ac55fcfb158949b55219f709abbe1b76194a22864a
 DIST genpatches-5.10-162.base.tar.xz 4335364 BLAKE2B 
588c43e616bbdc27c3c52d7039b94b2825de57aa8d03e6205a7effb861d52e7f55f1ced617e23dcbbfd1af653352344ce38f0bfbcfa494be8069cc6dda24e563
 SHA512 
827f7df2593de4dbe6a658b16ab9c755e380007f37caa9c6079e062e6b7eeecdca59fce141ca04f882b71738db07236b2292d451f6c042f6a157cf78a4a094cd
 DIST genpatches-5.10-162.extras.tar.xz 3872 BLAKE2B 
bda73f31c374f68e41139a18bd8adb5694aec96ff8abcbe9d8f69cdb3a3a997faacf4eeaa94319f77659717ef0574e5194cec247bb758cef769b0f6016c77a65
 SHA512 
1adbd07d1af22cb4e202be5f246035550746b2aa72a6aa834a162342d29bc3649f90894d4e6b39bee1f78fc666bfb742c9194fc1b0ffacbd1064ff613ba02d86
+DIST genpatches-5.10-163.base.tar.xz 4367636 BLAKE2B 
88dc5e125a09cf25abeb68378c99b5fc759d8bd29944d96e1597cf05489ed4ea4ff0630a17a835b4d282476d6941d078395505462da1a9c143ff9ede9beaf9fe
 SHA512 
d3bc16d8405ce934707c161ee5de9ea82dd29848d7051b190f0d70d08da21606392b22d3e74d878f8764a54a9da936c452744a1888b1574e105e1ebaca3100bf
+DIST genpatches-5.10-163.extras.tar.xz 3868 BLAKE2B 
68203dba0a18bb4e170f9e79abed707d0a521b3be0589435b659d2a9d291f16366569cd8e81d52848a4b53d92fd4df782b4a7eb2875a0bfc540553e85bbb9844
 SHA512 
375d5f17eed5030413143e067e0eb5c131451a45025c5506371b09aa6dac417dcce2cc941d5cc194f9ed394e2f3d1fd175fc46b97d373b988fb4c919371b65cb
 DIST genpatches-5.15-79.base.tar.xz 3195612 BLAKE2B 
bf8edc209ecc99da4f4c05b575b095992e64ca421e9848a75ef1ff7bca84377eec93ac3bc7d23bfd4c91d529cbf1693e231b606b27ba2ead46e9c3037db10c21
 SHA512 
c8cdadb66f904f2083f713a58bce743e56e27440f01fe98b3ddf82aaa43401c2fabad029060e7c01590dc294edcdfa8ec6c784f24ca87a1b9fa8703ed626e4f3
 DIST genpatches-5.15-79.extras.tar.xz 3932 BLAKE2B 
df50c7ce655f1f81d46ab6f077963afb0997ed2f6c0b70aa49c34a445d3f8938cce7201b75221705fe27c0a6f699dc553f932eeee7960a21dd89e3c55dde9306
 SHA512 
31e8c8aeb98e01dd1e0b25c51cfe48d5b6bc98617833229b283d35da6d7572b95dd8141592a2350ff01554bf80d918d2137ef2eb248c483ab22fc3db20a11fe3
 DIST genpatches-5.15-80.base.tar.xz 3218432 BLAKE2B 
f2478969a4e7a24bd7a30328e2d17d5daafa9fbd741dd7eb295c025f27c08ccf8efbde13003e084c509a8bcf5f1d28f45189a28467b31c48c2a4d344a726ec4f
 SHA512 
60737de4d0f8e3acc02ed07a82853d9226daf54b3b5a1b990d94e78b3dcd9fae26b9e6cf8854e5074b88dd826d286440155b70c4fc19f271ce795b2bbcc61b1a

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.154.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.154.ebuild
new file mode 100644
index 000000000000..4824ab95a1fb
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.154.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/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/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