commit: b273e44875f2aecbf61c09c13a833cdc9ace702a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 1 14:45:29 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 17:35:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b273e448
sys-kernel/gentoo-kernel: Bump to 6.6.9
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.6.9.ebuild | 153 +++++++++++++++++++++
sys-kernel/gentoo-kernel/metadata.xml | 14 +-
3 files changed, 167 insertions(+), 2 deletions(-)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 6cd52cfc3182..189f903db654 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-6.1-78.base.tar.xz 4233428 BLAKE2B
489c688bdce6b557065c5a2c63b35
DIST genpatches-6.1-78.extras.tar.xz 3812 BLAKE2B
b06900c35aba0f1866d2c64a71785afe6a8b6ff0abe12a15f02475470e6f327c7ea35df1af5bcad92ad0cb9aeac030f0c4328beb69b1b74cf9420ac7a38555cc
SHA512
d3b76b5301b4d6901ef8ae3589f9a3c948a2c88cdd932e748991987f45e4ef8b19b9b7102db83210ec17b67b00ceb597c22722c7ba3f66ae7be76624a1564522
DIST genpatches-6.6-10.base.tar.xz 603340 BLAKE2B
cc3220f1df9406c393605942e1a6fdaaf8ab46da53bc2fe6d001c9608a55ae2e5073d94805eb233183142e81bcea9bab1ed4700e298fc32c16c033597219f9ad
SHA512
1f0149759b98fa099bda28aa1c4913719f0b5c0c715a72f6c0b13d3faf317a8935ce10508cd3459c50e39a7759feb44e7cf43fd49b87bd5ccd6d42a5dfc531d1
DIST genpatches-6.6-10.extras.tar.xz 3704 BLAKE2B
8b5e1453dd7bbbb7ee6dd02aef5e25e95f09a12a46d9dc014d71fe8fda96b94770f3cee75fa6f1db6bc9bdb67b39d272f8f887fc2986a17769237768bf6a382f
SHA512
6ca7a360dc217684b1a06f869223a52772f267d48088d5e286dd27056faf34e9c4b4d575aa771c5f9b972febd4c656e32f470c4499feecd47716b07cc13ab933
+DIST genpatches-6.6-11.base.tar.xz 649760 BLAKE2B
d435eda1a18196b24c451ae605c719cf5a45c255b2017f1b7ab3612df3f4101c003e615589841d02329e44c3411b4cb27b577e8ff05f09e9349d38e622b823d1
SHA512
b06c66f730e4a43d8730c5c98661b6061485696375d2bc623b818303b0f6f15d9ad9da318bf9d3153036c3d8a2215fe12c5fd8b789775027c5c21f2ef8d93c4a
+DIST genpatches-6.6-11.extras.tar.xz 3704 BLAKE2B
a5ec7394f611c491ae0867c4694fdd000a0a53d6353832ecfb702f6b86711d7c955f0e4a8d10ee2cde6f2255a6e180fa26e3b1088f04902affa51d29f590fe82
SHA512
2ea475f922c98a83950441e86bd6805fc958f44c77866431b28da13d522d11841fc778945b253e292c8cd09ee378bd7e0169540ef12a9206d6341ec69ff463c6
DIST genpatches-6.6-7.base.tar.xz 472596 BLAKE2B
c5f69fa43401555567c9e5c3b5bad31ef55a3f49756f86e1e5cb935cf8cffb6ee080f411b5113dc3fb9d43224de432e6f1f6fb5a18082d269e30181e72aa1fcd
SHA512
6098a5d32ff83fe2ceb094055be6336a19c40246946606fd0b39e86ce8bf53b96cd5539e6cbc774dc865f4be742ac3c127f8f48ff5cd3a50484dcd5afb7b9df3
DIST genpatches-6.6-7.extras.tar.xz 3704 BLAKE2B
1bd0d01aefad3c47f2b7bdc550e607d2c4ba8e0cbbdbe3ba4ef57e539f9bd894222ca6f01908e6bb27221de1331634a6941867c7d6bece9620510110bf276107
SHA512
6da82d251ac6c33b8d2837e1a44a32ab5106f0a5816a8e76354c7d9eef510b4f485edfb1b80dad68e59b3a96494bed590ba1508f7b96697c364fd52c97b65496
DIST genpatches-6.6-8.base.tar.xz 472816 BLAKE2B
503418967edebb8cb2020edab16f060334fc16c9f6ce7980b8e25e3db1fc4869571fd466abc8ec4add3a095d089f0c77532b2524fae1136c5f7ed487e90ccd3c
SHA512
04a247aadefd43a9ec1382b5f77f18dabb1701469cbeabcaa1604405cea9112bec56bc9a08d33f9ce5ebb90b8d77a7c7a21774a10906f3c8a685c0d3c10bbe9d
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.9.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.9.ebuild
new file mode 100644
index 000000000000..2af28f01a0e7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.9.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##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.6.4-gentoo
+GENTOO_CONFIG_VER=g11
+
+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[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/metadata.xml
b/sys-kernel/gentoo-kernel/metadata.xml
index 27f41ed2adb6..5eaf5d2b77d8 100644
--- a/sys-kernel/gentoo-kernel/metadata.xml
+++ b/sys-kernel/gentoo-kernel/metadata.xml
@@ -6,7 +6,17 @@
<name>Distribution Kernel Project</name>
</maintainer>
<use>
- <flag name="hardened">Use selection of hardening options
recommended by Kernel Self Protection Project</flag>
- <flag name="initramfs">Build initramfs along with the
kernel.</flag>
+ <flag name="generic-uki">
+ Build and install a generic initramfs and Unified
Kernel Image,
+ this is intended for building binpkgs with a
pre-generated UKI
+ included (EXPERIMENTAL).
+ </flag>
+ <flag name="hardened">
+ Use selection of hardening options recommended by
Kernel Self
+ Protection Project
+ </flag>
+ <flag name="initramfs">
+ Build initramfs along with the kernel.
+ </flag>
</use>
</pkgmetadata>
