From 2934f5067e579eed5ac55d797f8d014a94aaaae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 9 May 2025 14:45:05 +0200 Subject: [PATCH] sys-kernel/vanilla-kernel: Bump to 6.1.138 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel-6.1.138.ebuild | 132 ++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 sys-kernel/vanilla-kernel/vanilla-kernel-6.1.138.ebuild diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 8af9af9ed3afb..d23d09a64d769 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -38,6 +38,8 @@ DIST linux-6.1.136.tar.sign 991 BLAKE2B 0e9ff69effc6314670cbd80fee757633cdd28bea DIST linux-6.1.136.tar.xz 135283328 BLAKE2B 4ccb170ded31587bb24b0fbcc501d91023a2cfbfd5b65b0e12caf7ccc09080b31200369c4e696bb55024a0c19c04a6a69a87dc5e59c81c9dad50f9000ed1a134 SHA512 d4ff15ea75a3efb392dab86e66059313ce7eee783e38dacbf808ca8e459ff05c6172f53e47d509cf372b676d83b94265119a88a851bde308fb96b71d420dc78f DIST linux-6.1.137.tar.sign 991 BLAKE2B a839d8c072bbd5a5564661ecd902d518caec6ccb72be85c18b908fef9230c101ebf1b1f44f98043538e58aaf70ea2a54dec15dbad1c3071a4509c362668122af SHA512 b5338ac868bce2201a8d9cbcdb28a2cfbc6c433de4f5c0aca8e91c2f960df6ca3a8cb1bf16c549fe131f488fef069ad1b22370b98978dbda96ccb29cd34bdd8b DIST linux-6.1.137.tar.xz 135291668 BLAKE2B 2ac78f2794bf6bd6962ca5af00898e5e889ef0a16712dce190ca204446d4ae5d4dfb2586d66fb8bac551d951cef24163579ee7dbe6a67bf8337f1c7093d841dd SHA512 cc30cc39dc9de1cfa1005fb7f515ed467cc2c9bcc1506486f4887946eece036f321d053d87bd687024f6b222a61191340fbb14afea68da900f63d93faab8c5c4 +DIST linux-6.1.138.tar.sign 991 BLAKE2B bb391936131a7e8e0112a28790ecd79ab4c55d6e8f6da3069dc36954d7151d2bfe544e6979063094cd7f2031697decdfb747d7901f4d5e7697624c00a302f5c3 SHA512 82e6af8e4b077ddc09962c350fff7c02a87824523e4ce543500375f1cff02a168af025726292f56dda55c319ad13d7ccf1e1fb60a3e50f3593f7b0e7e7428809 +DIST linux-6.1.138.tar.xz 135294080 BLAKE2B 94ff5030942544da6c02be2e52b2fe9ba301ffddf30fbd4b26786cbf0a23195bcd5b2141ba5d8bda12fdd38d3eea56c5a92cac14a07e775e46bc91cd1581fc31 SHA512 b7193077063d5a30ed1cd7f7e100e604ceff3ce17d22d050f39ccd9822b5dc397cac7efd74de33ee0ba508e4e76c339a9970cc196ae81c6715d1b4beae5857f1 DIST linux-6.12.25.tar.sign 991 BLAKE2B e3bc84c6050a323480b8eac343d19b986305ce7c3a89a2101b05cbe75e3cfa52a7aef2a1f8fd80cc54c0406e4070dd8d4b1f04209eb8a63fca1e2ce6374f84da SHA512 1b79197254a61824e803170b9646857aac625a2b039f10ea6ad901032f72f5b52d6b65fc002532e9ac30233f3ab0f60c5d764250da73844d709cbf5c515d0c50 DIST linux-6.12.25.tar.xz 148119160 BLAKE2B f647cc49328383876e04871a05b1b7dba761c8535f6b72851634d08d839954959276b22cb87d8c22d3ba5141ad08c19b68f28f8027d58cd501c962bb43e7e7ad SHA512 00a69a5d4d36cd845dc94b8b184cb0dd92af0fdadb4cacdc7592d54c272ab5dea11df5c0cbc4370bc4a8c63a427d772ea6a413c40f9e77ad97dd33ace8efc08c DIST linux-6.12.26.tar.sign 991 BLAKE2B 89ab2f7797adbbcbc24a008c205fdb1bf72ee8ef593043f4621f527f7642e1cb3187f04a69a001c922c2ae06d60d5263585723100cfa0b3805dae80573f15549 SHA512 59c57ba020d16405c0ab9cb6a89fe43cbfd5e11e8dd88c5f642bf4459260382cce94bd70d1b27120b0235e218236ffa232fdd6ea447fa9dfb037438a8bc7cd67 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.138.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.138.ebuild new file mode 100644 index 0000000000000..326396ce7852b --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.138.ebuild @@ -0,0 +1,132 @@ +# Copyright 2020-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# 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=g16 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +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://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + verify-sig? ( + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign + ) + 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 ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig )" + +BDEPEND=" + debug? ( dev-util/pahole ) + verify-sig? ( sec-keys/openpgp-keys-kernel ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc + +src_unpack() { + if use verify-sig; then + verify-sig_uncompress_verify_unpack \ + "${DISTDIR}"/linux-${PV}.tar.{xz,sign} + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" + else + default + fi +} + +src_prepare() { + default + + local biendian=false + + # prepare the default config + case ${ARCH} in + arm | hppa) + > .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="-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[@]}" +}