commit: ec0b10495e02843537580efd5ece0101c4177362
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 14:13:31 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 17:56:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0b1049
sys-kernel/gentoo-kernel: Bump to 6.1.122
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.122.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 8aceb25edaa2..cfa1e6cae6c8 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.1-130.base.tar.xz 6678892 BLAKE2B
53955f1a643453a96c1fa660197e
DIST genpatches-6.1-130.extras.tar.xz 4056 BLAKE2B
bd90d7ec57c276a6704c3674922c77744b218a8a86f5d862e092c52d23f6205e3801c294ab3e2a2d97050ca8b6d46d604bcb966ce78c3c08ade6a31a3b33f293
SHA512
6ed1b354bfc2b017ec3e9075a0eb686c6ce76ea7d73706c66b696fa8af46fa58fc35b20fadb68ca9249b64614b59aef58443349b001eb1ba5bbdae26fde27b99
DIST genpatches-6.1-131.base.tar.xz 6701808 BLAKE2B
0ff847805abdeefee31ce75d0b5c02eafdf7b12f3b3c499c0d9d19305b3ae934194bdf58fabb30e51a356eae5e57c7d633b7abbf45a94096e981c671181c9b16
SHA512
7604d45f78bd5a087f0a158acf3767b275315b60c77cb4d6b93139943d56ca917a75ed8ed784a608a52d3e1d06cb36a01f5c3d0f5b211dda6d62d36fbe9ffaf9
DIST genpatches-6.1-131.extras.tar.xz 4056 BLAKE2B
add38a1ea9191009b22ce04a556062e419452bedc85d6afd40d6aa3da2474f4719aacf91bc3680b6a08a7b73cd0dbcc5c3249322f8c47660ef36c256e8792bae
SHA512
7d68ef7b616ab8bd62db15ead625f0e449b6ebdde8477676d0aa6ef017f9270727413af62985ed8b271aae1f5288682f4fd0d0804f06577e2c1f4014b5402035
+DIST genpatches-6.1-132.base.tar.xz 6718336 BLAKE2B
3a1d86ff100ded252a1af8cb1cbe50ea55e0789041f0e740c30c6a70c3192d8c90f873c46f9989b4b76071d1364f29b2eb8230e2675d22f2e14b6cb94e3e16b6
SHA512
bd225633a720a3d271969818c01b59792b5783c16743cc020e3cf444a37116ba57b0d82280853b432a3e3043a29f717ad2878dfcce4516a8127c535367ce6c49
+DIST genpatches-6.1-132.extras.tar.xz 4056 BLAKE2B
3f3d5e78761b9322a765bb8bdc137395e8382ffe7bd401f4b474530afd5f9ba570744058772978ac39c897f04eceb524ed53d32c8ed71fddd1a0191f31284c0f
SHA512
ac96811e465540e96cfa443bf088bd9795c58080b19b87dcbf62c0a4c94dbbf28ee6d94262ca76bc38b9c591e4d07872294b14807e1d18ce804b69497cb0ee66
DIST genpatches-6.11-12.base.tar.xz 809756 BLAKE2B
16a87065f9bef4016c3a19cc4e4ebce8b1dca6b6a165a36f73b5e10737a6df325f2649c609e7cf6489f683c36e52626d21300acad383df486cb866a413416ff7
SHA512
fa57d9fdaedcc5ad31d685fe512cca89f1a8a8fb097001ee069efbcdb9c377000f154c3133757e19cb7d3fe79ae54d996d1720e9eb70ba117f98c935509b3617
DIST genpatches-6.11-12.experimental.tar.xz 77936 BLAKE2B
9c33314c9959fa95b64566a83d69566e45e687fe77656020baca417448821d9d248480a63285fb9caeb07c77bb08dcbbb1f48c1f2bea750b0b33cc955a279e6b
SHA512
e414055a9ae8945e6659bcfb4bc56d86eb4afef3ae9300eef85df1f88c9c9276fb4f1ef1b1334de426e95089c05e2d4c6a67653270796346ae97b1752af26062
DIST genpatches-6.11-12.extras.tar.xz 4060 BLAKE2B
69daca4ed6c2f293f04ece77003f2040b7fbe3a28b80eaa3e7aad8ac65adaec303b433634106b5041d597c33163624a447bddbbf889121c9b917d987febe0bb4
SHA512
33db2d06b7bae72153d24d7dbb21a7459f2010ac9176ca4c3356b01c933f3d61379fe2c307981c66433d3a997d059cb3bb2956d8fea8ffffe7eb0c33bd4b0a5b
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.122.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.122.ebuild
new file mode 100644
index 000000000000..53a3f59c340b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.122.ebuild
@@ -0,0 +1,137 @@
+# 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.102-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
+
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
+ arm | hppa | 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
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
