1 |
commit: 0a5a8dedd843c590634d9b07fb55ce0350ba5dd5 |
2 |
Author: Sarah White <kuzetsa <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jan 23 12:12:31 2017 +0000 |
4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 23 23:17:09 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a5a8ded |
7 |
|
8 |
sys-kernel/ck-sources: upstream patch - 4.9.x @ bug #606866 |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
sys-kernel/ck-sources/Manifest | 1 + |
13 |
sys-kernel/ck-sources/ck-sources-4.9.4.ebuild | 8 ++++++-- |
14 |
sys-kernel/ck-sources/ck-sources-4.9.5.ebuild | 8 ++++++-- |
15 |
3 files changed, 13 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest |
18 |
index 0342f06..84e378c 100644 |
19 |
--- a/sys-kernel/ck-sources/Manifest |
20 |
+++ b/sys-kernel/ck-sources/Manifest |
21 |
@@ -3,6 +3,7 @@ DIST 3.14-sched-bfs-447.patch 245314 SHA256 cf71ec72daeaa1ae757e8aaea10a53f972b6 |
22 |
DIST 3.18-sched-bfs-460.patch 250534 SHA256 f42551429eaeb544d24b658d86c24fa56acf6991b48762a48c1420d5c49baef2 SHA512 a7a6025c9062c935f024681a487d9087db9d3baf431f6534e9293174568e81f439400170f96a6060fd8b99453132e0e529eb2cd4fb795eaedda92cd8aaf65526 WHIRLPOOL e1431d93d772965139d5a67acee2c11819c5b1a09b8cfd16ecbab6c3dd086d81359b5e4be81d4bb73ef7273f495bf6c00978bae90652e1ecf1eae24f951e8f6e |
23 |
DIST 3.4-sched-bfs-424.patch 238668 SHA256 0faf4dd97ed903599db83d83b79b811d171ae6d1e916ad88ca32e55290fab32d SHA512 70f788b837fb26fc03503eab15eb958f1e86ab682bba394874c75275bfa4fec225ba16df5e77bffed24afcd99d6e13c3be608c81870d4d141bd9c86cd97b64d4 WHIRLPOOL 26f65771a3bc3df5b396d66755bc9b6af5bf200f6c84bae989de0d32f806df3a581c8aea2271163fe3aca54527d34a050bea9249a3db9b9f39f17330939a81df |
24 |
DIST bfs424-grq_urwlocks.patch 26428 SHA256 2bf41081dc175776100ce8c3ac909c1a77b314903c82a73cf1b8603ad7c841c4 SHA512 9784d7382b41484623cd410a4a6cebb70aaec39076fff62622f51084b7ca59707f9790b0a53ae0cfd2974d5120c849c542346746d243c59d1d79979141cfc900 WHIRLPOOL bfb8f5ffefd8da7e72e11884833cc742cb3652c32c0022c29a2a786a43b3c9788cf34a9d5d10ed65907de4aee990766bb03c4082cae19e6ae41d22666103ba57 |
25 |
+DIST ck-sources-4.9-freezer-fix.patch 684 SHA256 9ede45bd0d6daf49fd9904fe2cc9c741ccc04f4f475c38775773090854c4d8e8 SHA512 4241ca604f928263c29a49aca076832c06469db734864ec8c648cbbc30ba63cfb0b21d076ea4a7f3c438868802feb4e369d976e9ef6e091ce7bacf1a69c2c588 WHIRLPOOL 41e84eac1bf9390aa8dba69062a07d711f9e3878b7948027227e0baa90e01348df1f8c4fb6fa7dcbc67a25606bbde9908fd7db9047f8d6c232b6914ca689f643 |
26 |
DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9 |
27 |
DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c |
28 |
DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831 |
29 |
|
30 |
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.4.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.4.ebuild |
31 |
index 0bd568f..9bc9794 100644 |
32 |
--- a/sys-kernel/ck-sources/ck-sources-4.9.4.ebuild |
33 |
+++ b/sys-kernel/ck-sources/ck-sources-4.9.4.ebuild |
34 |
@@ -39,6 +39,10 @@ CK_BASE_URL="http://ck.kolivas.org/patches/4.0" |
35 |
CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}" |
36 |
CK_URI="${CK_LVER_URL}/${CK_FILE}" |
37 |
|
38 |
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x) |
39 |
+FRZR_FILE="${PN}-4.9-freezer-fix.patch" |
40 |
+FRZR_URI="https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ${FRZR_FILE}" |
41 |
+ |
42 |
#-- Build extra incremental patches list -------------------------------------- |
43 |
|
44 |
LX_INCP_URI="" |
45 |
@@ -64,9 +68,9 @@ POST_CK_FIX="" |
46 |
|
47 |
#-- |
48 |
|
49 |
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI}" |
50 |
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI} ${FRZR_URI}" |
51 |
|
52 |
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX}" |
53 |
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX} ${DISTDIR}/${FRZR_FILE}" |
54 |
UNIPATCH_STRICTORDER="yes" |
55 |
|
56 |
#-- Starting with 4.8, CK patches include BFQ, so exclude genpatches experimental BFQ patches - |
57 |
|
58 |
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.5.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.5.ebuild |
59 |
index b8182a8..9526f5e 100644 |
60 |
--- a/sys-kernel/ck-sources/ck-sources-4.9.5.ebuild |
61 |
+++ b/sys-kernel/ck-sources/ck-sources-4.9.5.ebuild |
62 |
@@ -39,6 +39,10 @@ CK_BASE_URL="http://ck.kolivas.org/patches/4.0" |
63 |
CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}" |
64 |
CK_URI="${CK_LVER_URL}/${CK_FILE}" |
65 |
|
66 |
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x) |
67 |
+FRZR_FILE="${PN}-4.9-freezer-fix.patch" |
68 |
+FRZR_URI="https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ${FRZR_FILE}" |
69 |
+ |
70 |
#-- Build extra incremental patches list -------------------------------------- |
71 |
|
72 |
LX_INCP_URI="" |
73 |
@@ -64,9 +68,9 @@ POST_CK_FIX="" |
74 |
|
75 |
#-- |
76 |
|
77 |
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI}" |
78 |
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI} ${FRZR_URI}" |
79 |
|
80 |
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX}" |
81 |
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX} ${DISTDIR}/${FRZR_FILE}" |
82 |
UNIPATCH_STRICTORDER="yes" |
83 |
|
84 |
#-- Starting with 4.8, CK patches include BFQ, so exclude genpatches experimental BFQ patches - |