commit: 395cd10073b1e9e5258f8623292534437594093d Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Fri Dec 13 06:09:01 2019 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Fri Dec 13 06:10:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395cd100
sys-kernel/ck-sources: drop deblob, Fix extraversion Closes: https://bugs.gentoo.org/show_bug.cgi?id=688092 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> sys-kernel/ck-sources/Manifest | 2 -- ...ces-5.4.2.ebuild => ck-sources-5.4.2-r1.ebuild} | 29 ++++++++-------------- .../ck-sources/files/ck-5.4-revert-version.patch | 27 ++++++++++++++++++++ sys-kernel/ck-sources/metadata.xml | 3 --- 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest index fcf9441ce1a..10ac5ecdf84 100644 --- a/sys-kernel/ck-sources/Manifest +++ b/sys-kernel/ck-sources/Manifest @@ -1,5 +1,3 @@ -DIST deblob-5.4 153051 BLAKE2B 270a82ab6a08c629eeaa8d728dd7a37333e502c285cd29db51f2a9d8aba76fc8f1fe7976deb8014a67749cfda94f6e3dcc7275fa25d955ddf0aa665b858416d0 SHA512 bbab9fbc49e470622316074abc193a50f8726e5cdaa4686813dfbfdbeecd26e841f6ffff83df642c8c033a3b892ad0a09b83fc0d104f37d324742c61545f8e66 -DIST deblob-check-5.4 553846 BLAKE2B ac834b6c4820c573c9c857c4281eef29c4721073e0d015e08ebca7de6b480b324255c6643c67f743bbdc799c57642b8bbc19d4f5068a835dffed447d86a45bd2 SHA512 2f2ca4bf08eb55cf3a1164917bd7a54b3133b43393da4ba030c397b5a8a65464c0becc2e44ae8683612876956ab9ec0db0b0be0df0dab3a08a1b57d3a3d1617c DIST genpatches-5.4-3.base.tar.xz 49892 BLAKE2B 2c7e3e337303d63a0421927995327690e1af409bf7280f606447ebe753490b4f41c511172c2896619309982ec25210d0502295da74d2a40a8f862ad0c416b3b7 SHA512 e00169134c7c577219eddae23cf54d57203a0977ccaeac37e3eb863863992d99bafb1c3e0cfba3bcbe9e54e4c2bdecaa56061f2824ad87b17ade17823ff3477c DIST genpatches-5.4-3.experimental.tar.xz 6144 BLAKE2B c8aff7e1efac85708a49e79cf9576c3ab3efb666ecb6d565c2eb06e4c36bf9d42c28ee3233f26115bc5e41da48a4506e3315cc3496dd8b60bd97947e02bc74cd SHA512 76cd62513f58a5c0a764b89a94e251b292ba3e6d77648feea6f5959342aa801cc98fe557132d6103c12704d53992c49439cdb9d7153d6ece4ec44122784e7726 DIST genpatches-5.4-3.extras.tar.xz 1736 BLAKE2B 585b2ea4f7f9d62c68065a7f6a856529e10983cab8824c9da8c0420075694880256362ddc053b3e078b0ee98cbc3366349d56b72630234fd93bc264f10082966 SHA512 e20d6eea425c554699a44adf9808eda9dada7b8805bbd152c5b709bbf2eb61f0e13f1e85ea7cd8aeee3cb6cd22811322526306ffafe4bb95b2e069d8036cf405 diff --git a/sys-kernel/ck-sources/ck-sources-5.4.2.ebuild b/sys-kernel/ck-sources/ck-sources-5.4.2-r1.ebuild similarity index 80% rename from sys-kernel/ck-sources/ck-sources-5.4.2.ebuild rename to sys-kernel/ck-sources/ck-sources-5.4.2-r1.ebuild index b836375da8b..71ba6078af3 100644 --- a/sys-kernel/ck-sources/ck-sources-5.4.2.ebuild +++ b/sys-kernel/ck-sources/ck-sources-5.4.2-r1.ebuild @@ -2,40 +2,31 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" - ETYPE="sources" -KEYWORDS="~amd64 ~x86" - -HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ - http://kernel.kolivas.org/"; - -IUSE="experimental" - K_WANT_GENPATCHES="base extras experimental" K_GENPATCHES_VER="3" K_SECURITY_UNSUPPORTED="1" -K_DEBLOB_AVAILABLE="1" -PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 kernel-2 +inherit kernel-2 detect_version detect_arch -DEPEND="deblob? ( ${PYTHON_DEPS} )" - -K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}" +KEYWORDS="~amd64 ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ + http://kernel.kolivas.org/"; +IUSE="experimental" DESCRIPTION="Gentoo's genpatches for Linux ${K_BRANCH_ID}, with Con Kolivas' MuQSS process scheduler." +K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}" + CK_EXTRAVERSION="ck1" CK_URI="http://ck.kolivas.org/patches/5.0/${K_BRANCH_ID}/${K_BRANCH_ID}-${CK_EXTRAVERSION}/patch-${K_BRANCH_ID}-${CK_EXTRAVERSION}.xz"; SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}" -UNIPATCH_LIST="${DISTDIR}/patch-${K_BRANCH_ID}-${CK_EXTRAVERSION}.xz" +UNIPATCH_LIST="${DISTDIR}/patch-${K_BRANCH_ID}-${CK_EXTRAVERSION}.xz + "${FILESDIR}"/ck-5.4-revert-version.patch" UNIPATCH_STRICTORDER="yes" -pkg_setup() { - use deblob && python-any-r1_pkg_setup - kernel-2_pkg_setup -} + diff --git a/sys-kernel/ck-sources/files/ck-5.4-revert-version.patch b/sys-kernel/ck-sources/files/ck-5.4-revert-version.patch new file mode 100644 index 00000000000..73979c63afc --- /dev/null +++ b/sys-kernel/ck-sources/files/ck-5.4-revert-version.patch @@ -0,0 +1,27 @@ +From 4473747a792ea06f8e20c3a8b06a64d0f8082b5c Mon Sep 17 00:00:00 2001 +From: Jory Pratt <anar...@gentoo.org> +Date: Thu, 12 Dec 2019 23:14:45 -0600 +Subject: [PATCH] Revert Add -ck1 version. + +--- + Makefile | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/Makefile b/Makefile +index c9d6e972a..a0685a256 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,10 +15,6 @@ NAME = Kleptomaniac Octopus + PHONY := _all + _all: + +-CKVERSION = -ck1 +-CKNAME = MuQSS Powered +-EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION) +- + # We are using a recursive build, so we need to do a little thinking + # to get the ordering right. + # +-- +2.24.1 + diff --git a/sys-kernel/ck-sources/metadata.xml b/sys-kernel/ck-sources/metadata.xml index c35bd82c641..a74b6efec45 100644 --- a/sys-kernel/ck-sources/metadata.xml +++ b/sys-kernel/ck-sources/metadata.xml @@ -6,9 +6,6 @@ <name>Jory A. Pratt</name> </maintainer> <use> - <flag name="deblob">Remove binary blobs from kernel sources to provide - libre license compliance. - </flag> <flag name="experimental">Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental";.</flag> </use> <upstream>
