commit: 7e3006fdfb7f5c88956f9ad9b3ace426770ac183
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 11:47:22 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 13:32:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e3006fd
sys-kernel/gentoo-kernel: Bump to 6.1.99
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.99.ebuild | 146 +++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index becb1a68c2c3..68fcba7c3623 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-107.base.tar.xz 5516960 BLAKE2B
a4c1128db49bc5dec2aad2999279
DIST genpatches-6.1-107.extras.tar.xz 4052 BLAKE2B
e37572e0575345470b87d07d8e3a0a7e8f7284d9ebb987152232f5a09c54508da833d60982cddce2fe5997e2791866b61a07555f631ea75c130d094bb5ed4925
SHA512
b0f2f6758677b163da436205f7493932aa925854446dfe1f687f829b0ef2d53b371992bf2001b217a0b4ec6c236a99833c98f168b877df45aae6819e39d0598e
DIST genpatches-6.1-108.base.tar.xz 5541376 BLAKE2B
59ef9110b100cf6064c6c6e556bec827138f44dd636d55a976a1ec4af4699f95258962ce272867a1bf172b6a2e1d4f7b25025d5b6c48c9c6c7a6d8f13834b297
SHA512
f250359fd14e11ee176fedaf8bff84a553a7cc559e56c29fa2b6e04217d4e1a63b072e1c73a021a527e37101704b99136e06e008553220d7a35eee3848aadb90
DIST genpatches-6.1-108.extras.tar.xz 4052 BLAKE2B
b6ad898a5a66a1a6ef293bc4a4a886ea29f0a1f985b3b85beec7c4e935e90ac9f642e7811261e413cc39b5a0ae36fd257d0afeb4a9c52aa29956070b4b52c50e
SHA512
6fbabfbcd35db0dd77da03c138a6a225f7255cc3566007368ee759ce154f23f11edb8434be82992f153deab19c6b5549d00a7cfd54c4d0e49eaf2e4d39b86597
+DIST genpatches-6.1-109.base.tar.xz 5540948 BLAKE2B
b6fdb5f6641ca8617c976f69bb731147ae1d1d24f1da6686ac8cc2a1a9775c2a3c890c24609042617b9397a9abdf9abd6806fa5933e215de1dad6d0f67277a5e
SHA512
e2f0837a9b5588df44a1936dc5dce2c1aeddf1d56795600513aa22a08195da4c358935e7d347ec09d4d25aa5db6c5a036e7a718bfc442796c4994736c6dc4daa
+DIST genpatches-6.1-109.extras.tar.xz 4052 BLAKE2B
562d5137c87031ff9f43b4d081b26b35cf4bd3c5fe074ee826edc8ece2ed074eeecf55c8914ca728267a9f78d907a51354c3688186d442d9fc02340224a0c71e
SHA512
0370a5cfd83a1c87828396e49f003b29fc68dea1568f6de417fe488aaf045e349f0b84695f3643ad9811b4f57ef31237ffb9a97c72294139aba94557e1f67a18
DIST genpatches-6.6-42.base.tar.xz 2474752 BLAKE2B
074b24c3848ba0b2521d364d67222ab324cfacc3036b2c3b9ceebebf03afcf21d963921841f6f987422e904be35653f9dafc2a795ed6eaa050d6a37595bdd111
SHA512
6ce7c93c92a5f2951c9a60b7a058560dec8c3f9c16f00ac4b58c23f88ceaf9cbc519653320bc95f45039219eecb068247f3c27ac448c8695ed8c9e93022fdc37
DIST genpatches-6.6-42.extras.tar.xz 4048 BLAKE2B
0d86f11ef43c33b1014423a4417be73e4ace2eb5d9c38c7a63e8bc424eff7399137239138de1b89a70247f1b174766c9672cb05743aeaa14ea66d8bab67593bc
SHA512
5d264209a734c4cbc48dab228b7d8570b735748b1c01f80beb2803dca3027ed78303ff937aecb1d8e3e6f2e2d4722aa0c1b5c77a4d45f2a9c53cfe1c0ac0affd
DIST genpatches-6.6-44.base.tar.xz 2571884 BLAKE2B
117eb333385bbff1ec4056dc9fd7374260a33f243fe20462b914eee658a57b90e9115e9edbf5c8935890ddcfb233eaf88b3e0062245cb838953749c8bc674376
SHA512
e8bad736c8566bbdc081600305a4014301e4f6f74b73ee68efd818fb92e2d49bdbf0b7a2b66c5cd5aa8e56e7d183aa03c2a02e7328ba7e0c71fa1646e6868cc3
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.99.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.99.ebuild
new file mode 100644
index 000000000000..40d129f75827
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.99.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##*.} + 10 ))
+# 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[@]}"
+}
