* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/ck-sources/files/, sys-kernel/ck-sources/
@ 2019-12-13 6:10 Jory Pratt
0 siblings, 0 replies; 2+ messages in thread
From: Jory Pratt @ 2019-12-13 6:10 UTC (permalink / raw
To: gentoo-commits
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 <anarchy@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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/ck-sources/files/, sys-kernel/ck-sources/
@ 2020-12-29 7:43 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-12-29 7:43 UTC (permalink / raw
To: gentoo-commits
commit: 2d0856d777191635ad76831095ca1501659e7f6f
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 07:21:48 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 07:43:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0856d7
sys-kernel/ck-sources: remove last-rited package
Closes: https://bugs.gentoo.org/739782
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-kernel/ck-sources/Manifest | 8 ------
sys-kernel/ck-sources/ck-sources-5.4.37.ebuild | 30 ----------------------
sys-kernel/ck-sources/ck-sources-5.4.48.ebuild | 30 ----------------------
.../ck-sources/files/ck-5.4-revert-version.patch | 27 -------------------
sys-kernel/ck-sources/metadata.xml | 15 -----------
5 files changed, 110 deletions(-)
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
deleted file mode 100644
index b199f4dd054..00000000000
--- a/sys-kernel/ck-sources/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST genpatches-5.4-37.base.tar.xz 1364268 BLAKE2B b21de895d8b1f71c7ccc1f1d88c32cca1e9aa4e878ba410ad8f72424e540eccfc6d75274d4e8736aa54c4891c4bfb2d0439c473e073d9f26b1233fa95145fcfe SHA512 27af65a7fb661959987f885a2d4e8b471bda14d8ba40f8323c90fa04d42c5ec4d20df8095cc8a42ba386ed48fc2014185d61eff96ee892bbe64a41ee08cf2800
-DIST genpatches-5.4-37.experimental.tar.xz 6144 BLAKE2B 4b78072577abe58bd48dfe42961bc91859ebcec708254f0d5e9b1441be2b1d90bd151ff5f2b9f9f7cd088857d2882bbb8ff689caf89dbbcb6d35a169f3a48dc8 SHA512 fad854c58e677af6a9ac4c508cff9047555959a351e976eca1c7e0b104e549b773e4c91544c24a1a667d9a32e81dbd0835f70203d938898b0c1cb108208c5131
-DIST genpatches-5.4-37.extras.tar.xz 1756 BLAKE2B 8b5bf7880cd8c8e45aee0be7d29fb52e169ea53156830df60b71ea3cb0dcd0f9d9c56bde3ee275205af482b93330d6d1247841c08c2483e1266e9929ccfdd18d SHA512 6d7d202b6c3cc7f5f99d4c66834e0108b965d40cd052224b8345c8d290c5872b2ef78df93c1c0d2b9ca6d759d10099f3df70197d8441f8f0d9cdcc04fd125700
-DIST genpatches-5.4-48.base.tar.xz 1620972 BLAKE2B 45f358c85092ba422f8c411e91da90ccfc4b607f9c095dbe9ff02bc6adfbab4b35b03763316999810364d18ed3323fa613b70117e6f8454b2ba74744c1266b0e SHA512 b99974f5491b6103bb3e6b3b97e613322001bec40e49a4edc53893e94df66b7cc03370ca28af62d21dda995a477e395c16c22b8595ac96723ae66f2747fc9df4
-DIST genpatches-5.4-48.experimental.tar.xz 6144 BLAKE2B 33e0e921370e8224026984f721ddf952ae05980c405b4e7de930ac76e25097f4fbecd13a1ca4fbdd73afa6c68c8dd32dd7e6938212c79daf52f705289b91809a SHA512 c12c332f115843369010cb049872ec8c190e001abf537bc793c9a120a5dd8ec773fe971b749d95f96c590b659fac22e2a7f9b2b1e55093c4d0d542c6486b2536
-DIST genpatches-5.4-48.extras.tar.xz 1768 BLAKE2B 3f281c1c36c2a52e4fe2419592377baf4553c5fc61088911e50a901f96a1f4d89dc3e1b441b4b02575fca77ef6c371ccbecf8c55ff2eb9fbe14a7047451ae873 SHA512 9d2dbd829c53a310549811c2f133b19e4525c103827c5c5935cbd09d790eec105957dcbaee10cbe6409e0b7e00065c91b29a52e6d2bbf8e41859f5e4987de98a
-DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-5.4-ck1.xz 104668 BLAKE2B 8faff0d2b95eda0b96e8042367634c45c1e823238e99793daeda5614efdc448dfe28172bf13f0d988cf4d5cbb4892089893e0183cd8825de7f54942283f2b5a0 SHA512 a2ea79df39b79dfc2d1c7a6acf745dfe4d5c9f4da1c54b9a5d9ff6227d0d0715cd372b7f448454976c1c6a8eb171bc248d004ee55931521ef74d5b7be8f14c6a
diff --git a/sys-kernel/ck-sources/ck-sources-5.4.37.ebuild b/sys-kernel/ck-sources/ck-sources-5.4.37.ebuild
deleted file mode 100644
index 7f49b36fbe8..00000000000
--- a/sys-kernel/ck-sources/ck-sources-5.4.37.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="37"
-K_SECURITY_UNSUPPORTED="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-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
- "${FILESDIR}"/ck-5.4-revert-version.patch"
-UNIPATCH_STRICTORDER="yes"
diff --git a/sys-kernel/ck-sources/ck-sources-5.4.48.ebuild b/sys-kernel/ck-sources/ck-sources-5.4.48.ebuild
deleted file mode 100644
index 8b4eeeada3f..00000000000
--- a/sys-kernel/ck-sources/ck-sources-5.4.48.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="48"
-K_SECURITY_UNSUPPORTED="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-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
- "${FILESDIR}"/ck-5.4-revert-version.patch"
-UNIPATCH_STRICTORDER="yes"
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
deleted file mode 100644
index 73979c63afc..00000000000
--- a/sys-kernel/ck-sources/files/ck-5.4-revert-version.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4473747a792ea06f8e20c3a8b06a64d0f8082b5c Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@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
deleted file mode 100644
index a74b6efec45..00000000000
--- a/sys-kernel/ck-sources/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>anarchy@gentoo.org</email>
- <name>Jory A. Pratt</name>
- </maintainer>
- <use>
- <flag name="experimental">Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
- <remote-id type="github">ckolivas/linux</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-29 7:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-29 7:43 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/ck-sources/files/, sys-kernel/ck-sources/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2019-12-13 6:10 Jory Pratt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox