commit: 0afb7f27cd1cb7b1ef300bf9fc898ca8339e5470
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 12:42:16 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 25 14:38:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0afb7f27
sys-kernel/gentoo-kernel: Bump to 6.1.30
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.30.ebuild | 140 +++++++++++++++++++++
2 files changed, 142 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 5457bbee9c10..975a0bcc266f 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.1-33.base.tar.xz 1668040 BLAKE2B
60823b42a19d54af313039f75bbd4
DIST genpatches-6.1-33.extras.tar.xz 3812 BLAKE2B
4c0552c0cd447cff8e1725dbcabe9ae02be41f432805b6e5e9fd360c6a0d745b5bb5d0dd5c7b36a3e0468622dcf89d3d7fcf47f0b1b1735f76ca281764c928ed
SHA512
fc1efc3695e71daf5d3445758ba0af5a8714c22b9d3788f59bba0e4383dadc91ebb14e3114aa711b270c2734f3bd8355b6b7e98c9b81580b9da8c9ffe6207cae
DIST genpatches-6.1-34.base.tar.xz 1760348 BLAKE2B
9a7672bf2f106e0df50997d746171f80059627f84104b1919098fc75e2e01b0b262ea06905a768d8359fc3df9190b874413724529fa7107265ceab61d0f19af7
SHA512
678c5591831a779f852fcea89c807d256f937e3e01ba84b3b167274a1bd5c69ab20fd31b1f759d83986520223677c0e2e31bb3dfe624339b16fc45845ee8188a
DIST genpatches-6.1-34.extras.tar.xz 3808 BLAKE2B
9830d4850e5095ef0864df0aaa25a4549678fb76b22807abf61739b42b048455535aff7eaac16bad5d2cdb0cca65efd2e176a50f40a685250df0b75565fadc36
SHA512
13c8f7f596eeaa9b78be7aae7667a196e199fbb8d3cc045318dfdfe1ab340622fd0e958be09ed8608f9667231d6523685af1f03f4f2b52d78810885c0e9fe4a0
+DIST genpatches-6.1-35.base.tar.xz 1862704 BLAKE2B
b6fb58876bf303e807a429d63c8a932798a73f95275ca1137ca672477d8004404f931e09e681c92202fda9083a44dd53dd0b93d1e503f2bd6e177c44a9c10425
SHA512
df18933b2dc32af5a0760c8419d0f69d2c221c4d12aa8c64ec7d38be8407930b79d507f5312d9e9d369a51a192196dd36a8b919e78c81d068f7ea5989be8c8a1
+DIST genpatches-6.1-35.extras.tar.xz 3812 BLAKE2B
3784c4bc551ad594a75de1f174112f80c2e805f5ab2f1fc20642162e72ad785c03ac7e90be19497b6826810d706e36b4f40396e45ba95a6a40f7ba296a3d2930
SHA512
4666ba408cfedbf2d6858fde80699c7d533cf24724598c2b719bed365021eebbad7eb1872008b1bca2f8da77ab31b20d56ead15d9c7d0cd6135f117510a87c89
DIST genpatches-6.2-18.base.tar.xz 995956 BLAKE2B
402258df823b898522612e18c9d0c51c38cdedc9b4934961989de768c8feb7ce0287f3354a75a97a2a0bcad13e74bbfadff8233b22ae816149f9eec85c8c6553
SHA512
1162522ff7d5a4408b1a1eb5d220822cd5e3db11c9948dcbc011dce67d3022d7af643cff81b2900e91957bebe0f00589bb7db93617e800dc3837f3f537eb1969
DIST genpatches-6.2-18.extras.tar.xz 3808 BLAKE2B
4c80c3e537e6ea6ea2a9d720127bd5a661417ec94ddb373d6301334108c9765e985723475c85dd0acadce92811b7bd1a96f68cf657a4e943f8be49bddf641eb6
SHA512
8a63c7432326af46c1d9c5e3170f3cae77a35b3c7ccf4ece155418915ee21b511e7b32e7b377976773a5e188d43eb39dc8f435de269779b5192761f21414db37
DIST genpatches-6.2-19.base.tar.xz 1082064 BLAKE2B
a25100f54e9775fb220e2debd088c2d9e822e0c8e80da51f34f2372e2b2ee9a09f64fde4ab63e7b53ff1b6c5c0022d52aa7fb6d023a234ef520b3566bf4055c7
SHA512
bae1c063f9e624ebd935681ec7323b7c4fadecff63c2f4cd21d13731a70b549a4128c59a03e282c502bfd9b631ca6ec876cc782a90f633003dff97fc05c95eae
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.30.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.30.ebuild
new file mode 100644
index 000000000000..d77da3bdbc2e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.30.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##*.} + 5 ))
+# 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[@]}"
+}
