From 7e246d96bb09620d2813a924e4f241ed734e7aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 21 Jun 2023 19:48:07 +0200 Subject: [PATCH] sys-kernel/gentoo-kernel: Bump to 6.1.35 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.35.ebuild | 140 ++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 sys-kernel/gentoo-kernel/gentoo-kernel-6.1.35.ebuild diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 4bc578b260ea0..c34f305d2740e 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -30,6 +30,8 @@ DIST genpatches-6.1-38.base.tar.xz 1956240 BLAKE2B 65193574bdd8fdf4dc5d78af61672 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.1-40.base.tar.xz 2034256 BLAKE2B 7a95fc06c6d7f6f3f658d35b21a2761543444d9a95114665a9d74e8514a8577874009ecdd0dbac862359362cb0661b99d54e1c43fd8e5285dd148034fcc637b6 SHA512 645fca84ce19ef2bcd30861a2db5e6332294e3c5feb453ee0132f046c4c49e40a188fe53e27c543000ed04de531909c0500e9f571cac432f645774dc08db2e7f +DIST genpatches-6.1-40.extras.tar.xz 3808 BLAKE2B ee4162db692e272773091d94d06bd2ba11fac8ca9bd4da96396eb450a7ea0c933e49ae9f6a27fc453c40079054d9140578c9d4c80a835f6ced71fad20a29247e SHA512 07a61941a6e0174d309da302bfdde21dce57a7449f3f8263d9005fe0a9c47feae2a5b508062cabaf53f92d6f06724e1acc3c71422e4a8e9215c515d989567a81 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.35.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.35.ebuild new file mode 100644 index 0000000000000..9e3641f0678a8 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.35.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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~alicef/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[@]}" +}