From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A180A15800F for ; Thu, 5 Jan 2023 09:23:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C396EE07EE; Thu, 5 Jan 2023 09:23:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id AB3D5E07EE for ; Thu, 5 Jan 2023 09:23:34 +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 F221C340F4E for ; Thu, 5 Jan 2023 09:23:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BFC276A for ; Thu, 5 Jan 2023 09:23:32 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1672910607.b5fe699e74a1d1b01aeec678f3df020119b5bc6b.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/pf-sources/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/pf-sources/Manifest sys-kernel/pf-sources/pf-sources-6.1_p2.ebuild X-VCS-Directories: sys-kernel/pf-sources/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: b5fe699e74a1d1b01aeec678f3df020119b5bc6b X-VCS-Branch: master Date: Thu, 5 Jan 2023 09:23:32 +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: 7f0a7e67-d4c4-465b-93d1-7d30b4d25cd7 X-Archives-Hash: ae1d0af50b2b320616fe20c3739aeca8 commit: b5fe699e74a1d1b01aeec678f3df020119b5bc6b Author: Joonas Niilola gentoo org> AuthorDate: Thu Jan 5 09:09:51 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Jan 5 09:23:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5fe699e sys-kernel/pf-sources: add 6.1-pf2 Signed-off-by: Joonas Niilola gentoo.org> sys-kernel/pf-sources/Manifest | 1 + sys-kernel/pf-sources/pf-sources-6.1_p2.ebuild | 86 ++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest index 8bf203ea023c..67fe7352dbf9 100644 --- a/sys-kernel/pf-sources/Manifest +++ b/sys-kernel/pf-sources/Manifest @@ -15,5 +15,6 @@ DIST linux-6.0-pf4.tar.gz 218368702 BLAKE2B d6585d02938abd1bc587dc5d6c3597bc8b96 DIST linux-6.0-pf5.tar.gz 218385127 BLAKE2B 21dcb503b10decda6c02f6613f022d0f300be6366afcc205cd8b84f929f384822801d1eabe69a7b88b81218ade4d465e977fd2eb9a7d41d9c5665cbf43d8c08b SHA512 1711d15dbcd77d838a2b7c710debbb0c9ddcbee16922c35df85169dd61d028b6a2e62ca202488350dc4f4f512d6d2b2a3c70a6c269d114e2886c892be4caf327 DIST linux-6.0-pf6.tar.gz 218406147 BLAKE2B b084ffd751a3be9043ab0c306623c2ede6597fa024d72e959778a6185c83410aae7e165bd008bbbd0eddc5066d65ad342afaa4f66669190995ea1ab5a3f0b0e8 SHA512 99b766969216a0692d475a15dd6ecf36c29852e6702585c8c47f4d18516301f98c8f1aed3515ba65872e5628118fc84ddcbc8bdc816e7f4e94ce139dbe6c5035 DIST linux-6.1-pf1.tar.gz 220692376 BLAKE2B 4d5eb13df0d433057a7b7a6c347c44f42f3edbd8cf714258d274f8c65226e9ac09b80d583088678b25865dc73c2c29085949731b425e8529a5022c590d94220e SHA512 8b54d6b79e21fd89e64faac7502d846f9b1a1f6a1ad52f3bb3ead6074f7fe8e9fa531b8fa06a22372127a66da0c0234fb114a9f707e6512e3643328173ec1729 +DIST linux-6.1-pf2.tar.gz 220718450 BLAKE2B 54ce340573f6c0144db3a77355553a49607b83ef7fe5fda308d4eb4d04c5b5014ea9241f8e17e7c2bd89b7f10567a14814d027fe1826d78f4182127a1ebfa825 SHA512 db7d28834ea60e38873823c3a83e1f6a128d34f0a698a728052cde50cee7c5f40a8b41e0ec53e069887fe4b72ea3837a5adc4deee4036e8c6bda084cac0d806b DIST prjc-519-r1-vd-test.patch 274504 BLAKE2B 87950689ffe97134100aa91d0ff89acd6f4e93b626ad7ab08af464a49457f16526cae7b863d53213dd129d47b6f97b3407ae7027b02656d9eba85942241e8d3f SHA512 d652b6060400329d051257fedee5d9f37a70554ab722e93a15f294d1c6229bfa227941461147e0128178b02875cdf838e0d71e89884d8c01e7549ee482213b71 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e diff --git a/sys-kernel/pf-sources/pf-sources-6.1_p2.ebuild b/sys-kernel/pf-sources/pf-sources-6.1_p2.ebuild new file mode 100644 index 000000000000..e15753e77d30 --- /dev/null +++ b/sys-kernel/pf-sources/pf-sources-6.1_p2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Define what default functions to run +ETYPE="sources" + +# No 'experimental' USE flag provided, but we still want to use genpatches +K_EXP_GENPATCHES_NOUSE="1" + +# Just get basic genpatches, -pf patch set already includes vanilla-linux updates +K_GENPATCHES_VER="1" + +# -pf already sets EXTRAVERSION to kernel Makefile +K_NOSETEXTRAVERSION="1" + +# Not supported by the Gentoo security team +K_SECURITY_UNSUPPORTED="1" + +# We want the very basic patches from gentoo-sources, experimental patch is +# already included in pf-sources +K_WANT_GENPATCHES="base extras" + +# major kernel version, e.g. 5.14 +SHPV="${PV/_p*/}" + +# Replace "_p" with "-pf" +PFPV="${PV/_p/-pf}" + +inherit kernel-2 optfeature +detect_version + +DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches" +HOMEPAGE="https://pfkernel.natalenko.name/ + https://dev.gentoo.org/~mpagano/genpatches/" +SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz + https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz + https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +S="${WORKDIR}/linux-${PFPV}" + +K_EXTRAEINFO="For more info on pf-sources and details on how to report problems, + see: ${HOMEPAGE}." + +pkg_setup() { + ewarn "" + ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way." + ewarn "If you need support, please contact the pf developers directly." + ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with" + ewarn "the ebuilds. Thank you." + ewarn "" + + kernel-2_pkg_setup +} + +src_unpack() { + # Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override + # the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here. + unpack ${A} + + mv linux linux-${PFPV} || die "Failed to move source directory" +} + +src_prepare() { + # kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need + # to manually eapply the genpatches too. + eapply "${WORKDIR}"/*.patch + default +} + +pkg_postinst() { + # Fixes "wrongly" detected directory name, bgo#862534. + local KV_FULL="${PFPV}" + kernel-2_pkg_postinst + + optfeature "userspace KSM helper" sys-process/uksmd +} + +pkg_postrm() { + # Same here, bgo#862534. + local KV_FULL="${PFPV}" + kernel-2_pkg_postrm +}