commit:     3732dff2c2e659ebd2394a7af9a20991669a6874
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 17:04:47 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 21:58:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3732dff2

sys-kernel/gentoo-kernel: Bump genpatches to 6.1.64-r1

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 309c50b8671c..768532743f97 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-6.1-70.base.tar.xz 3972184 BLAKE2B 
4fecbaed663f02725423386867efc
 DIST genpatches-6.1-70.extras.tar.xz 3816 BLAKE2B 
24fceb3a4d3482fe840ec8053badc22d06a8eb0091af745991ec729bde2dd99202122c149fe39553e3a0cc4e853c6d97d084d24a759172c643ceed829f2f6cf9
 SHA512 
381d9c79faf43a9c26991a3064096e90e7dbf027350c299b3a0afba6248b4cff4c7c58e6667528a33d77ed3b8e91516cd018f0aa4c9ae340bb441218e681a5af
 DIST genpatches-6.1-71.base.tar.xz 4056620 BLAKE2B 
a33fe2f631e5fd240a519b1550c56986f236bd9034c1e6497da3b285332fc1429712716907d3246b00dac338ad1488b65c219e992fb35d2c8a1e2db35e3ca4ef
 SHA512 
5e01e2a12719cd56ec0bab862eafd1409e637bf24da8ffabd31bdcee497b41466ad971cf229946a5bff116e71a224cf25024c47c74b00c16444302d25baf58a8
 DIST genpatches-6.1-71.extras.tar.xz 3816 BLAKE2B 
d52f8ef239c4bf9b7b21a48104025d0d2a54e567bd0dabc6fa2f71eaa16b5ad43040443623b3608f747d555b71325c64119f64a9f174ea47a6aab26325bae16d
 SHA512 
51bc2d01212064a162867b51525f58dfcc44f21157919b85b676fae7426a0920635538bc8d1df22860f81681ba50316eabf57db00654e73d0b60912e4ef3a6fe
+DIST genpatches-6.1-72.base.tar.xz 4057544 BLAKE2B 
7af6ca30c523e00f1f30f97cf29c4ede16f83cff59669c2eca781e9115f9aa4b3469fdfddb2625302f52e56c573cf9f36737e7887b7caf3c6825473ac3e6eb0f
 SHA512 
fff5387e2b60164d70facce3e3d8c6c8aac12563b0c2c0732a25464246d15197651c89903299953a72c0a38c8c2ec6948b7bf3c2c37a6b0e30921dbdb45200c8
+DIST genpatches-6.1-72.extras.tar.xz 3816 BLAKE2B 
a6de63bb21ba7a7f5ff88dde6eda62b6af5a2d205cf8072c88027f877b96f44c02465e825dfd13f503a636706f34d4fc0a11c0c71fa8a3c4059deca6f49da539
 SHA512 
736cc3baa53c31b8f93746677ec1e72616df48d58fb28d5e59b58c0004c484cfe1400bb5b23aa2c696923beeb1661bbbaf0fd8326e925ad486a0278e6b35f5e0
 DIST genpatches-6.5-12.base.tar.xz 720508 BLAKE2B 
429f4fbc3292ab46250bc1716212f369f888ee0219ab19baaf8a7e3634c012bcaa64820639b5650b5346cc93fffb3b00c8ba5ad48c3f0030e5db6102646ca60f
 SHA512 
1b5de16a305f7cddc3125be3786347a037e25b8b53ad05c35c8efd57e624dbd7cf152898c3084847d6c9b77f5bc6df378644434e877434d40ad4fb0d08d6a37d
 DIST genpatches-6.5-12.extras.tar.xz 3704 BLAKE2B 
3d18f544a455d1184eb9687a5c53c7dd348b12f736313a3bb9d3417e0f4458a8e7f962451ede58f45016af700014fea87cc3336b30ede9f899dd75369eaadc57
 SHA512 
0a8c8a23d99962e5f0028ef1ee8ba79cd20af0ccf6b08e554405ee964cf542b6758d0e2456612a410d7fdfca5572e4af7c4d1c3b65a9b426412c1b480b2d6475
 DIST genpatches-6.5-13.base.tar.xz 741136 BLAKE2B 
3e13a5bb6effb4005e2c1e604722cffb27583aa78ba0642ae2eacb2f5905fc19fd16212b502196e58d0ee4064779623b44af03e34c6bef0635104bbdfa49253d
 SHA512 
5b63c998dfe984b5435e7e951889dbd1bf4cab2d8db41e89978ffd06ca58ba3e8687e740bb42514e0da5e5ae19998234f87e8220d5eb550e21fb6bd7c665e139

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.64-r1.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.64-r1.ebuild
new file mode 100644
index 000000000000..92d3ccf485e6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.64-r1.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##*.} + 8 ))
+# 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=g11
+
+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