From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 002A61584AD for ; Fri, 25 Apr 2025 18:34:48 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id DF3C7342FF8 for ; Fri, 25 Apr 2025 18:34:48 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CE3D11104B7; Fri, 25 Apr 2025 18:34:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id C175C1104B7 for ; Fri, 25 Apr 2025 18:34:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6781B340C39 for ; Fri, 25 Apr 2025 18:34:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3BEEFB9 for ; Fri, 25 Apr 2025 18:34:45 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1745606069.ff926d919f389c9369cf7af3d5abe17e83e812c4.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/vanilla-kernel/Manifest sys-kernel/vanilla-kernel/vanilla-kernel-6.1.135.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ff926d919f389c9369cf7af3d5abe17e83e812c4 X-VCS-Branch: master Date: Fri, 25 Apr 2025 18:34:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f5a38fa1-0186-422e-9c2f-aca49cb50a4a X-Archives-Hash: de47e36345220669481d30e158707cf9 commit: ff926d919f389c9369cf7af3d5abe17e83e812c4 Author: Michał Górny gentoo org> AuthorDate: Fri Apr 25 12:13:21 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Apr 25 18:34:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff926d91 sys-kernel/vanilla-kernel: Bump to 6.1.135 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.135.ebuild | 132 +++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 87405c5e5eef..fd92d173f463 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -42,6 +42,8 @@ DIST linux-6.1.133.tar.sign 991 BLAKE2B 94ddefaa66521930d67e039f317fb461e4a3f688 DIST linux-6.1.133.tar.xz 135288120 BLAKE2B 2da095003c655868d8b8cf1ceeb1018ea4ced9c3ccdf22a92e1c55adaae7f81f0a8a0b1953a526a305fc0f2a71c145b6a8d0aba8144a3af5b479503d8babd632 SHA512 46f5d09736afbb3ddf520dcb5973f71b0678491b3127464b9b433ffac76c1535b8df53ac067638a4b2e51340318b0cfa397fa1ee7d47b028b3694847e4a92ce3 DIST linux-6.1.134.tar.sign 991 BLAKE2B 7f388f457a36f67442d121acefc3d3bea11dbebb8b4b98a6a1bf340c11aff69c74fc2e6e7d031908d97c9f2f4340636dda70f178e08d4db5c8627b3d2694404a SHA512 d6eb544f432e58843e794d3296be0d279a6439232462427f968dc04e7bf25465c39d538d6e1aa80cfa0dae0a901792b609423f84a276b0a2a08c7b4ee22211e0 DIST linux-6.1.134.tar.xz 135265532 BLAKE2B 40738667b2878f75f063baaab0208fc9f43309026c9a4518d898292fcf7f04e7d9adbcab1e57e8501e8caa87dbf7dc581a5c9c9eea99bd80fa6e7c6c31d71d47 SHA512 15f9c497090e31325791aeee8f1161be2b959f7e45f85c285babaff605eed4e2a197a784bc46f99e160c8532983284fb39fd2b81a94912c4598258d150549ffd +DIST linux-6.1.135.tar.sign 991 BLAKE2B e621f70ff5b4c06d31d80b6246fe4265853430589107445a67584df7476001234ea4384dc940d6437164947e50dbc7eff425e37fef8c1a8c725db76249965143 SHA512 0be3f0cfdf57137101dd223d75dfa609dda7f7b288709f00341a9f97617700a1192798b55488ee30c1ef76a5e2b404b5945b67562664915064b2dbf350a3b4a0 +DIST linux-6.1.135.tar.xz 135288980 BLAKE2B e6ca8026cd0c01c55ef325ed7f06c96369f90a4702595f21dad622d324b79c83e1dcd3328e51d99424bc82e72f866ccebee8b33d00a08feb9523243fbed0110a SHA512 3fb40d438daeb67adb4831998d1bc3c8d02c0876637f4039930d1ab4fe7e37993051f36918e10be9182bfd2d1e172b97e15f376efa3d900e99f9ee3bcaf2c793 DIST linux-6.12.21.tar.sign 991 BLAKE2B 42a56c7d87d2b3449dcf9c35bb40fdbabcdb8a49695eded323c7b4d77bc6909c49729113db42bf5dd7d832909d969b1c164666d812abb1e2d6657133380b7fb4 SHA512 f59b3a428aa9aec2899880c442885838cea35a43232be754c855ba51110a3efd4a50caaa12e476bf9cbfd86b3f8312d55a9abc395df29e7f74dc36bed7eb3066 DIST linux-6.12.21.tar.xz 148042304 BLAKE2B 3dad715ed88f08c680837f7f74d0cb759f1a50f597820a9885863fba48cc13b10d4efa65ad821c02cfbbd7f0b814f4498cf15f4274cd9249b49edd5a37ea0728 SHA512 14436c71264c8679a1a9aada6b64d916a6ac5ff5f2128b344e844bea41780832b9bb5c74ee7d0970ee84b02feff433b1003303e129ff26deaba705aff3608b6f DIST linux-6.12.22.tar.sign 991 BLAKE2B dc5c5e08369896f20648a836314e7e3e6b1cdab6288dbda11772aeb75bb5309cb0fc5936cea6948a318620325a59a890936705a8f15238ec6f7706833a50aa11 SHA512 865fb5eba9e4e3f25dbbf45432e4781401a5c45fe5c25d9d1d5e2ca59bd76db085e1637354016a37c6b1aaa641caa8da7d2c3b2c201712b8b3fe8270615a7dce diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.135.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.135.ebuild new file mode 100644 index 000000000000..326396ce7852 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.135.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[@]}" +}