Gentoo Archives: gentoo-commits

From: "Göktürk Yüksek" <gokturk@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/ck-sources/
Date: Mon, 27 Feb 2017 21:54:38
Message-Id: 1488232456.09b9aa63954b7ee368f17153ee9cc142546e4804.gokturk@gentoo
1 commit: 09b9aa63954b7ee368f17153ee9cc142546e4804
2 Author: kuzetsa <kuzetsa <AT> gmail <DOT> com>
3 AuthorDate: Mon Feb 27 14:34:23 2017 +0000
4 Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 27 21:54:16 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b9aa63
7
8 sys-kernel/ck-sources: v.bump (4.9.13 & 4.10.1)
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 sys-kernel/ck-sources/Manifest | 6 ++
13 sys-kernel/ck-sources/ck-sources-4.10.1.ebuild | 59 ++++++++++++++++
14 sys-kernel/ck-sources/ck-sources-4.9.13.ebuild | 95 ++++++++++++++++++++++++++
15 3 files changed, 160 insertions(+)
16
17 diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
18 index 172efded16..84795b1881 100644
19 --- a/sys-kernel/ck-sources/Manifest
20 +++ b/sys-kernel/ck-sources/Manifest
21 @@ -6,9 +6,15 @@ DIST deblob-check-4.9 717834 SHA256 4599c6eabd53bb352e9b536d574152e72467548add19
22 DIST genpatches-4.10-1.base.tar.xz 4456 SHA256 4ab1b9a81b102744f406600b21bcec8cc4f7ea12d7f2551c3623c1b54ba35f91 SHA512 7587c3fdcc9554c31ffb2506e2b4d6cf3467638859b01683f85c510c718011d15d298195272fb4c06588be74ce88459896720cbc1f0270c0565f91bdccb9fc9d WHIRLPOOL eee757d3cd9f5d2793d33e94c381d570da356c6552407996df49a38be9bf968fb93daa2c009ba417020b834a4aecd1f3d0f9fd0f03dc4425eb09e27a49740d7d
23 DIST genpatches-4.10-1.experimental.tar.xz 4276 SHA256 07290c3f1efc42cb269a226664a7d43fe7109b4da1a3ce23b744e60462cbb4b1 SHA512 55edcf5299e729b7cc56c57c23ab22c1bbc495ca04fbe71f7f841b651203bc9bf9020c99c920d778611d3c8bfa795e2187f0ebd34b6a797bb8a6f82c9c778d6e WHIRLPOOL fb460da630355daa8350de6bf0ed1c888a1f2ea5805d169203dbddcc81645b8b5fa6d117bcff7ae259f5ec7fda5decc355fdd25a8b8449d4557a8b4caee4d4cb
24 DIST genpatches-4.10-1.extras.tar.xz 17328 SHA256 120d720363b78d18c198cee75e2fde7187e8fdea1ec66b48306452b5839e0484 SHA512 2a5c257d1e2169f73fbd9cc8bb89dc39a019f92fdb4f0fd649633f0285fdd5e3288acff4749780e3af303f7a75c3acd93a1bf8e8b00d6667f50ccd6b873cf187 WHIRLPOOL 8c752fd68cb6b56e402ae8f708668ab4489b2c6da0d240eb7feb20e3e93c84e96b2f080ce4ae536f1a3831078e3e7972e1335a50c8f710066f778c60f150982a
25 +DIST genpatches-4.10-2.base.tar.xz 11420 SHA256 21a3562b144e7e1ad80ef846b4793701d0acdd603ece5e9db0945066b2471720 SHA512 d0682416eac5e60308fa2c6da540beabe4f61e7144096e867b2b45f497b2465076ae14447c4c7e6378c4ba62d8811249c8906505604ca82cf6244a2fe880b00f WHIRLPOOL 50278fbea48138c65897213e9a6b75634245a1febeb39141822737a0a8169497645eb470520183df708c09f5f2d848c407d88fca0c655e0296cc25b5ff66be12
26 +DIST genpatches-4.10-2.experimental.tar.xz 4276 SHA256 4c96172e68278d2c364c68868925ffa2596d41f765a794acda7850ab73523ee6 SHA512 618f128e228e9d035af0b8b08d7c72600796579383834b8ef9a6ed18907bf704cc811d8dd9fda7e1b3590af4fbffdfe4f3e18aba82207cda17f0b8827a6f3375 WHIRLPOOL 05cf7b8eb6144a7fddb407d66f59b368c905cf2b75e15e846044a4c7edaf62b0506d365122ac17d23be36eb82ea7d06ea9c96dbb5449bfc8c9cda076ed347889
27 +DIST genpatches-4.10-2.extras.tar.xz 17328 SHA256 74092d499a5762fdc5334024b6cabb5ecf1bda47473baf0a930cb80f44ce4832 SHA512 a79a7339c0c8a1c8871b8ef93bc9089d7e3a54ff5c9f64afaa77d6a512a13b6f0ca6ce6b1b4b878c312e10651469414241c9b96cd267fa8031edf093d5de0012 WHIRLPOOL 4684b18aaceea92869ed266a3d8dad10adfd801efdda8eeebe7d711ec6561b8527e86762e86d3883d11bd92c7a313101ad1318b8953f5279ee775c3036f9dfba
28 DIST genpatches-4.9-14.base.tar.xz 299156 SHA256 a19e22f33b62858d28b2c78a3325f9334bd089bce9d077d6a759aa59a0b1a472 SHA512 4891b932bf0967e42dc047ca5213c2ece7a4e8347cdb0c176b0dba2063ccab0245d1f3f89ad9e184226a02870526a246cd1f291f20e2e0d4aa79d06b40edaf16 WHIRLPOOL 0490f84c21e80a0b80d2c851096e07a31cdd24bc9fc8b29682d84876155ee8c074d7f736d1b5c6f7512e4810d57fca649602e519feb96e325a732b7cb32623db
29 DIST genpatches-4.9-14.experimental.tar.xz 105584 SHA256 a14fb8785a4f245cbcdc12557a4b2487ccb00e39763af17204557fbf81cb19b8 SHA512 34787219163e2443b558531f5c427463aa1c4e1131bf950bb6afc906af4d8e3c2c57b5361ce7745a8b77f7ba391d76c35cfcc58afa464ea3da0c693cc2058e93 WHIRLPOOL 16287aa781e7777120c95638c4d72c13e4c1d0820323a4e7996e58431e9ee34bca9a8970f0c6ff2a9815227a901b1cd1128562994d43e73779e57a3d5c37febc
30 DIST genpatches-4.9-14.extras.tar.xz 17332 SHA256 2bdf94536e891c377ae1cc0120cb3f420cc84c7b5fe2f8070840d895f7e43ddc SHA512 53adb516ae85e00a99fcae63e668a268520b74314b626c094cba4044a2c443b4f340238ca03a27624b23d356678739a933d515c8240cc08c2c4db79be090b183 WHIRLPOOL d540140ae6b1edde3f34ebc19e7bba0cb0a05a8b7aed5be3c02f698ac40b6e713b249687f1d467553c859aca7e7e54b3901eeeb22ffedace8e6bd34e04000aec
31 +DIST genpatches-4.9-15.base.tar.xz 306680 SHA256 0d21f36e5dada40a98ff345ebc01678d2aee060becc7c5c1df84edec9279af2a SHA512 2962f30bd055a5afcefe8aca654419da52c61fc8e5ee8a16770020f517467ad13e4d7ba47c0b1b531b0e4be630b4ca2cf78170544d5ac0115db7071cc504278b WHIRLPOOL 77f667264615abd7a7324abf60bcc2177421595130103d1af79a438da907fb2d274048f51e2f5ae66d80b27a8b1ba732c0653fa48d58bfff338c815cef3b68eb
32 +DIST genpatches-4.9-15.experimental.tar.xz 105620 SHA256 95e2425fe639048d06d9695c34cc4e74222e29b08fe1e5e4673e746d6f5ad8d4 SHA512 f708e6247ea3cfdcdcf2e4c80ddf65722ca078a10a545d21172d46ce0e9021e3f6cd382c85aa8bd219d1da1c69de6be21c41d8c2250ad0fda1e21e8ae2964577 WHIRLPOOL 8272693cd4e3a95bc731f035c0d2002761d8446f3fe21ae217c9ba83d127f4da4d0b072ca89fe8e7068540b4e55671f5acf288779dbff79542a590505802a64c
33 +DIST genpatches-4.9-15.extras.tar.xz 17328 SHA256 7d65754bb7e17d006462d0575a954c48d5ce98ad5ca370cb7f227ba7e711cda0 SHA512 4b4e61cb350716fe0e111ee81309de985e7a4442e7fce0268b50a8a02bddc63a904fd148dee8f1258c1df393324236cc75f823c4708f10a74863cdaf5c28d56e WHIRLPOOL 849be987dc4a07fc7161ae52e2c996ad6dc4c8395e1559f41df508b6b95b60df00a50a3a252adc17d003a0630a580869d36661bef1dfd3186e7977f5900aa445
34 DIST linux-4.10.tar.xz 94231404 SHA256 3c95d9f049bd085e5c346d2c77f063b8425f191460fcd3ae9fe7e94e0477dc4b SHA512 c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 WHIRLPOOL 86d021bae2dbfc4ef80c22d9e886bed4fbd9476473a2851d7beaf8ed0c7f7fbc1fa0da230eb9e763eb231b7c164c17b2a73fd336ab233543f57be280d6173738
35 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
36 DIST patch-4.10-ck1.xz 154200 SHA256 1913eeb921bbef3733b53f4004a3013289fa85a26409610bb14fcff3bbd7ef72 SHA512 b998cfe44b5bd89b362fe299ae799cd5caceef5114b954fbf10be0553c21234a949417459f848e75b029a4089760aafe212efadddd8c2d65d054c0d367fc7816 WHIRLPOOL 2056718b1b1e1b8bccfbe5fcafd01d24179fae05653fac3e7553b4dab38789f694a050990e8e99ea38c4f9074ab339640980d433bdd411c0deb84f7bd698ab10
37
38 diff --git a/sys-kernel/ck-sources/ck-sources-4.10.1.ebuild b/sys-kernel/ck-sources/ck-sources-4.10.1.ebuild
39 new file mode 100644
40 index 0000000000..66dd0c4650
41 --- /dev/null
42 +++ b/sys-kernel/ck-sources/ck-sources-4.10.1.ebuild
43 @@ -0,0 +1,59 @@
44 +# Copyright 1999-2017 Gentoo Foundation
45 +# Distributed under the terms of the GNU General Public License v2
46 +# $Id$
47 +
48 +EAPI="5"
49 +ETYPE="sources"
50 +KEYWORDS="~amd64 ~x86"
51 +
52 +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
53 + http://users.tpg.com.au/ckolivas/kernel/"
54 +
55 +K_WANT_GENPATCHES="base extras experimental"
56 +K_EXP_GENPATCHES_PULL="1"
57 +K_EXP_GENPATCHES_NOUSE="1"
58 +K_GENPATCHES_VER="2"
59 +K_SECURITY_UNSUPPORTED="1"
60 +K_DEBLOB_AVAILABLE="1"
61 +
62 +PYTHON_COMPAT=( python2_7 )
63 +inherit python-any-r1 kernel-2
64 +detect_version
65 +detect_arch
66 +
67 +DEPEND="deblob? ( ${PYTHON_DEPS} )"
68 +
69 +K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
70 +
71 +DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
72 +
73 +CK_VERSION="1"
74 +
75 +CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
76 +
77 +CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
78 +CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
79 +CK_URI="${CK_LVER_URL}/${CK_FILE}"
80 +
81 +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
82 +
83 +UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
84 +UNIPATCH_STRICTORDER="yes"
85 +
86 +# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
87 +# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
88 +
89 +K_EXP_GENPATCHES_LIST="5010_*.patch*"
90 +
91 +pkg_setup() {
92 + use deblob && python-any-r1_pkg_setup
93 + kernel-2_pkg_setup
94 +}
95 +
96 +src_prepare() {
97 +
98 +#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
99 +
100 + # linux-info eclass cannot handle recursively expanded variables in Makefile #490328
101 + sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
102 +}
103
104 diff --git a/sys-kernel/ck-sources/ck-sources-4.9.13.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.13.ebuild
105 new file mode 100644
106 index 0000000000..d1686d4fa2
107 --- /dev/null
108 +++ b/sys-kernel/ck-sources/ck-sources-4.9.13.ebuild
109 @@ -0,0 +1,95 @@
110 +# Copyright 1999-2017 Gentoo Foundation
111 +# Distributed under the terms of the GNU General Public License v2
112 +# $Id$
113 +
114 +EAPI="5"
115 +ETYPE="sources"
116 +KEYWORDS="~amd64 ~x86"
117 +
118 +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
119 + http://users.tpg.com.au/ckolivas/kernel/"
120 +
121 +K_WANT_GENPATCHES="base extras experimental"
122 +K_EXP_GENPATCHES_PULL="1"
123 +K_EXP_GENPATCHES_NOUSE="1"
124 +K_GENPATCHES_VER="15"
125 +K_SECURITY_UNSUPPORTED="1"
126 +K_DEBLOB_AVAILABLE="1"
127 +
128 +PYTHON_COMPAT=( python2_7 )
129 +inherit python-any-r1 kernel-2
130 +detect_version
131 +detect_arch
132 +
133 +DEPEND="deblob? ( ${PYTHON_DEPS} )"
134 +
135 +K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
136 +
137 +DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
138 +
139 +#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
140 +
141 +XTRA_INCP_MIN=""
142 +XTRA_INCP_MAX=""
143 +
144 +#--
145 +
146 +CK_VERSION="1"
147 +
148 +CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
149 +
150 +CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
151 +CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
152 +CK_URI="${CK_LVER_URL}/${CK_FILE}"
153 +
154 +# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
155 +FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
156 +FRZR_FILE="${PN}-4.9-freezer-fix.patch"
157 +FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
158 +
159 +#-- Build extra incremental patches list --------------------------------------
160 +
161 +LX_INCP_URI=""
162 +LX_INCP_LIST=""
163 +if [ -n "${XTRA_INCP_MIN}" ]; then
164 + LX_INCP_URL="${KERNEL_BASE_URI}/incr"
165 + for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
166 + LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
167 + LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
168 + LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
169 + done
170 +fi
171 +
172 +#-- CK needs sometimes to patch itself... ---------------------------
173 +
174 +CK_INCP_URI=""
175 +CK_INCP_LIST=""
176 +
177 +#-- Local patches needed for the ck-patches to apply smoothly -------
178 +
179 +PRE_CK_FIX=""
180 +POST_CK_FIX=""
181 +
182 +#--
183 +
184 +SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI} ${FRZR_URI}"
185 +
186 +UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX} ${DISTDIR}/${FRZR_FILE}"
187 +UNIPATCH_STRICTORDER="yes"
188 +
189 +#-- Starting with 4.8, CK patches include BFQ, so exclude genpatches experimental BFQ patches -
190 +
191 +K_EXP_GENPATCHES_LIST="5010_*.patch*"
192 +
193 +pkg_setup() {
194 + use deblob && python-any-r1_pkg_setup
195 + kernel-2_pkg_setup
196 +}
197 +
198 +src_prepare() {
199 +
200 +#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
201 +
202 + # linux-info eclass cannot handle recursively expanded variables in Makefile #490328
203 + sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
204 +}