commit:     02c720e8ce7d23b995ee3453b184fd14451f2860
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 15:57:33 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 25 19:58:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c720e8

sys-kernel/gentoo-kernel: Bump to 6.1.92

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 6637d7fa5f89..78f66dbba7c8 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.15-170.base.tar.xz 6810444 BLAKE2B 
979cea1e399d312eac94ef4e4fa
 DIST genpatches-5.15-170.extras.tar.xz 4048 BLAKE2B 
dd052053b2f791b558938755ecd1946d55aa52374acaa98b666aa2017d678d3552d161b36e50bfce63b9a71f0e252cf298c8416e3c6ce8318854886e9c1caf67
 SHA512 
b2befc9604dd5fecdcdf7d58ca219fc780548b439780b64c3e3eabe5b3a53fb33af30af8a0807b6d5d327381d9541f94645dd0f8475bfdebbe0ca41fa9de7846
 DIST genpatches-6.1-100.base.tar.xz 5230656 BLAKE2B 
ce1e60a36233dfb26eefad5351fb71d8374fb673fc117fbf37ced214f678c642c0fe0e898d6136fdc99504c3b1ba094c372143fa94bca87efe0a63c184256229
 SHA512 
ae3ca97ba86715c0a6b9a4888c7b5b262becbbf5262e868e171e9738f212701855f2a1e6587908e5008f524b546d3fcc9f0c671286e5868d67edaf3a92a141cb
 DIST genpatches-6.1-100.extras.tar.xz 4048 BLAKE2B 
f8266ea5ef27224671f17cce493a10c02a0b93e4b904b608ec9953e7fdde42f0e89419d7d32f926a400bdda952aa87be2d9c66896e6fb120fdcd92b6473d5ddd
 SHA512 
c044c5fe35ce29113d127b0ff34004d7125d45433ddbb3943549d0eae657a177a1bf037291c151b2ba3a9d35a89663031afa11f0bfd114531aa5bc54894cbb99
+DIST genpatches-6.1-101.base.tar.xz 5248940 BLAKE2B 
af64a685e905a51004350b263e6d5bf9078518a979bb5d192752672d15f54a1dd330ec71c33dde0dc6afce11f5d53bc62837ba400314978d740d4adfa3f32778
 SHA512 
fde5c4d51ba8cb095743d936e6b7e31ad4b7b04b46db66a4746d8fd03205a0b18a17e4d1d08210beaaff13557fd47a9752cd36a28abf19d879639c175cf755fd
+DIST genpatches-6.1-101.extras.tar.xz 4048 BLAKE2B 
8664a60521d881f8e80103f2509831e35763c891cd589c907979d49d7af96d699fec7f9e8c3b8bb90bcb442ed2016890769f53d4ff205d76d25521094b24091f
 SHA512 
79276866b12b61d11109c27ea31eca847374a3938c20e4a07ca2a6f63bc62ae0c89a9a96e65227ab123fdc85c171cfa100261444fb9058a30d70b6ce4c175dba
 DIST genpatches-6.1-99.base.tar.xz 5167668 BLAKE2B 
0dfd80fa50e373b99b3ec8c2adcc80eabaa0df9606831465c2afbca34cc195f41902a5ad4472b822eb2e011356c51b257a39294ae1d123c7384f915bd0a6249a
 SHA512 
39116b71b7da155596a158ebb1aeafb029bf5c0d1ec983efbbdb323af61fc505c3a67beac4e6f888b3b673cdc271ef1dbc3090580aa89f573a652ebe0d501ccf
 DIST genpatches-6.1-99.extras.tar.xz 3848 BLAKE2B 
aaa18ac05550c0694e3a8051e41acbf7b135d593dbbe2ebf8f757996502d1721e96cf11edb5ae87337667f340640ee1ca55de0a8266b4a2fc929dc80065df746
 SHA512 
0528cbbeb530d0765af843db8479ab6ce011df60be5c3bdc913c81f1299868f772e9d751b973edd75d7020cef7ac0f5645528e50b87f4ae59fac2392cf86137d
 DIST genpatches-6.6-37.base.tar.xz 1986828 BLAKE2B 
003cfae8adc04f3ea319ecff4344662e27df5d501bcdcb1801d6b429ac85a60834a896a9222e0b9ba7c173376fa137a2470cb04f08289abd6805a2f0b07b0b0e
 SHA512 
e21bc0eac8103091dae7d3e5d29ceebb4e47eb3e1fe63d577b0d000444837d723568c13bfac4f5deb61132dc3adc153e8de4661a15e6880b38fb097bb143bbf1

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.92.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.92.ebuild
new file mode 100644
index 000000000000..05e46adc1bda
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.92.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2024 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
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g13
+
+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