From 1d5ab063dfee938f16b3d30998aa67cf3c0cf5bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 29 Mar 2025 11:54:34 +0100 Subject: [PATCH] sys-kernel/vanilla-kernel: Bump to 6.6.85 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.6.85.ebuild | 135 ++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 sys-kernel/vanilla-kernel/vanilla-kernel-6.6.85.ebuild diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 92a05a097326f..73f26f7d3e48e 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -71,3 +71,5 @@ DIST linux-6.6.83.tar.sign 989 BLAKE2B 0ee23a3c90df5ffb2d1aa989607c73b9f7e1b25de DIST linux-6.6.83.tar.xz 140537160 BLAKE2B f64772b505ba83991141e1ca012934e90e70681d366a561a36dcbfacc7c982eac8a7d07f0498af1cf56222b320d9e072529c973f1ff3b720fc3e7a855311d431 SHA512 31cdaa6f9e5180b64cac91ed37f7212eb3b1e5647c6a1876689ff30762a216085762074241080b0c870dd69472cd7807aea076b1e8b7f3199bdc9a6ebfe54571 DIST linux-6.6.84.tar.sign 989 BLAKE2B 199b1ea57cf6d8b64d520335a39b7f76d9d65146240aeb16795b2eeffb0159314b89f544ea8934597b9f863e6c3a039f09791d84e94e12775afc7cce46ee430d SHA512 001963de7a11f43b1fd68b63394dfbf83c0f97cb9f9807c84efc85f76264fca0e1d215a68da72d580ed8b8043be9fa6457ca800a2c4f5379a38de4ff2caf4487 DIST linux-6.6.84.tar.xz 140532464 BLAKE2B 2589544ac6883b6ede82577786a322117175fd16b8c22fb274cced94ae770d5c43ad99a1f72e85afc2558537ad7956b135798b28333b4948a69b87edf1df2de6 SHA512 79ae24e265e2ee0b86da6c6afbd8c7eb712a25b5902626578a5453104688fbe3ce7261d15fe2e0dc3449e18888e6e4ae0abf3bd011d47359cad20d061cfbf6de +DIST linux-6.6.85.tar.sign 989 BLAKE2B be3648381f20706eb74c49c3f43f3f01e0dd3cb44747eb95c93b33667382963834c355be913bb1b07cbd2e1fcd9e884bdd9e906b712ec014a25b2cf38f59b266 SHA512 ec47e8121e6fd23642f264f6b9d92faff3bba6209e2b993a22f7891fde0159ef11001a9018dac2a65da1858aaab0948bf775d6a73877dd8f0d6d3f10e5483550 +DIST linux-6.6.85.tar.xz 140516972 BLAKE2B 7d0b37f2b49072c1a1ce4f6b9ffc4d54edfb928b0b77c2fe9dcc5be09547cd33eb1d592b7474cad72ac4781d57354aeea8bc72346520872e253744010cb0c4f2 SHA512 8b347a6c48aae2a7aa1c28586378d38083f672a68c8afb80431ba0e971fda90d1a8d6b839491a85320b6aab6522b9afe3f36c3963934139fcd50d70625e8de19 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.85.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.85.ebuild new file mode 100644 index 0000000000000..f4370e66a954d --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.85.ebuild @@ -0,0 +1,135 @@ +# Copyright 2020-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_MODULES_SIGN=1 +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.6.12-gentoo +GENTOO_CONFIG_VER=g15 + +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 ~loong ~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 | loong) + > .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 + + use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + + kernel-build_merge_configs "${merge_configs[@]}" +}