commit: bbaecaa691417c09ff37f72461c6e7fa784c2f68
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 18:24:55 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 03:12:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbaecaa6
sys-kernel/gentoo-kernel: Bump to 6.1.111
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.111.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 719949efbad1..810af715fd9a 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.1-119.base.tar.xz 6000764 BLAKE2B
1867fee7c4a1e50bc7b59ada634a
DIST genpatches-6.1-119.extras.tar.xz 4056 BLAKE2B
52ecde24bf197791cfe5be801d881d26904b4503bd3e7857b6a6a2ea1e08fd0262a7e01de498854a931c5407f90d1b5dc73fabb3eb22dd370445f7ca057de0a1
SHA512
088e01360229386b880b2be615c0661c2c247a636a4d4810675fdf576bdeac3bb1d487dac6ec72ad88f4353e418289410f504b432fa8dea61b299e2f596370c8
DIST genpatches-6.1-120.base.tar.xz 6050748 BLAKE2B
8e81d186a9e5618d9f561fd0d49974031baa44ddb9b1885bb3ef6298d49b591e1c1582c306eddba07f3da733dea7ed82ae948838989010ee6471c052f99541c6
SHA512
7ec81a4b97becc07a15fc9e888f2e9c340334fb7ee2b9d0083123f67fdef44f7e155bdf7dd662158ea86d7eed3753017401479a5e50cc16eedde145dc77018c9
DIST genpatches-6.1-120.extras.tar.xz 4056 BLAKE2B
2295b59dea7ee450c0d6b109da2fc341e96030616635800a02847f93c4cd0191229c6d74bd68994ac42d2a96691856315127a060cd3873af34357f12ab54193c
SHA512
8e1b92d4ab4cb327868f4e06c7bef5a099339c3cf2331ceff3aa3731632d1f8f7b427da5f892540a64f8afd86d89048100b93c8a08d40a99f5760a35553dca25
+DIST genpatches-6.1-121.base.tar.xz 6065048 BLAKE2B
ef60651e53c53c2e918da2c9dd4759cde88472e2f6aecf4ed6a86f089a282bbdf7acab040c7660e52ea09e441f6008f17ae3d49afcd339e8b91d50cba48bda18
SHA512
e34af3822f10164dc0729d0803c6f3ea05e57c6ac157567bdec6d8d0a3e78fc72252606f3b3160089e7b4b8167ee76b13088cf1d238cc3db2841e2dde63b82aa
+DIST genpatches-6.1-121.extras.tar.xz 4056 BLAKE2B
23ddf1bf6ee9d2790e952777edaa577916af9897a957c4e2f4714421ad7aae213b82e1c7d7b911a65f3ee6b27cefee4b5839d14ef1b0e539fe86d91722d0295c
SHA512
95d167e2d5f8e883136923b332e662e8475043e0b2324b06a3e718a2bfb7e8f7b87c1cf0961ee06b0cff7fcae1e1dbf7446812fab7237416c281033f6777cc49
DIST genpatches-6.10-10.base.tar.xz 490332 BLAKE2B
6311b976880a1fe3cb902ba6e4d39890aa34565c6df19fc01deb7b337304418d1ada38d6d83f27acdeb3062fda65d7996a0e6988799a6789e81372a0966f3caa
SHA512
3748322f9bae147f3ca68693dcabf21a4a969032cfb36aced11bb883907cb663d139175ed4dd7c8e87ea7628f875328e3b25d978009ee3a6989eb38b1c7c4ace
DIST genpatches-6.10-10.experimental.tar.xz 81200 BLAKE2B
bba2fc9daffcd1a6ce397682a4ca825486f7e45b6932f1f8bf9591eb16385caeefd70bb7dee406d80b248209f707f3c63a5b69d03225e6c84c48a19c39480cab
SHA512
5d89064860cbc2bab7ee406a24e5e0479ad2502ebee3bb2c2f9ca81c443b8b2fbcc5944eeff262de5acae5c2a8276872f7d813013887f796a67236a905e38208
DIST genpatches-6.10-10.extras.tar.xz 4056 BLAKE2B
edb14475e8c07f04d54e6953f8518ea631660ffcdaa8797eba19768b3a193df51822d508dd7b360ced634d0045878f77996ba765498bca3bf001d9a4c223fd8a
SHA512
a0379c1ecdbb7a8d6f3b3f82db60d5fd7503598ac26c2f11f6f549e360a648053896cb8db235257bfa7bcad251c90c6dc38116e238c0e2447117eab83a42b4d4
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.111.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.111.ebuild
new file mode 100644
index 000000000000..21c9b05e1334
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.111.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=g13
+
+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[@]}"
+}
