commit: 909227bb8d90d92c0edc13392446e7d0e72f05e0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 8 18:02:50 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 21:45:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909227bb
sys-kernel/gentoo-kernel: Bump to 6.6.60
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 3 +
.../gentoo-kernel/gentoo-kernel-6.6.60.ebuild | 144 +++++++++++++++++++++
2 files changed, 147 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 6c5e658d868d..fe2f5a44ed3c 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -26,6 +26,9 @@ DIST genpatches-6.6-65.extras.tar.xz 4060 BLAKE2B
53cdbf5d680c9943d189e7606caa10
DIST genpatches-6.6-67.base.tar.xz 3647888 BLAKE2B
bbbefd68b7d6ade81dd81f600717a529f023d7e74ddc4762698554ab6c3bca29787082aeb1945136abd32e628c6bd9b3e4a164388beb524f51af4497217af34e
SHA512
8d2a1481d1b23044792e523b4a6845fbcf29888e6f98a6a3b0b5b3fe909a9ea40272087071dfe98da3e1a954c6d8c0539d087c1616929aa76d504ad88baf9878
DIST genpatches-6.6-67.experimental.tar.xz 5764 BLAKE2B
9a196744d28e22fe8e472832e0d137a7a42f60dcc1ad87285241c101f1e60cb88a8b009de14b914c9f369f15925ea74fb79a7304644f8071f04d3f1969b8fe21
SHA512
36dfe7f5be77f4b6f1a79b67c5346dd414d7ffdfd60cd44ac3850e83878ffd1863089242e64337237281d90dc7ff4a47f023aa7b2f6567de87658eafa349eb85
DIST genpatches-6.6-67.extras.tar.xz 4056 BLAKE2B
b8240a27f81aadce548d5c94cef31531ac5e5c42cfcae790cc54c9bb6c8ea7c7175dcd9eb81f0844d31efcf3728f68b5bbdb630de5ea025b25fc2a37c64d73fe
SHA512
5458a8cfa22fba5ef27fd1b46c1a31f16e1a9e0b36897694c3a46c2273101bd7be56dde90b3c4cc2f75eb02383f518bf5974b9c446a4ffd3fecf707e935748e8
+DIST genpatches-6.6-68.base.tar.xz 3686816 BLAKE2B
56331bbfcfab2851304dc8263025d66e7efeab1bbc4f4a4a3969e08cf239a90f4e9fcbd381ea55db94682e8e45e6f2e73748f50eac44ad65dcf50e3b1feae75f
SHA512
29b269918f54b72c4ac54a3a80d9e2cde64fc281ee6ad236be3d44e7da8ec58d9a1aa9c1d94c02cc88d28456cd9e4128bf15a381b95402f32226af9669876cb7
+DIST genpatches-6.6-68.experimental.tar.xz 5760 BLAKE2B
c73f35de8a9dac3f70726649b34ae381ea8843d96f2d81c4f84df08b6deb4e0b2536646d5f744a76c25a953ae5baf13783ff094dd0358baf59a4127fa349dd38
SHA512
5c201032ed575909cb58e567293c13210bdd9534557c4b93f1141369538127ae9c559a0243fcfba466d24ba009ce576640014a9ba5e759ac7e241bd2527968cb
+DIST genpatches-6.6-68.extras.tar.xz 4056 BLAKE2B
61235851cf180cc5a8e17720907cfcad6bf993ce2387e3ec4012ddd8a23e24d28b02ab2dddaf1a95125c92b31294655f294a7f3b1b5fb6b8597b02959f047126
SHA512
4065216d3251c0af7bd7471667e8cd17a62d9f9f7a1f06a208cb7ccbf65160ee0d6a98088f872555ba9ecb8403355eed80a0ae6b20aa4326b1f43e876edd85ba
DIST gentoo-kernel-config-g14.tar.gz 5686 BLAKE2B
e5147ff4ffab92428b3e7f1b0897b997f8a298805f4f43b0a4d3047607bbb1a5ebfc268e0bb9688372a5eda561df9f256c78e00cdd7e3caf7868724214722f56
SHA512
f79638f9ff9dd0154512baf0234024216b6708d35a3c03a580ca5913286ad1ea13bdde5ea9b4722c6a7cd8d591c11ec52c1e225111a260343cd56aa1f1a88502
DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
SHA512
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
DIST kernel-aarch64-fedora.config.6.1.102-gentoo 252811 BLAKE2B
f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc
SHA512
41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.60.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.60.ebuild
new file mode 100644
index 000000000000..b94f0d5ca83d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.60.ebuild
@@ -0,0 +1,144 @@
+# 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##*.} + 8 ))
+# 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=g14
+
+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
+ experimental? (
+
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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 experimental 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 | loong | 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
+
+ use secureboot && merge_configs+=(
"${dist_conf_path}/secureboot.config" )
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
