commit: ffd74ff6113d2a1685dad19f15d6e4c282b19128
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 12:08:34 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 16:21:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd74ff6
sys-kernel/gentoo-kernel: Bump to 6.1.7
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.7.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index b724bc04e31c..e05edcde80dd 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.4-234.base.tar.xz 5429360 BLAKE2B
48e1199775c5174a4e25f9611f41
DIST genpatches-5.4-234.extras.tar.xz 1812 BLAKE2B
7f95873ce78883b4bb1e4d7769688565c5b5574e86417a8f11d822fe5d971f7e0948a08e83af6a35c0cd8d52cdd5fbfb5fa3abf03c233fa3711b3fdf19fa3dda
SHA512
2e49f3f75089ed6ff55c007529218b5b68712e64785cb06dcd5b0f1276a3fe3b6a2ebe2f807b586f954698bfd2c73554a462ee592e89b234e6d25c614ecfcf49
DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B
29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149
SHA512
d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B
af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818
SHA512
22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
+DIST genpatches-6.1-9.base.tar.xz 544936 BLAKE2B
9152c33c4145f99daff4f436afcb621883d21fb05be5821a045b47be2880250d3ccf1210f3ecec0241ac41f57581da737053b86852760cd11efc524719fd0f6b
SHA512
88b6bd131dfe53a51a9a0dab13ef2bfaa4818d4b0ab93e485346f96fe58a64b7338d9aa4483c751d9d1886818ee8700918721037b03f868a3b2cd9d5ecdd7799
+DIST genpatches-6.1-9.extras.tar.xz 3804 BLAKE2B
e11fdd580ac842fdb0c947ac39afbbf09ba041adf25cbb8dd2ca5f648ea963bbb42b07f062fe8615daca8c3252423c99f69efbb80a6d22e58b963636f620b58c
SHA512
8e21b5a9f17b41ebf8a107482f1a720d5e5c625046345ad71a4ca9d1f43e59e0fb8e7df1fbdc4777eec118d670d73d8ed3a3ea2e180f46c44bd828f46eaa8a1a
DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B
44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588
SHA512
3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
DIST gentoo-kernel-config-g5.tar.gz 4503 BLAKE2B
165733068786f274ac3bec94e0e29a10992f5a1b188970b2f7195348bb98ddcbd5d4dd45131b00d41c6bfd0bdfdaff1069debdbac560f92b9d62d30812d830df
SHA512
565f6a35b534ee2e34e05769c95ac532aa6cb8e27073aaa8292fa3d19af8329f812e8a2d2c5c2696ac0fc28858e4461cde1644d0499f2563de43903b7043f386
DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
SHA512
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.7.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.7.ebuild
new file mode 100644
index 000000000000..3072f5949bd6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.7.ebuild
@@ -0,0 +1,137 @@
+# 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##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.2-gentoo
+GENTOO_CONFIG_VER=g5
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="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[@]}"
+}
