commit:     8402f42cfa43d75650302f34dac51080a86ec301
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  8 19:40:27 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 01:58:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8402f42c

sys-kernel/gentoo-kernel: Bump to 6.1.44

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.1.44.ebuild      | 146 +++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 66f6b18f0172..9d50e6e78ddc 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.1-48.base.tar.xz 2983620 BLAKE2B 
fd09d2c761c3652502d590ad189db
 DIST genpatches-6.1-48.extras.tar.xz 3808 BLAKE2B 
5f31be220d97582f049f58f796f0d509c1d2c82ca41efbcb178a9f78db64e0de0d0297096a6109c4989777cddc0957fc8efa7caf333737157a4b6352aaff64bd
 SHA512 
d37be3695cd96f3226265c4f689aef9e98f0528d34b554e53e98fe9497e1b8a26ebe2661d8a04e9c84a615e1bb4966263358d759d228c950af3ce70bf6340e0c
 DIST genpatches-6.1-49.base.tar.xz 3063788 BLAKE2B 
d97aa1abfdba4aaf84d392e5ebc26822a1651fe0249b3bd84f4f5f2c413955d9d216bc1e9e2e2ef388e7aad4153ba11863cdb7854cd2cf1dea478da3ee8c065a
 SHA512 
7acb3101165cf8f4beee7b80880510a5ce4afe0148641c7edad91cd6365239b52b55a51c550408ed0291aa3ad74512022ccb6ef85c6ae8765a0ff2d49ac84bc1
 DIST genpatches-6.1-49.extras.tar.xz 3808 BLAKE2B 
a200e4d646d8b99db4a5fde73ae51727c475b18b9f080b3d55e27d4b6f247cc8950f772e0676cfb11d301d3a9042e929d4957f96de0073bc99ef65c53668bea1
 SHA512 
4fc28b57b4a99ddec743d3804a78a5027d9922641135f1995016f2c5806282f0bb33e9f78cc7378ab8388b582193df457a6c397b0986e197fd5e5cc4bba85c7b
+DIST genpatches-6.1-50.base.tar.xz 3084144 BLAKE2B 
7b66d8775f85ab8b4c13ca7dd204e73cec666b59e75ef977aa6684648f76cebe489ce982d8d75063bfc7324ce84492eaf6c9d37eeed0a6a892e32a7fac0fa5f6
 SHA512 
86e31d6e665c0fc1f361de9ab76e8d6840a6e382255a41d39330d92456e313e28d46c489e00539778b4047b6de4fa57492cfa2e3f4b13bcadb7138320eeafdfb
+DIST genpatches-6.1-50.extras.tar.xz 3812 BLAKE2B 
0804ac466e90a72d32d843e382f44e6c1d6b362e473c3d1d9f64b848eeb558fcf6d23cb01d560f264498bc6496f46788e62ec982de8d7d00048b6715119eaea9
 SHA512 
1c1207fc13a76b5d620fea1db9328b1c0912a0aceb9db9076905c1dad4face0d5e345e02834eb1b7343e71c3b134222de40ef2559ff71f05c186683f58d54df0
 DIST genpatches-6.4-10.base.tar.xz 568848 BLAKE2B 
d9f28beda8bd4f69e1e5d586e274df43a8661bf51733a25f320469c1e3e42d9602b0911d4e98a40942ff182f076501ce6721e534cb92aefc3d453fc43ee499bb
 SHA512 
218c38f99a07c2be1fb25737b0a9604a9a50fe3f72c507404d92da1e8dd7823142edc2b81110e510aef7e645edefbff2265aeb3ce7f376131801c3adb292b8d0
 DIST genpatches-6.4-10.extras.tar.xz 3696 BLAKE2B 
fa0b8d593543f3624b1cff626e2cb2dc93ff0e88fd54ec71a7e467c716481420da7f361c1dd353e36111425a74f6632f1c491e618dec47fa4bc15c6a6d9e26bc
 SHA512 
9dbfcd1d65daca0b56360290f0a6369fa007f32dde0f1a62657d1697fb50b84668e8a14c62efcfc3d12ba6a4a911731825df260421506639d2ba9b8764962e87
 DIST genpatches-6.4-11.base.tar.xz 587148 BLAKE2B 
19d9f8e9778046dd558bdf21550f300e9c3c74faba6a8778d76e56490f379d615aacf14a930eaa57348638440fcfa6da17d5dd1a1d3020b5544ecac252ee7f08
 SHA512 
81c854057b1a0119cbae5116090298be72a1c30a0d2eab2cf4f0cc1d4f8476eeebe183401aaffaac92e83d2297d0fb707315254a5f5a77bfb3d8c953d04d448d

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.44.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.44.ebuild
new file mode 100644
index 000000000000..7e128b87c8f2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.44.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2023 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##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+       https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+       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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+       arm? ( savedconfig )
+       hppa? ( savedconfig )
+       riscv? ( savedconfig )
+       sparc? ( 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
+       usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+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
+                       ;;
+               riscv)
+                       return
+                       ;;
+               sparc)
+                       return
+                       ;;
+               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