commit:     b667f7f1b89a7dad4b23a3a05ad6e108a89a859c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 14:03:18 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 16:33:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b667f7f1

sys-kernel/gentoo-kernel: Bump to 5.10.83

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.10.83.ebuild     | 116 +++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 4f7fc505a651..1c442a5c4855 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.10-88.base.tar.xz 2600948 BLAKE2B 
31505fdfdf40fa4ae446a496eade
 DIST genpatches-5.10-88.extras.tar.xz 3840 BLAKE2B 
d6d4ec32303320ac6b45cbb2bff67442d45a723efaacecbd7bd45df1cfeaff98683b30e06cba2f2286c24179978aa17a5de5915e8fb1af3558869274ba4caab6
 SHA512 
815f1ea9ed87300c81a5b4dda27314ad6a2b88505b814ef266bc8d0e72b66ab04310f05c009a9c8173401caf236c53e0bf3b7b083fdd46d8ebd82007efe0f75c
 DIST genpatches-5.10-89.base.tar.xz 2639528 BLAKE2B 
8242c259bbe47bb44acb76e5076273551c2944e0669cf14f6db2c49a979078452160b38a6fe53450d13a6e8baa73f8856c711b2bbdba214d5ec3641c0929fb66
 SHA512 
298c1a39f643b884c0061626e5d00001df5d85eb8dc90a839b226fc195605fee49bb8ca26e318a5f98d830e1762bb101a4175d7f5890bfebe4e1cea3992e8605
 DIST genpatches-5.10-89.extras.tar.xz 3840 BLAKE2B 
7a9a3c392581bd9f28c43a636e080898e71989ebcbffade75d30fcd26bcb58cb70dd7aea345e14c8a30ffe3a97d7413bf30fce6fb015685504d47df520990efa
 SHA512 
f7d084ee5ae45cd6ee10a696756bbda3dc95dca586fdb261692514c919d3dc3fd8145d630980cde29b5054170e5104c73bb039225624ac7a6731d0022e3cea17
+DIST genpatches-5.10-90.base.tar.xz 2677360 BLAKE2B 
6b866dcb6b7a06dce655f2ad80fba42d652b73855512155738b8cfcd6705ffdddaf0c0a2f170951ff5f975a5570525bebdc1040e2dc2181c1578f1b7ad9f817b
 SHA512 
62838092bb11d82c31e7cbc87e25b1269e5276dc7946aaf5e006c3c1fe57744bd795662d316daf1ac7d93d1b3b0388785186668decd94acb1b406362674b0cb2
+DIST genpatches-5.10-90.extras.tar.xz 3844 BLAKE2B 
bd0b5a7703903f363d9f89aba10855b2ce41ae69689df9e79a84cc24af942301cb96509e8b69ec7228c8ea3394d3a33303b33bbab0c8c167448868a16913580f
 SHA512 
3038df172f022744a1cfd57178566a7f144c746eeaf1750274a6f53561b6efb4d5eb96fc561e15916ea4dee5f7e89c7359fd8acbd528ba523e7a0f36d36139f5
 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B 
ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726
 SHA512 
55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 
5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a
 SHA512 
397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
 DIST genpatches-5.14-22.base.tar.xz 864000 BLAKE2B 
0a2ef4aa3504d23bc2ad1047d76d705ef4fb15e15ccfc59f343bb1f817ba98940d9bcf7151cac74cb02db4e946344e43679ecfd848aca65951764ede5288ad59
 SHA512 
b597484d880cdcb1e8e7450c48cb5ca6a5902109182ac01725be00c264450e7e0d24e54940d3d55084383725398ee05159dc71ce7c152850a57aabbe5c26b1c7

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.83.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.83.ebuild
new file mode 100644
index 000000000000..d6068a2082d6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.83.ebuild
@@ -0,0 +1,116 @@
+# 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##*.} + 7 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.15.5
+
+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
+
+       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
+                       ;;
+               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