commit: b9959f6aa940928e15048d064dd98d0deac1f108
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 12:58:53 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 15:09:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9959f6a
sys-kernel/gentoo-kernel: Bump to 6.9.7
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.9.7.ebuild | 153 +++++++++++++++++++++
2 files changed, 155 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index a1e8323530f7..55bb01201d46 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-6.9-6.base.tar.xz 319896 BLAKE2B
8b58a70db0844a8455fb413de046cf0
DIST genpatches-6.9-6.extras.tar.xz 4052 BLAKE2B
cf761f7035971e6f2be6ac719048fba08f203b2f400bd7fbb62e4e10bb7d5c508dc7e79f85812ccd1ee1cbc791c4f19a6becab2dbdfd4ad2c3ec2b1ce0f2bb47
SHA512
fbdd60a92f8dbafb30dfdd65b3e0c03cf274dbb148c092f40dfc2bdd4e5d7d18f68c9064bf0419e7dff5c94c67fba3922bb474ec717dda8094b37ab489cfc8bc
DIST genpatches-6.9-7.base.tar.xz 406988 BLAKE2B
066ce941f4338903a9f54071b34215dd16401d7e00e471615ea4b55cc5da7c8b312bb4c5224398c5348a76fdd4f1c6c5fe97213b913cc397ca92ecd1c33a8d86
SHA512
0175ff3df86d76b926efae0b15aa4addf2192d8b38f80a23e930c669a6a2453847d358383f2d61ccbc0c0b2e6e155a62bccbb4408b96c1ad3fb56eeaffbb1365
DIST genpatches-6.9-7.extras.tar.xz 4048 BLAKE2B
06ddd8d1443bbc4833040250b872d1949489fe14b0b4567c6c484d6bd6972a465ce0563c37a5272de1cd4ae66bd7711b1bf413b0a04b52bc00b9e549154b97fa
SHA512
b74f2aa4050b06d7e5b588c87638470f92c45d26b3ffe7a16db43b487fc6460ec4e7037b81120a87608e773a63cbed678d4368b7d0399b841711fb63b1744f99
+DIST genpatches-6.9-8.base.tar.xz 488932 BLAKE2B
f8ec56d444df32d1e5fd922dfb4ad64429f2af2b5660a017b02d862452751282982ec354bc70b06072943b1dc3786adfb78bbfe70e5e366f98f3565c065d81ec
SHA512
f0df3b5407c48415f76e3738a07f22fdd0fc168302cddd46d63c4057013e585c19c94ee7d9d418ae9eab2dc5597f58bdf4e78ec6f05e80217acfa7a119c9f5ce
+DIST genpatches-6.9-8.extras.tar.xz 4052 BLAKE2B
6ef3193ca251ed0d707df368a55f98b2bf6e7b165cc03da9dcc122a96462eeccbd70c7e349402387dfe5cdf41e6ab9caeacc18d6c40d13e1a274828e910fa17a
SHA512
f4a023f4d754de5bbce85affd0ca4636a89e129d298a0d81bc256632c9cb9886119ad6c1bd0c3703a2fb38b316ab52c11c7585d0d8a8991eb54e662c38d217f5
DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B
831f89078e539c8b4ce244528dfd847c12a45b52d540eb10d85ec0d9deb1c14288d8de12456865c92d16e3523ec3595676787a8f3b79545d76870b0fb68deb5d
SHA512
2a7230cce57a67e3333f9a88a311afe4a928e27ce76036747451cb77d3186569ad11d7a5b827748ad53290a17ad63637a8362ca896516f85ff0944a8d68265a6
DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
SHA512
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B
94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1
SHA512
fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.9.7.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.9.7.ebuild
new file mode 100644
index 000000000000..694d7c73a94e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.9.7.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##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.9.3-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[@]}"
+}
