commit: 66124e4fa716783fded7d01e62ed5f62222bd66a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 14 12:37:53 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 15:05:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66124e4f
sys-kernel/gentoo-kernel: Bump to 6.1.34
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.34.ebuild | 140 +++++++++++++++++++++
2 files changed, 142 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 9bb177976222..14456f7b60c6 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-6.1-37.base.tar.xz 1905836 BLAKE2B
da087dc0f3e1f683b025c16f9fc4c
DIST genpatches-6.1-37.extras.tar.xz 3808 BLAKE2B
020021d322f4240a950fc572f3442e554645419dd64f5e15ddb44e77bd950fa41030e5f8143949ac9e6a96eabf392d317fd7557a9ddeaa84b3979d399cf269c8
SHA512
9b6ffd0a94028f2bcfb3e8a1e24cc11f722fe6637b11f3cf9e5f21883291c456108bc2b7014d5aa5733ee77db2d2b9c196bd429b70fad3a6435b5c7773f37823
DIST genpatches-6.1-38.base.tar.xz 1956240 BLAKE2B
65193574bdd8fdf4dc5d78af616729db4f8e5ed4ad6fa22baccbe27cd0518175fd02acc218074c709b86831eda460a99013b2444c1f6ed358f545a3133afdc00
SHA512
d8015efd3980cf82f499a813589affc8d7b6acdcf748c17c9b3a4b41730676443611d6375e517c633bdb8d2119b1cbfe50bd8984885fd97c29455f00078d64f7
DIST genpatches-6.1-38.extras.tar.xz 3812 BLAKE2B
648c0054d5088b51d17e8b825153c7fcc7988d973811dcae7ccd64bcd78b4634d410aaa848b3cb31272eec552ad410c705388b8887603d94b6cf5a5170f7b36d
SHA512
313a119b47d954ebef9dea3a48024a8d4e7f3b4b62de74f19acdb997ece3e198872fc3c50e10171687b07e8bbf85c5b7dfd80045ed7184460fda3c68c29e8b9e
+DIST genpatches-6.1-39.base.tar.xz 1991672 BLAKE2B
332dc85815f36c8d97a1d053732fabb029a55009edd98e4afc6487f50e2cfe6cb02db0e47a8518286260a9cf430c7113e79ee7cdde214e20c1828162c9dc5bd0
SHA512
02cbb9c6f1179ebe84804bc4ebad65030c0471af8b78f2417128c3cf41d3fdf2b944ce2fb6b2cee6e8427cba7ddd5694a7c851a82a2c46f02fc624bac3450930
+DIST genpatches-6.1-39.extras.tar.xz 3812 BLAKE2B
f5f5b2820a14c40228ff46a76ef13323b7e3132bde16591e3d5dd5bff86aae5ee2b1e7ed890d88aaba374553fb22b0b09663df6f8da20f71ea6b0ba0d4bac4fe
SHA512
556f0454983f6537d6fa8bec81df5b2eb94a4413111124c08aad7d0e050735eed69fbcf797c94873f5837325d99fdb24d0a2bc6bbaadee29e92637b46ca5849a
DIST genpatches-6.3-10.base.tar.xz 593348 BLAKE2B
e4d149963ca7d441b60d40af98939acdcc6163a09790ce103c78d33aa554de170136fbf8a4aa9285c5bde7fdd3cad54f73152d56038d7a299f8e69158b420d50
SHA512
7fddf9a02d8767c0236d8c3e1097a267d7f4961308eb08826299b596ba96b1e2fcaa84c22d986619e99aff3817f64fbc3740b87e5d0e1949dfe85d7f5450697f
DIST genpatches-6.3-10.extras.tar.xz 3808 BLAKE2B
7a4885c76a17d73d7f03836d243bee424f5d4e4205a6547f1b4fcb709f4f6c2c4b1c61dd542b260a3e8dd724f98d851850eaf0930233988670c674a8a2928bae
SHA512
f851bc9d10ad98ee74fb26344236670c0aaa218c4bf24eaf54e6376ca68d0626cc1d8f954a1dd3b61343dbd41a286d7c8d9a743ab50c295c0c729732cfb231c2
DIST genpatches-6.3-11.base.tar.xz 641372 BLAKE2B
4b2463552d359412969bc50e8c46aac52c23fe83deaff66eddacb48148921b4f88b019bd05b81f4ae2eb71710cad18613e5001dd4ab999d461f35cedc4c31409
SHA512
7632ff13835b971d44f582853cc54d539bde0ef1ca511ac179ff49143c1bae21e82da0048b6c45d36da5aefd92fa788b108e3f01d6fbf16534394ad7b143833d
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.34.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.34.ebuild
new file mode 100644
index 000000000000..d77da3bdbc2e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.34.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[@]}"
+}
