commit: 37f4901105e769ac4a061fb0adf61e7a44b0f6aa
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 14:56:08 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 18:13:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f49011
sys-kernel/gentoo-kernel: Bump to 6.1.26
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.26.ebuild | 140 +++++++++++++++++++++
2 files changed, 142 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 266df13f0006..e3fc6747ba1d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-6.1-28.base.tar.xz 1412456 BLAKE2B
126c74e7558efbfb104e97e993a70
DIST genpatches-6.1-28.extras.tar.xz 3808 BLAKE2B
3bd49fb256420883a267b2513cc9e6928a107b0142c82d9abd20114f733bfcbd474eeb19a7ef833da27ba625db28806ec25a1dd945f5d94f5bd5f729e445a57d
SHA512
06c84adf52e36357fd01e8e1989ba8b8cb08bef052da05d261df3e80aac6d2d10a3c39583fad6d92936e19d8c7484786a4d11f64f2dc3fb5f8e1ee90106d6367
DIST genpatches-6.1-29.base.tar.xz 1445804 BLAKE2B
fb801efa1f48c9ff3362db22c218faf203dbc4171ee77f4539022c8f86ccbee65bb93c36e9796411dc997531dcb0b6c3cd2420a1b19ab5219fe92bf15ea3926a
SHA512
c1797b202639b831fc601b6690fac85b91c1dd5dbb1520b243a5a2ed9bacc0b25f6614289b08cc5338ac8a66f8832a68a07b24ef327281c2e3c27e532a430d41
DIST genpatches-6.1-29.extras.tar.xz 3812 BLAKE2B
d77b52859028d028d6f33f7bdb26589ced57caf84c6ad5c0716f6fa978ff6a1c16518bc4ab06e76281ac486d7a5476878e408288b3ab4c55f8daa0a46a907c31
SHA512
3eee3d165bde6fc820307dc7483f228c7774237df8b5ddb0e5089b0f76fd3061a0223f2b1743f38f9facfb41a78deef0256ed4a9514431471265bb86ab64631d
+DIST genpatches-6.1-30.base.tar.xz 1467496 BLAKE2B
7e442668319addb39f4812669463c312c9cda5095c1086732da3ba39eb9836985e53afeba31f471d6cd2774d6028e421a254721bcae10ef89d6d38f3856debde
SHA512
90a3309cc2e6cad1a971c864839e6acdedb10986fbbfb89799d1327fd4c9a541f4a46aa4d5a898046d1e0a0a648547717e522ee31622ded87e48ec4057a49dc0
+DIST genpatches-6.1-30.extras.tar.xz 3812 BLAKE2B
8797213e32516d6f5cd88061574201951f5803f9e26e0662eae391704521c9530c47bcf2498a469b3e8f0696a1fa1a329fa097e983476ae4aaf38af465c1593e
SHA512
58f4e9d6791b3e9903703349f4cb5456fe2e4d871cdf6f7c3dcf0338982c55c82c1da80b65a768d8efd2d992386c176821f4858aedaefcfc4b293c55a7aa8a1a
DIST genpatches-6.2-12.base.tar.xz 611100 BLAKE2B
9e3e50edbd85e9909351304b292de87b74f8adee2a99a2d5c6f858ee195e8df08772f1b1167899b52964b3d7a2595628d0e0e6c7e6dcc79f53b88434123ca308
SHA512
9923a3d4fa2f2310954b9d803784192b0367c286880c15af34e63c660ee593373a51d23561be0d1bbec15d39f1b57b345497f5cae3c73535c1caa8e62b8f43c4
DIST genpatches-6.2-12.extras.tar.xz 3808 BLAKE2B
65df0f1a93ba2eda0ac31002f723d5b730c6af33dc60dd8a6f942a6a0276feafdd12463017164c5b782c031748829d812079290533268f8df497a8b10e1ae4a1
SHA512
f91ff719f6cde159026bdc4a76432bd195933d34dd3e7cb3ef0a2dcf18ad6786e2a4f8bab423b1b1d19ace3513c02e048a491f4ca76f37bd211d5579361bef6b
DIST genpatches-6.2-13.base.tar.xz 700552 BLAKE2B
53187881831a5ee8ac1581d78d89b56d5e6cbd45a1267f294312fbd648818530f029280b6face5c1c7f7c6d2c13c5e3fc6d1747f4abea8b2065f960a42a45d2e
SHA512
2ca287f97bb3c01291eb5faa1de40827d014547e2cbb5063e77597e027f58672a262bcc51f1f2111cb5621f75b59c61a3cfa40f30fe8bc923136f8de3dd3e1ca
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.26.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.26.ebuild
new file mode 100644
index 000000000000..dd5577ddd24b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.26.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 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##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+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 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+ hppa? ( savedconfig )
+ riscv? ( 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
+ ;;
+ 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
+ ;;
+ 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[@]}"
+}
