commit: 0eb156fec0701669dc3aace4b4ea44313cff2641
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 13:05:12 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 15:10:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb156fe
sys-kernel/gentoo-kernel: Bump to 6.6.36
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.6.36.ebuild | 153 +++++++++++++++++++++
2 files changed, 155 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 55bb01201d46..248457dc6de8 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-6.6-41.base.tar.xz 2399184 BLAKE2B
5765835d442a0afe00be3070b1780
DIST genpatches-6.6-41.extras.tar.xz 4052 BLAKE2B
a3ed97dd21f02f8b5a8b2e315b9581780310177da774123c7cfdb30c13485e1ec8379b57e10749e3abbd1860f7e52a5111ac5f63250d015e9aec5e64386d4571
SHA512
39932e2c61d1687ceb64698186551ac5e8c184f58e24692f6b22cde65644da5375c58f26dd7cb0e1bf5f21a737b6fcc6ffbd86372e5c055c8dd2ae001efcaf6c
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-43.base.tar.xz 2527856 BLAKE2B
961c8ebaaea9c45748d990b3df6f3a343b02a186797a7fa97fd332e25b6f9cf0a294420b223b8d502dd2e266e20942e304db65e562d9086b948cca0e51920521
SHA512
f8104db60c2ff32ce04e86f995b1c4a87eb7aa5510299c7d347eeaf23f4d64c55da0590743d45e952cb894ce4f91bd2da595badbdaa71fc546685d3a7ea9026e
+DIST genpatches-6.6-43.extras.tar.xz 4052 BLAKE2B
c12fe48720ff166e507be3a4cc19ee00c541ea92fd3939b6cc80bb476d63a896efb3667ca4a7aab837d60c6c3bcf2c0137dae44a60612a8d342f8b90807f671c
SHA512
9de420e251c76787bf9edb1023c80453e1df103ffc8075b870bdd1456f1e0c07f8bdfaac5d0d19cf698c7d1d048a48a0ea2326791260585bf24082c713727edf
DIST genpatches-6.9-5.base.tar.xz 275240 BLAKE2B
cb961b8245eaa58405bf758f4432f1ad98b767d7f9ea8e45fb440bd2616e67c6e12cff6ec3af89748f19043c9b0b58b634e28e7bcdc469fcc4daf2f752b3a438
SHA512
60fb3290eabe8289fc4acb4f1df809ace44d7678188683b64ef2ec92edb8c2ac0d757280ebb63087145fd068e64619a3b0a9227fd5f3061099d287e8e8dd5720
DIST genpatches-6.9-5.extras.tar.xz 4052 BLAKE2B
e72e5a5195db42f38ed671899217d7609eb8a5d9f954ebbc36a53a88fcadd1cadecf7257b33a880661e949f2c7b176a5762ecc1e56be0195e6768d8be8ae5fc4
SHA512
3d9315afb5c45cf24f6e5287048d49f6969e49ba2c8f339d9f4da0f5a08708ffa65636c3d24efdcfd246f6d28c72535089078971e97f7aefeb75119a67cee11d
DIST genpatches-6.9-6.base.tar.xz 319896 BLAKE2B
8b58a70db0844a8455fb413de046cf0998c19c2ace54918a3408f9d31eae6bf276d6a86f5db835cc3ac87335d908c2ba853fd2f334e80cd06e7e72847483d3de
SHA512
fa3f1efa0886a6df0ce8006a4433a8bf91731069aed6040e1e4ac9002dbb879ed644f2ba1b258a92ae8550709b85a3c1d2657df000cc6dfe4f79d32c991efcb6
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.36.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.36.ebuild
new file mode 100644
index 000000000000..4f603a059b70
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.36.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.6.12-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}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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
+ ;;
+ loong)
+ 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
+
+ use secureboot && merge_configs+=(
"${dist_conf_path}/secureboot.config" )
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
