commit: 5b3d290630790a7f567857b845547500a71d4462 Author: Frits Letteboer <dagraver <AT> gmail <DOT> com> AuthorDate: Sat Dec 23 13:54:11 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Dec 28 08:16:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3d2906
sys-kernel/pf-sources: drop 6.5_p5, 6.5_p6 Signed-off-by: Frits Letteboer <dagraver <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34444 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sys-kernel/pf-sources/Manifest | 4 -- sys-kernel/pf-sources/pf-sources-6.5_p5.ebuild | 95 -------------------------- sys-kernel/pf-sources/pf-sources-6.5_p6.ebuild | 95 -------------------------- 3 files changed, 194 deletions(-) diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest index a0dcf983e61e..0965e31073aa 100644 --- a/sys-kernel/pf-sources/Manifest +++ b/sys-kernel/pf-sources/Manifest @@ -1,13 +1,9 @@ -DIST genpatches-6.5-1.base.tar.xz 4888 BLAKE2B adcbb4c9f48e94781dfb3f38b32f4d60b555857ceb35f48ea19c1bafd9408d65d58a603abe994390ee970ce6fbd6ac9a75e56f2b924a0c9a5dad6cd11620c9b1 SHA512 7317fea243022a75ad3d9856030bcdb273ff55c7b865f71d29aa2799510cc3310d05cc0e63061c8ed11df8d9e820c1b4cbab310a627fbc7a2e15d8ca00b61fe5 -DIST genpatches-6.5-1.extras.tar.xz 3700 BLAKE2B b9fd452eb544031092219faddff94e96c48e7b39815fd48922b959a8d44033e443368f9825c5ffedc9f75fb851a74a6c252b9c7b9bdaaadb78727b804a7e9c5f SHA512 813a15a65ce8033d34b9eb42749fd7b2f2a604288b4c3a56aef295c994322c5cc95dd14fd35ac8335d3d036bdb708cadfc8bf2a4b35c406f420589af476bcf98 DIST genpatches-6.6-1.base.tar.xz 4044 BLAKE2B 5936817ce6dcf9e395b1f54efbf8890875bd00d6d59a1ab01bd4ce1d8c46756bd2599a149cdfd6fb745b7038c5213f60086aa76fa12c5fa50072efc7e528691f SHA512 fd07f605479ca9439aae0876b4597918bc847c00dc594e80be263917fb0bb1a87a6c8465c15f1f5c7bcc39359b6ee92eb56365878a9017b9a8185eccd4cd30f4 DIST genpatches-6.6-1.extras.tar.xz 3700 BLAKE2B ae850052cea73d318cfde8ea35eb351dd0b4177d3a5f55614541eaa62cadf58723148871cd6cc87d0bdbf35d05b4f9db54432a324f2f0e7bedf6773cb419bc2e SHA512 5dc25b2c4daccbc5b7c275071e460b9c662fbdfc1a82eeff1da00437660f6d0ab8882cb79d48520e60e4c3f0a16a79564f3a0ebbd515b3d42fb6289fc9c8e29a DIST genpatches-6.6-10.base.tar.xz 603340 BLAKE2B cc3220f1df9406c393605942e1a6fdaaf8ab46da53bc2fe6d001c9608a55ae2e5073d94805eb233183142e81bcea9bab1ed4700e298fc32c16c033597219f9ad SHA512 1f0149759b98fa099bda28aa1c4913719f0b5c0c715a72f6c0b13d3faf317a8935ce10508cd3459c50e39a7759feb44e7cf43fd49b87bd5ccd6d42a5dfc531d1 DIST genpatches-6.6-10.extras.tar.xz 3704 BLAKE2B 8b5e1453dd7bbbb7ee6dd02aef5e25e95f09a12a46d9dc014d71fe8fda96b94770f3cee75fa6f1db6bc9bdb67b39d272f8f887fc2986a17769237768bf6a382f SHA512 6ca7a360dc217684b1a06f869223a52772f267d48088d5e286dd27056faf34e9c4b4d575aa771c5f9b972febd4c656e32f470c4499feecd47716b07cc13ab933 DIST genpatches-6.6-7.base.tar.xz 472596 BLAKE2B c5f69fa43401555567c9e5c3b5bad31ef55a3f49756f86e1e5cb935cf8cffb6ee080f411b5113dc3fb9d43224de432e6f1f6fb5a18082d269e30181e72aa1fcd SHA512 6098a5d32ff83fe2ceb094055be6336a19c40246946606fd0b39e86ce8bf53b96cd5539e6cbc774dc865f4be742ac3c127f8f48ff5cd3a50484dcd5afb7b9df3 DIST genpatches-6.6-7.extras.tar.xz 3704 BLAKE2B 1bd0d01aefad3c47f2b7bdc550e607d2c4ba8e0cbbdbe3ba4ef57e539f9bd894222ca6f01908e6bb27221de1331634a6941867c7d6bece9620510110bf276107 SHA512 6da82d251ac6c33b8d2837e1a44a32ab5106f0a5816a8e76354c7d9eef510b4f485edfb1b80dad68e59b3a96494bed590ba1508f7b96697c364fd52c97b65496 -DIST linux-6.5-pf5.tar.gz 228002908 BLAKE2B 9a2aae312b54ff78546bc8c5930510bad72a6c856602adc404b8e4c1e59bba22445b263c8480377e17a5f2698c7efc21c75bf1ad06ebdee31a64fe8fdaa46ed9 SHA512 77cfd8f869b4b5da1f6109f16125605875246233880a71b27545a97bd76d42f78c07c419b7526c5313b591a055430fa8b4fd271192a872b944092520222f4a2f -DIST linux-6.5-pf6.tar.gz 227889902 BLAKE2B d45e370b566cc903bf9cc0880e4f50a68ea675073e81d3784c9e173c21939b68a1f5ab2d7e6740da303c98be8f469c10859f0814cf6e32a6b284cab0d96e21b2 SHA512 b9bbc97b865c5086afbcf3ba8532ed2723dbdb069323eb352f8b33dc5c69b75aae88ab7bfa5090c9f9f624eea4ee1287c301132d87e12b56a4ac6ece317ad668 DIST linux-6.6-pf1.tar.gz 229217046 BLAKE2B 9426ebab28f9ee516dcc48ef8343c624960b1de6b6ddd9b00393b2261ee1516d7f4fd126ff87a597fdfee85387811e9da0c57458909ac85a7edc4cb60594e8eb SHA512 54be704ff20b47df3c1d774ed9c997620df46188739c6f72b305a88200901afb0d0d534011ee65c41974d0a5aa91ad318c0c426332e05c70949a06292b17547c DIST linux-6.6-pf2.tar.gz 229223034 BLAKE2B 8e089eb63597d9069a3dd9cafe38269a7c49dffb646f39082916ec818bd9754ff691d4c0c60c7f6df5f720dd404007a1d8a7e2931977a4dcd474dfb04c950562 SHA512 49a7bba50ee00008b6441aa0c6e191866bc1beb042c107b950639e48c3a2c345f7704930c14df0e9e3b6ffeb2fbbfb1330a1a5c1e07378232e2cb2160dd4da4d DIST linux-6.6-pf3.tar.gz 229268485 BLAKE2B 31f58d15ede9f8d741d2c7f0d5a8d0264aa4ec48b174601897cda903a33760a9222846c1c282b2f895c40d5044ee63723848938ba95dcb6ea6ed948d618f7dd3 SHA512 c71bcdf7bd1ed7eb8dc2b7a09cfef90a8df1018517b79311432e4ce0a8d3b4d6f77728d2840fbf05c4489ea4091d129b0686e467e3ef26401398595f8efada08 diff --git a/sys-kernel/pf-sources/pf-sources-6.5_p5.ebuild b/sys-kernel/pf-sources/pf-sources-6.5_p5.ebuild deleted file mode 100644 index 2ee0009ae2d4..000000000000 --- a/sys-kernel/pf-sources/pf-sources-6.5_p5.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# 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. -# See https://archives.gentoo.org/gentoo-kernel/ (or subscribe to the list) to see all 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 -} diff --git a/sys-kernel/pf-sources/pf-sources-6.5_p6.ebuild b/sys-kernel/pf-sources/pf-sources-6.5_p6.ebuild deleted file mode 100644 index 2ee0009ae2d4..000000000000 --- a/sys-kernel/pf-sources/pf-sources-6.5_p6.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# 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. -# See https://archives.gentoo.org/gentoo-kernel/ (or subscribe to the list) to see all 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 -}
