commit:     5f58ff95ad26bd2628c50210694aec14306350af
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  7 11:56:18 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr  7 18:56:47 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f58ff95

sys-kernel/gentoo-kernel: Bump to 6.1.133

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.1.133.ebuild     | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 8ff0c0c14896..8e0c29a4f25c 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.15-189.base.tar.xz 8042552 BLAKE2B 
16de78091a708a27edcad6ef82f
 DIST genpatches-5.15-189.extras.tar.xz 4056 BLAKE2B 
3c6954be8437c63fac20b7aa8e8b7f15a6f58d853d143fd4906ced12aef8311aa6bc83fa52c610803f005d2bd2020e24ba14574ddfc2b847f06d21ac66dc7700
 SHA512 
3082eb0a0dd2204368889920884a7aaee5dd4b78a447080cc8c982a0ffe8e41ebd44e888126b492dd43e2b73eb6b98fa242ad6c6699c698bfecbe41b1bd4becb
 DIST genpatches-6.1-142.base.tar.xz 7066580 BLAKE2B 
f70557aaa04402c822b504c0bb4b9ad4726e849186e096d7a5b76e3d90fb7b19d3718df61a950f87dbe34804eeabe1736c79267a5256b357afd8354b4ef7044a
 SHA512 
d1e4992f200b1af57a44db5f6e96ebd93c5e8bc6c731a67f26f096964f98e8156d56e75de313f2a785a5220656d163116e4c0af79bbbd45c040b7e414ce39bea
 DIST genpatches-6.1-142.extras.tar.xz 4056 BLAKE2B 
9209194c61f13e886f7a4677f1eb9390e1e4eb6fd95fdb69a7d196faa7a3f6c2ca740e29964666e37951db72fbc79f7d31a7695556609e7651f1e90701962fe3
 SHA512 
de10df7d2ff2510313cdf6d74bf085113b93380cf2065b43bb4605ea9c173c85a511a3ed20fa781a53df24e65ec59ca53dda564ba8cd2902e7f35ba0dd54ad09
+DIST genpatches-6.1-143.base.tar.xz 7071932 BLAKE2B 
6a9c6027e0f0ae2ea5c900749965730c186b347933acbbc6fcfcbfc8b1528ec5ce82b43a8824ff0d9b06913b3f57c5982f031578273f7ea86e57859d0a6dd5d2
 SHA512 
d91dfa2ca4c8551db3bdb70e8ac0a215275ca4d5e0f788b28bd358747bdfbc23e422792ab5de7983c9e184457c43999f1484c11ec25b8fce5f84a5a6822a64de
+DIST genpatches-6.1-143.extras.tar.xz 4056 BLAKE2B 
e8ae9ec53201bd29d6d834e8b5f866ce60c2287bf1475e4024c5d56ee57ca485174c9a9207d31d57eb473c4d04fb1b12be9f78b85aacb2902ac71d1b645fc598
 SHA512 
3bad66ad2e88767ec61a743fb3257c567f83314e6bcb74627ae69e97f65429f82d84f986e50aa6a939b15a7f797f62d87537fc59aba511e155090d2c90968b54
 DIST genpatches-6.12-25.base.tar.xz 1528212 BLAKE2B 
818643d9f5ec5f4edc3cf2360f75bcf213ca99846e2bb96721933fa1785624aef8ae5c3ecd3af4f2e13e0cc44fed86e2d1cad8b53ed45acddcb9d91fc483c20b
 SHA512 
746f4b5523fc3ebb3c59211c7fb4a80714e6068ab769a001c044ad300621b5a4a7a0b0b06c5a689bbf382cb27098f36725962bafb4d6e4489ab44cdb19b6ed1d
 DIST genpatches-6.12-25.experimental.tar.xz 78504 BLAKE2B 
67f29383edfbcf8ee219d41e29534ba1ddbbfe7f1ec31b1227dc0c9fd45dbc4c0d101633f1d9a7487e4b2783adc040dd8b8a17b4d5f9194633e2567f05e72bf1
 SHA512 
306687dc70fd7e268941c201f40953df7f93ac92e1de91746d3cfe938c0a53761e915365cb2ccf91e97a9d583233b6567f2408a40adf2f38d00c06e3fabb043e
 DIST genpatches-6.12-25.extras.tar.xz 4056 BLAKE2B 
2244be3d7b4121232106ee8110cb12ab75c8ae1a15377dc87598e25a287b8ce48577945a1677b944ff5fb5ce31e7309121181effe3814d2a522250fdaf8bcaa1
 SHA512 
d4fffa688883298c41f0c0ceae9ebdc234ec615945165fd74f67d31ececb23a2c905c106aa63ff16ce28bab31b1e08660002b68df0e27e0b54682b2a4981bb92

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.133.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.133.ebuild
new file mode 100644
index 000000000000..1009a9df0132
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.133.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2025 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##*.} + 10 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.102-gentoo
+GENTOO_CONFIG_VER=g15
+
+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
+               arm | hppa | riscv | sparc)
+                       > .config || die
+               ;;
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               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