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 5345115A7D9 for ; Tue, 14 Mar 2023 14:53:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 999E1E07EE; Tue, 14 Mar 2023 14:53:30 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7086EE07EE for ; Tue, 14 Mar 2023 14:53:30 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A685834307D for ; Tue, 14 Mar 2023 14:53:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23E9B888 for ; Tue, 14 Mar 2023 14:53:28 +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: <1678805606.d02fa9f755fdf3bd9f137bed679e453410baa643.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.2_p4.ebuild X-VCS-Directories: sys-kernel/pf-sources/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: d02fa9f755fdf3bd9f137bed679e453410baa643 X-VCS-Branch: master Date: Tue, 14 Mar 2023 14:53:28 +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: bb1042c7-04b2-4b31-b891-d04e5b02a6d7 X-Archives-Hash: 76b9dd015d84cef9c164867b6309f786 commit: d02fa9f755fdf3bd9f137bed679e453410baa643 Author: Joonas Niilola gentoo org> AuthorDate: Tue Mar 14 14:52:32 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Mar 14 14:53:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02fa9f7 sys-kernel/pf-sources: add 6.2-pf4 Signed-off-by: Joonas Niilola gentoo.org> sys-kernel/pf-sources/Manifest | 1 + sys-kernel/pf-sources/pf-sources-6.2_p4.ebuild | 94 ++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest index 6f27d1958618..49f186741943 100644 --- a/sys-kernel/pf-sources/Manifest +++ b/sys-kernel/pf-sources/Manifest @@ -28,5 +28,6 @@ DIST linux-6.1-pf6.tar.gz 220761768 BLAKE2B 8b0f3d16be65f245978a823bc4c3130f7601 DIST linux-6.2-pf1.tar.gz 222840475 BLAKE2B ee66cdfba8b08cbc5ac70f97b87826dc9d04ee8de2fb57f52e1688c1cdc5b0fecfe3bc673fa30849a7417120c1393ebae7c24ca9a2b00b55eb6719de0246160a SHA512 461d2775491675f351ca56787257a4c7fcda9d2a50538a26639448d86ab79fccff895f0385af78bf2e1113aa650383e77f3d114f6cb84c98c4b407690b0d3e63 DIST linux-6.2-pf2.tar.gz 222861169 BLAKE2B b3e6bddc8639475313cb3203b99e068c109c1f2b71a6475ac8c8c0be21ab57c8d6ab2291db38c0b05e2d875a613df531acdfb7bc0d98acaf7efdd6032b6ea7be SHA512 ad038f5ea05da6006f4436c2345cbe259a3cf89be4424be12a96495875d40abf95eeb18afb550be8ef2b00b5013d1001dc5de688e0ebe85f30b655be9acd6840 DIST linux-6.2-pf3.tar.gz 222849935 BLAKE2B d0c00d16dd92a0a1617442cea2bba0aa64fbba16ae7632609efbb3c107bd27c9e5920b4292497dfbbcc02c8e05d9c726dd0b39a6c31bd834edb976268f6537ba SHA512 f0e24f4a69befbdf14124d8f82f1387a7e8dad7c997e63850d04f81658baf9d9bb7c827fabbe5163695eee8dd4c7bdc3c010674471fe8a3f3b57d2680b0593d7 +DIST linux-6.2-pf4.tar.gz 222900183 BLAKE2B 6ed60362c81577e314c944f063ddbe547961990d1a54843ac1238f8e2e01fee8fd319be2f3ff33b364ce98909bba4f3fc4c61c67f3375a46b38c9c2db7568c34 SHA512 16aa5baeaa9e55a0c483b08baa2fb40d1f7c698ed1baaa52b832569284740bb5a9ef78b1b3bb415f096772a1efd9490fb28cdf0442d17210ae82da9e7ee7b745 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.2_p4.ebuild b/sys-kernel/pf-sources/pf-sources-6.2_p4.ebuild new file mode 100644 index 000000000000..3c9b67ed85ac --- /dev/null +++ b/sys-kernel/pf-sources/pf-sources-6.2_p4.ebuild @@ -0,0 +1,94 @@ +# 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" + +# Use genpatches but don't include the 'experimental' use flag. +K_EXP_GENPATCHES_NOUSE="1" + +# Genpatches version to use. -pf patch set already includes vanilla linux updates. Regularly "1" +# is the wanted value here, but the genpatches patch set can be bumped if it includes some +# important fixes. src_prepare() will handle deleting the updated vanilla linux patches. +K_GENPATCHES_VER="1" + +# -pf patch set already sets EXTRAVERSION to kernel Makefile. +K_NOSETEXTRAVERSION="1" + +# pf-sources is not officially supported/covered by the Gentoo security team. +K_SECURITY_UNSUPPORTED="1" + +# Define which parts to use from genpatches - experimental is already included in the -pf patch +# set. +K_WANT_GENPATCHES="base extras" + +# Major kernel version, e.g. 5.14. +SHPV="${PV/_p*/}" + +# Replace "_p" with "-pf", since using "-pf" is not allowed for an ebuild name by PMS. +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() { + # When genpatches basic version is bumped, it also includes vanilla linux updates. Those are + # already in the -pf patch set, so need to remove the vanilla linux patches to avoid conflicts. + if [[ ${K_GENPATCHES_VER} -ne 1 ]]; then + find "${WORKDIR}"/ -type f -name '10*linux*patch' -delete || + die "Failed to delete vanilla linux patches in src_prepare." + fi + + # kernel-2_src_prepare doesn't apply PATCHES(). Chosen genpatches are also applied here. + 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 +}