commit: 17d46cf7a77828a1241bf889b694f810f972bba9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 11 01:03:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 07:48:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17d46cf7
sys-kernel/gentoo-kernel: Bump to 6.1.57
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.57.ebuild | 146 +++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 730cf34444be..7801fe5e151f 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-6.1-62.base.tar.xz 3593184 BLAKE2B
b9ede84287025cfb00e4772aecef4
DIST genpatches-6.1-62.extras.tar.xz 3812 BLAKE2B
2f642be1d81a2e94221c9c713b8df8994953dcbac4d612bdad2f8e7d64111e8dfa4d988c105eea7d926e7fe08ec7232499e9bd8b8e2a9fccebf78d62bde91c43
SHA512
e06d58f69e3055ff38af09061daf6d0571590136fd154dd2ef2dfaca93d151391315abb5d45e252db4acadffbc7a87124c4ee50b6fffd278ce63fac819c38d12
DIST genpatches-6.1-63.base.tar.xz 3660676 BLAKE2B
6af8b23486d6458d06aadd6e3d72d36a768e17bfb1917c23744954746931af6747682f3ab3e8cc12040087d760b63067d7f1fb73355dd7cb1287f42e60019e06
SHA512
9552fbef812ed0cfd950d1606ecf62414886bc0f79b572ec27a58e1f9f80a4c872fa6d28aec6301fd0474d9168156092318aa84faa108668b0f6df1965d01a2c
DIST genpatches-6.1-63.extras.tar.xz 3816 BLAKE2B
6a9badb695f9306720e1bcc2836f90c82b27ac9205b455e76d9a0d6898f3539eaa05b96824aafb650c7efa1d1f9698190fccc5d115581c2a29617ef5b4259433
SHA512
e5fc923760637bf27dcadd2e59a6822e39f7c2d81d89019ebdba8853081ae875a60f657f8d483cd71dc8dacec51151a7dd3c9a5c4a7822fe32b658bcbe668c56
+DIST genpatches-6.1-64.base.tar.xz 3729008 BLAKE2B
10f4366a8fe83ca0609c0e2654e6c64ad47f3a3f1744ca637d8801ec9c8a8c541d74e21e020de0a6de18c98de640810d6934092b2b983b332e92514c2b6443a7
SHA512
1dda1ba93fea4c18ecaae6ec5a3cfea1fbe7f89fa9412e793b7cd0beff43894650167c77d1b85eb280f7754c85179dc3c72e32ca18f4d8a95667501c61958656
+DIST genpatches-6.1-64.extras.tar.xz 3816 BLAKE2B
315826af9d3e7abbef0314f962e2df50f9d183555ec5fb956fa7c9820435042e3c3a72a5ad766a3441543c54986ffbfdae8ff0a4deecb2a72851237108eaee71
SHA512
5a384aa4f6aff1a3410090873f9321ca1c6bcdb48dfefeaf7c2746b950ad22c7a745c60389ec49b99a249cb62c91d517389d5d91c844509dce5cd45a67b47edb
DIST genpatches-6.5-7.base.tar.xz 428224 BLAKE2B
9038c1beda5e3778508a29ccb0f906520f93a505f9a45f7050c47814eaf2e474d46e3cb8760dcf5a3bfbc504c5c133f8dcd8b55261a3d0c824cb374a42d98801
SHA512
89942e28ec1c594401a4ecfd6ba240e334356be0f1f35e48dd9abb1f4ffd122a044a76079f214c534a6acada0db4b735a8fa8face05feeeba82e2b51231c0472
DIST genpatches-6.5-7.extras.tar.xz 3696 BLAKE2B
0cba288c1d1c753e5a317e87432dbdc2e711635cd074b1daac3b40af683da939981eaa40b8d4291ad59d4abb92aba5fc97be134524e02b1c2c29653382d7f402
SHA512
ea3bcaffbf58f981388c2021baeea809a35a1b270cff6a0613dce2da8ff8431886612d22073c7a8d6462d20eb1f27d0c0518164c14e4af96b9393bb6a1a038e4
DIST genpatches-6.5-8.base.tar.xz 521272 BLAKE2B
31bdac516a0a3f82cbe2c95d9fb0162d7a2b9f3865487528e7b92cb2316f559be9754d4c4c697f29500425c13fd0bb743c69b89530b4d471249f1b322315dbcb
SHA512
debb1b1e499b94e4139143df5b3f22663fb6a216850e3262f5aeb0ade760f1a026d00e33f874c920369e3da968a192574351f6d93fcba3eb6b76ec45f5382b90
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.57.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.57.ebuild
new file mode 100644
index 000000000000..803053479832
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.57.ebuild
@@ -0,0 +1,146 @@
+# 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##*.} + 7 ))
+# 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=g9
+
+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
+ 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
+ ;;
+ 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
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
