1 |
commit: 769498709dfbf5efeb64090da058dd8d37a8b624 |
2 |
Author: Joshua Kinard <kumba <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 31 08:38:27 2015 +0000 |
4 |
Commit: Joshua Kinard <kumba <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 31 08:39:22 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76949870 |
7 |
|
8 |
Update to 4.1.6/4.2.0, update several eblits, and fix copyright dates. |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
sys-kernel/mips-sources/Manifest | 15 +++++----- |
13 |
.../files/eblits/err_disabled_mach-v1.eblit | 2 +- |
14 |
.../eblits/err_only_one_mach_allowed-v1.eblit | 2 +- |
15 |
.../files/eblits/pkg_postinst-v1.eblit | 2 +- |
16 |
.../mips-sources/files/eblits/pkg_setup-v1.eblit | 6 ++-- |
17 |
.../files/eblits/show_cobalt_info-v1.eblit | 2 +- |
18 |
.../files/eblits/show_ip22_info-v3.eblit | 2 +- |
19 |
.../files/eblits/show_ip28_info-v1.eblit | 2 +- |
20 |
..._ip30_info-v3.eblit => show_ip30_info-v4.eblit} | 21 +++++++------- |
21 |
..._ip32_info-v3.eblit => show_ip32_info-v4.eblit} | 15 +--------- |
22 |
.../{src_unpack-v5.eblit => src_unpack-v6.eblit} | 7 ++--- |
23 |
sys-kernel/mips-sources/metadata.xml | 1 - |
24 |
...rces-4.0.1.ebuild => mips-sources-4.1.6.ebuild} | 31 ++++++++------------ |
25 |
...ces-3.19.6.ebuild => mips-sources-4.2.0.ebuild} | 33 ++++++++-------------- |
26 |
14 files changed, 54 insertions(+), 87 deletions(-) |
27 |
|
28 |
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest |
29 |
index bcccdc0..65729af 100644 |
30 |
--- a/sys-kernel/mips-sources/Manifest |
31 |
+++ b/sys-kernel/mips-sources/Manifest |
32 |
@@ -1,8 +1,7 @@ |
33 |
-DIST linux-3.19.tar.xz 81688872 SHA256 be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c SHA512 d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c WHIRLPOOL 76a17bb3d7c30cee19e135940f3607106efb2984061f946f0da9a2ddd602dc1bfc7e6f8970975cfb113d13f23a75415f39938204af266e2819e7a239b6f46778 |
34 |
-DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001 |
35 |
-DIST mips-sources-3.19.0-patches-v2.tar.xz 103912 SHA256 45e4f018c89ba899db8feb976bf16dccc83c99a24fa80402f2c40a112a859b96 SHA512 b7bf9ad8073ac190cf2cb6110b798b6be2c59b193eb8762d8c4b3fe66f3519a05810a4db1f6b43cc979946f4d3827b6b43191599a9c10bac9c907f1299ff6d1e WHIRLPOOL 2bb1ff3a28e1067d225b5614580ab83b27813ef4a803d4bc83f7469763ed0c6cf8a5a0905167ac043115b7512a6af186c181d1ac139ec2fae06e877c8faa5ea2 |
36 |
-DIST mips-sources-4.0.0-patches-v1.tar.xz 94208 SHA256 f6a21f6f2e1136d9e1fa43dccd7b8bd76f8c44fa24c33d841c444c2e9dd03094 SHA512 4e6ff611ba1dc9d34b215a5cff44e74f0c196a83556a5eba52feff26a833de5540f9acee0cb1eb0a8b1e2ed255e24059dbde8f192c1082ab6169e44720d22a44 WHIRLPOOL 7c81bb9b5c5f5b459a763023ea36c395f8d38008ca5b0e2f2bb01a8cd53fcdef04e793e0168524cc8b3f0de44498228aa4946da7fb7cbaf3b2ce4ca78c2b6110 |
37 |
-DIST mipsgit-3.19.0-20150418.diff.xz 2996 SHA256 c44dc0956375ae3b56dd05f47229657479dbc76572d1457577bb59c9db19b802 SHA512 f2aae6e01d6e8f152720b46551bb980cb7fda27ac3752182ee7afccbd779565279e29c3329ac87553de374c54cf4f79374ef3022b475dddf88842864a4bd2390 WHIRLPOOL c8a4b95b78793fd5528c24f984ccbdc62ab02794c52d8a97baec7703272f20103d850628f4dcdcf6dae3be15430ef907c6455beea71b2c277a3f7635cba6be89 |
38 |
-DIST mipsgit-4.0.0-20150418.diff.xz 6820 SHA256 970b6ab12578dc30b770ea3157589f1015c8d28c9269ded2e16296269e8ac499 SHA512 cb8cf9d6e53ccdfe382dfba2312115860641ee638e5defc0fbe2452c0e69641ec283caef63fcc59557cefc54611005c95bc9120fb42aa6704ba1d56022b21ea0 WHIRLPOOL 8526ab03f4be1a4332028951a63f92b7e738db8d70369ce0afc18641b1da092e33bf7e1b5d32a0761450ea94f5eb1462bea0452b171c1a17de17b85d6eedaa53 |
39 |
-DIST patch-3.19.6.xz 202724 SHA256 8dd82b6e2daca608e18dcda50b370b089dd45a7b3915ea274b59bfe15f657026 SHA512 871d5a8a1588e0c2d313802a89bdc52d7fc2ba84d731f01c7a07fe941ae311696043ce07b85483821cf2ece910119d59ce6c432f78db51ff0c80cfa46c24842f WHIRLPOOL d777885fe82d8172aebdf64fb69af30b4aa057df2d25ce8d2804bd0b7d857ef41e3d2847a8729eca3d2ee2acdca45f6f006c733b6200cc3dae43c2e1e9e0312e |
40 |
-DIST patch-4.0.1.xz 4072 SHA256 9b4b47eb6584dc39aaa5db46843b83f7c60975abecbda4dc106a8722eabe96fb SHA512 3f4547c759a7ce9f75671676d9d57e516ba8a6617d1c195aa5d728bc10926e200ac4285aa2612a7e3a8f4e4f4e3038e250563f139fb4f76d0f93b73222eb7d30 WHIRLPOOL c20bdc0f434702758512b0707da4d90cd3d89fe9ae0e22e4a7a5794a17ed02e0c13b6ea0951907950aa173beccf1022fb72da2badf3bc8e5b957a7ae5d9f7d13 |
41 |
+DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 |
42 |
+DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0 |
43 |
+DIST mips-sources-4.1.0-patches-v1.tar.xz 155512 SHA256 4093fa9a36ed3ac513d3a1d2f321362ee1552361fcbffbfe666e9907bb8fe7b0 SHA512 6a16f2461fed92686bdbcd86ae10c4a6ebcd1c0e38f7da9727f587bf4d129d1dec1e3c45fddc3c337d6ba9e0c07ac16f42b8eab4ecaa2c02f33786b5cc8cbcea WHIRLPOOL 492076e979e017887ce545d8a1633a129d86ecd85d4e0221ea8a5d6271b959d3a1f02bf4d5045df97d7432787e4302db7226bc282733d56d119b4933646e8338 |
44 |
+DIST mips-sources-4.2.0-patches-v1.tar.xz 154572 SHA256 5b22bdab634ebfabef9b680e1334ed600c36d0f2bac2692f763e538562aa3546 SHA512 2c1d749f8bc20fdc62eb8f157e3a86e25fd2cb0d20b250a913bb99c14b3c693a726a99a082f8f3524f4c4da16ec89e62e244bcfe4285641d1e285188d7a3a42a WHIRLPOOL e4508a6a093add3a18d87b1e8762199a904365bb7b2173d53a2bd1798516221c56a5a24708478bba130bc3288e595167c59b2bea88b754c6c4431ee84c8ba2c4 |
45 |
+DIST mipsgit-4.1.0-20150830.diff.xz 2172 SHA256 1dc6449311b607f21f64f8051bb1b5a318c4827b71a1fbe619fec4198500e76e SHA512 8f2724313e4a41a0492146ca9da8b7772688d4f71be4d4f75e0dc6e33ba0c8c47ecd2f1ca7916375afb8db9abae07fb19714e51c55a10f14a6a87488666a4870 WHIRLPOOL 41c51c3d40ee64f1a584e2d2ef08bf04c41b951a2d1db955edb65f2f3461573f9bb6226b646a8a0dbe812e112fdbab80915915c67d9f5c08c52e9e37704c0a7d |
46 |
+DIST mipsgit-4.2.0-20150830.diff.xz 6676 SHA256 15a45b998a3dae1adfc0a1efe8681f3dd006537d5a33e6dc9b1b0160e6fe7503 SHA512 6d16263d34cb6865647d89ac6933f37fe063d74fd55e1db6911533dc8de5a55f9731d1e5b55eea030d51244e8d59244a0e9f8bda4c283d8684b74738a8dadf0d WHIRLPOOL 7baa008a100e7dab569dbe9e234bf2d11408389db0e9d2eaef9b8823b4aeb0a39f713d28a4ca74606fdcafec2ba95a0c4eaf492ae0c5a7ec570440c35e35fd0f |
47 |
+DIST patch-4.1.6.xz 201836 SHA256 64e4deb16a279e233b0c91463b131bd0f3de6aabdb49efded8314bcf5dbfe070 SHA512 1b725c2051d7dd9129c927fdb90d8d7a2e13149a2dd1175c5efacfc516e664af3647bca83d847197f8c19ef140bf07ea856868e27bef4a1cad9607e40b527424 WHIRLPOOL cc685876a4bf84903720a7a311854b4b469d29e8f09303b8e05e82501c6bb105fe149eed78f14084bbd748bfbd13ad55a22277ac1ab17c497b6c5e0db64af0d6 |
48 |
|
49 |
diff --git a/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit b/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit |
50 |
index 631ca46..6f9ff7e 100644 |
51 |
--- a/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit |
52 |
+++ b/sys-kernel/mips-sources/files/eblits/err_disabled_mach-v1.eblit |
53 |
@@ -1,4 +1,4 @@ |
54 |
-# Copyright 1999-2009 Gentoo Foundation |
55 |
+# Copyright 1999-2015 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
# $Id$ |
58 |
|
59 |
|
60 |
diff --git a/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit b/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit |
61 |
index e312204..c3562cf 100644 |
62 |
--- a/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit |
63 |
+++ b/sys-kernel/mips-sources/files/eblits/err_only_one_mach_allowed-v1.eblit |
64 |
@@ -1,4 +1,4 @@ |
65 |
-# Copyright 1999-2009 Gentoo Foundation |
66 |
+# Copyright 1999-2015 Gentoo Foundation |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
# $Id$ |
69 |
|
70 |
|
71 |
diff --git a/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit b/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit |
72 |
index a28fb8c..7c76ffd 100644 |
73 |
--- a/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit |
74 |
+++ b/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit |
75 |
@@ -1,4 +1,4 @@ |
76 |
-# Copyright 1999-2009 Gentoo Foundation |
77 |
+# Copyright 1999-2015 Gentoo Foundation |
78 |
# Distributed under the terms of the GNU General Public License v2 |
79 |
# $Id$ |
80 |
|
81 |
|
82 |
diff --git a/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit b/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit |
83 |
index d9eaf60..b1b4ff9 100644 |
84 |
--- a/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit |
85 |
+++ b/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit |
86 |
@@ -1,4 +1,4 @@ |
87 |
-# Copyright 1999-2009 Gentoo Foundation |
88 |
+# Copyright 1999-2015 Gentoo Foundation |
89 |
# Distributed under the terms of the GNU General Public License v2 |
90 |
# $Id$ |
91 |
|
92 |
@@ -16,9 +16,9 @@ eblit-mips-sources-pkg_setup() { |
93 |
# See if we're on a cobalt system first (must use the cobalt-mips profile) |
94 |
if use cobalt; then |
95 |
arch_is_selected="yes" |
96 |
- [ "${DO_CBLT}" = "test" ] \ |
97 |
+ [ "${DO_CBLT}" = "test" ] \ |
98 |
&& err_disabled_mach "Cobalt Microsystems" "CBLT" "cobalt" "test" |
99 |
- [ "${DO_CBLT}" = "no" ] \ |
100 |
+ [ "${DO_CBLT}" = "no" ] \ |
101 |
&& err_disabled_mach "Cobalt Microsystems" "CBLT" "cobalt" |
102 |
show_cobalt_info |
103 |
fi |
104 |
|
105 |
diff --git a/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit b/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit |
106 |
index 68f62ca..b1ff8ff 100644 |
107 |
--- a/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit |
108 |
+++ b/sys-kernel/mips-sources/files/eblits/show_cobalt_info-v1.eblit |
109 |
@@ -1,4 +1,4 @@ |
110 |
-# Copyright 1999-2009 Gentoo Foundation |
111 |
+# Copyright 1999-2015 Gentoo Foundation |
112 |
# Distributed under the terms of the GNU General Public License v2 |
113 |
# $Id$ |
114 |
|
115 |
|
116 |
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit |
117 |
index 0d25680..e926d31 100644 |
118 |
--- a/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit |
119 |
+++ b/sys-kernel/mips-sources/files/eblits/show_ip22_info-v3.eblit |
120 |
@@ -1,4 +1,4 @@ |
121 |
-# Copyright 1999-2011 Gentoo Foundation |
122 |
+# Copyright 1999-2015 Gentoo Foundation |
123 |
# Distributed under the terms of the GNU General Public License v2 |
124 |
# $Id$ |
125 |
|
126 |
|
127 |
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit b/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit |
128 |
index f6be936..2ad25cd 100644 |
129 |
--- a/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit |
130 |
+++ b/sys-kernel/mips-sources/files/eblits/show_ip28_info-v1.eblit |
131 |
@@ -1,4 +1,4 @@ |
132 |
-# Copyright 1999-2009 Gentoo Foundation |
133 |
+# Copyright 1999-2015 Gentoo Foundation |
134 |
# Distributed under the terms of the GNU General Public License v2 |
135 |
# $Id$ |
136 |
|
137 |
|
138 |
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v4.eblit |
139 |
similarity index 77% |
140 |
rename from sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit |
141 |
rename to sys-kernel/mips-sources/files/eblits/show_ip30_info-v4.eblit |
142 |
index 1c1a160..90c3e5b 100644 |
143 |
--- a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v3.eblit |
144 |
+++ b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v4.eblit |
145 |
@@ -10,19 +10,19 @@ |
146 |
|
147 |
show_ip30_info() { |
148 |
echo -e "" |
149 |
- einfo "Octane boots again as-of 3.14! Celebrate!" |
150 |
+ einfo "Octane SMP support works again as-of 4.1! Celebrate!" |
151 |
echo -e "" |
152 |
eerror "Things that DON'T work:" |
153 |
- eerror "\t- SMP SUPPORT IS CURRENTLY BROKEN! I require help in getting CPU1 to" |
154 |
- eerror "\t\040\040'tick' properly, as it hangs up in the generic MIPS SMP code." |
155 |
- eerror "\t- R14000 ONLY: Do NOT use CONFIG_TRANSPARENT_HUGEPAGE on an Octane with" |
156 |
- eerror "\t\040\040an R14000 CPU, otherwise, when the machine starts to boot into" |
157 |
- eerror "\t\040\040userland, it will trigger Instruction Bus Errors (IBEs), which" |
158 |
- eerror "\t\040\040requires a complete powerdown of the machine for about 15 seconds" |
159 |
- eerror "\t\040\040to clear." |
160 |
- eerror "\t- Do not use CONFIG_SLUB, otherwise, you'll get errors when booting" |
161 |
+ eerror "\t- Do NOT use CONFIG_TRANSPARENT_HUGEPAGE, otherwise, when the machine" |
162 |
+ eerror "\t\040\040starts to boot into userland, it will trigger Instruction" |
163 |
+ eerror "\t\040\040Bus Errors (IBEs), which requires a complete powerdown of the" |
164 |
+ eerror "\t\040\040machine for about 15 seconds to clear." |
165 |
+ eerror "\t- DO NOT USE CONFIG_SLUB, otherwise, you'll get errors when booting" |
166 |
eerror "\t\040\040regarding duplicate /sys/kernel/slab/* entries in" |
167 |
eerror "\t\040\040sysfs." |
168 |
+ eerror "\t- Greater than 2GB memory causes problems with DMA. This is a long-standing" |
169 |
+ eerror "\t\040\040problem and patches to fix it by DMA experts would be greatly" |
170 |
+ eerror "\t\040\040appreciated!" |
171 |
eerror "\t- Do not use OHCI-based USB cards in Octane. They're broke on this machine." |
172 |
eerror "\t\040\040Patches are welcome to fix the issue." |
173 |
echo -e "" |
174 |
@@ -46,11 +46,12 @@ show_ip30_info() { |
175 |
ewarn "\t\040\040video conversion boards as well." |
176 |
echo -e "" |
177 |
einfo "Things that DO work:" |
178 |
+ einfo "\t- SMP works again, celebrate!" |
179 |
einfo "\t- Impact (MGRAS) console and X driver, please report any bugs." |
180 |
einfo "\t- VPro (Odyssey) console, but no X driver exists yet." |
181 |
einfo "\t- PCI Card Cages should work for many devices, except certain types like" |
182 |
einfo "\t\040\040PCI-to-PCI bridges (USB hubs, USB flash card readers for example)." |
183 |
einfo "\t- SCSI, RTC, basic PCI, IOC3 Ethernet, keyboard, and mouse. Please" |
184 |
- einfo "\t\040\040 report any problems with these devices." |
185 |
+ einfo "\t\040\040report any problems with these devices." |
186 |
echo -e "" |
187 |
} |
188 |
|
189 |
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v4.eblit |
190 |
similarity index 65% |
191 |
rename from sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit |
192 |
rename to sys-kernel/mips-sources/files/eblits/show_ip32_info-v4.eblit |
193 |
index 112b44c..daac6d9 100644 |
194 |
--- a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v3.eblit |
195 |
+++ b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v4.eblit |
196 |
@@ -1,4 +1,4 @@ |
197 |
-# Copyright 1999-2011 Gentoo Foundation |
198 |
+# Copyright 1999-2015 Gentoo Foundation |
199 |
# Distributed under the terms of the GNU General Public License v2 |
200 |
# $Id$ |
201 |
|
202 |
@@ -23,19 +23,6 @@ show_ip32_info() { |
203 |
einfo "\t\040\040patches!" |
204 |
echo -e "" |
205 |
|
206 |
- if use ip32r10k; then |
207 |
- eerror "The R10K patch for IP32 is now updated and will apply to 3.0.x kernels." |
208 |
- eerror "When it did apply and booted, it was flaky at best, and didn't stay online" |
209 |
- eerror "for long before locking up. Don't attempt to play with this unless you" |
210 |
- eerror "are seriously interested in kernel hacking." |
211 |
- echo -e "" |
212 |
- eerror "We're interesting in finding anyone with knowledge of the R10000" |
213 |
- eerror "workaround for speculative execution listed in the R10000 Processor" |
214 |
- eerror "manual, or those who are familiar with the IP32 chipset and the feature" |
215 |
- eerror "called \"Juice\"." |
216 |
- echo -e "" |
217 |
- fi |
218 |
- |
219 |
einfo "To Build 64bit kernels for SGI O2 (IP32) or SGI Indy/Indigo2 R4x00 (IP22)" |
220 |
einfo "systems, you need to use the ${GOOD}vmlinux.32${NORMAL} make target." |
221 |
einfo "Once done, boot the ${GOOD}vmlinux.32${NORMAL} file (NOT vmlinux)." |
222 |
|
223 |
diff --git a/sys-kernel/mips-sources/files/eblits/src_unpack-v5.eblit b/sys-kernel/mips-sources/files/eblits/src_unpack-v6.eblit |
224 |
similarity index 90% |
225 |
rename from sys-kernel/mips-sources/files/eblits/src_unpack-v5.eblit |
226 |
rename to sys-kernel/mips-sources/files/eblits/src_unpack-v6.eblit |
227 |
index dade9b2..c1428ea 100644 |
228 |
--- a/sys-kernel/mips-sources/files/eblits/src_unpack-v5.eblit |
229 |
+++ b/sys-kernel/mips-sources/files/eblits/src_unpack-v6.eblit |
230 |
@@ -28,18 +28,17 @@ eblit-mips-sources-src_unpack() { |
231 |
# machine patches and if a machine USE flag is enabled, then unset |
232 |
# its corresponding variable. |
233 |
# See 0000_README for the patch numbers and their meanings. |
234 |
- local p_generic="501*" |
235 |
- local p_ip27="502*" p_ip28="503*" p_ip30="504*" p_ip32r10k="6001*" |
236 |
+ local p_generic="51*" |
237 |
+ local p_ip27="52*" p_ip28="53*" p_ip30="54*" |
238 |
use ip27 && unset p_generic p_ip27 |
239 |
use ip28 && unset p_ip28 |
240 |
use ip30 && unset p_generic p_ip30 |
241 |
- use ip32r10k && unset p_ip32r10k |
242 |
|
243 |
# Remove symlinks for any patches that we don't want applied. We do |
244 |
# this by looping through all the above variables, and deleting |
245 |
# matching symlinks that point to the corresponding patches. |
246 |
# The remaining symlinks will be applied to the kernel source. |
247 |
- local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_ip32r10k}" |
248 |
+ local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30}" |
249 |
for x in $patchlist; do rm -f "./${x}"; done |
250 |
|
251 |
# Rename the source tree to match the linux-mips git checkout date and |
252 |
|
253 |
diff --git a/sys-kernel/mips-sources/metadata.xml b/sys-kernel/mips-sources/metadata.xml |
254 |
index fe41a90..3cc12ff 100644 |
255 |
--- a/sys-kernel/mips-sources/metadata.xml |
256 |
+++ b/sys-kernel/mips-sources/metadata.xml |
257 |
@@ -15,7 +15,6 @@ |
258 |
<flag name='ip27'>Enables support for SGI Origin (IP27)</flag> |
259 |
<flag name='ip28'>Enables support for SGI Indigo2 Impact R10000 (IP28)</flag> |
260 |
<flag name='ip30'>Enables support for SGI Octane (IP30, 'Speedracer')</flag> |
261 |
- <flag name='ip32r10k'>Enables experimental support for IP32 R10K kernels (SGI O2, 'Moosehead')</flag> |
262 |
</use> |
263 |
<upstream> |
264 |
<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id> |
265 |
|
266 |
diff --git a/sys-kernel/mips-sources/mips-sources-4.0.1.ebuild b/sys-kernel/mips-sources/mips-sources-4.1.6.ebuild |
267 |
similarity index 88% |
268 |
rename from sys-kernel/mips-sources/mips-sources-4.0.1.ebuild |
269 |
rename to sys-kernel/mips-sources/mips-sources-4.1.6.ebuild |
270 |
index bf79eba..f18e0d4 100644 |
271 |
--- a/sys-kernel/mips-sources/mips-sources-4.0.1.ebuild |
272 |
+++ b/sys-kernel/mips-sources/mips-sources-4.1.6.ebuild |
273 |
@@ -5,19 +5,10 @@ |
274 |
# EAPI Version |
275 |
EAPI="5" |
276 |
|
277 |
-# INCLUDED: |
278 |
-# 1) linux sources from kernel.org |
279 |
-# 2) linux-mips.org GIT snapshot diff |
280 |
-# 3) Generic Fixes |
281 |
-# 4) Patch for the IOC3 Metadriver (IP27, IP30) |
282 |
-# 5) Patch for IP30 Support |
283 |
-# 6) Experimental patches (if needed) |
284 |
- |
285 |
#//------------------------------------------------------------------------------ |
286 |
|
287 |
# Version Data |
288 |
-OKV=${PV/_/-} |
289 |
-GITDATE="20150418" # Date of diff between kernel.org and lmo GIT |
290 |
+GITDATE="20150830" # Date of diff between kernel.org and lmo GIT |
291 |
GENPATCHREV="1" # Tarball revision for patches |
292 |
|
293 |
# Directories |
294 |
@@ -25,10 +16,11 @@ S="${WORKDIR}/linux-${OKV}-${GITDATE}" |
295 |
MIPS_PATCHES="${WORKDIR}/mips-patches" |
296 |
|
297 |
# Kernel-2 Vars |
298 |
-K_SECURITY_UNSUPPORTED="1" |
299 |
-K_NOUSENAME="0" |
300 |
-K_NOUSEPR="0" |
301 |
-K_USEPV="0" |
302 |
+K_SECURITY_UNSUPPORTED="yes" |
303 |
+K_NOUSENAME="yes" |
304 |
+K_NOSETEXTRAVERSION="yes" |
305 |
+K_NOUSEPR="yes" |
306 |
+K_BASE_VER="4.0" |
307 |
ETYPE="sources" |
308 |
|
309 |
# Inherit Eclasses |
310 |
@@ -41,10 +33,9 @@ BASE_KV="$(get_version_component_range 1-2).0" |
311 |
[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}" |
312 |
|
313 |
# Portage Vars |
314 |
-HOMEPAGE="http://www.linux-mips.org/ https://www.gentoo.org/" |
315 |
-SLOT="${OKV}" |
316 |
+HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/" |
317 |
KEYWORDS="-* ~mips" |
318 |
-IUSE="cobalt ip27 ip28 ip30 ip32r10k" |
319 |
+IUSE="cobalt ip27 ip28 ip30" |
320 |
DEPEND=">=sys-devel/gcc-4.6.0" |
321 |
RDEPEND="" |
322 |
|
323 |
@@ -153,8 +144,8 @@ load_eblit_funcs() { |
324 |
eblit-include show_ip22_info v3 |
325 |
eblit-include show_ip27_info v3 |
326 |
eblit-include show_ip28_info v1 |
327 |
- eblit-include show_ip30_info v3 |
328 |
- eblit-include show_ip32_info v3 |
329 |
+ eblit-include show_ip30_info v4 |
330 |
+ eblit-include show_ip32_info v4 |
331 |
eblit-include show_cobalt_info v1 |
332 |
|
333 |
# This makes sure pkg_setup & pkg_postinst gets into any binpkg. |
334 |
@@ -171,6 +162,6 @@ pkg_setup() { |
335 |
pkg_setup |
336 |
} |
337 |
|
338 |
-src_unpack() { eblit-run src_unpack v5 ; } |
339 |
+src_unpack() { eblit-run src_unpack v6 ; } |
340 |
|
341 |
#//------------------------------------------------------------------------------ |
342 |
|
343 |
diff --git a/sys-kernel/mips-sources/mips-sources-3.19.6.ebuild b/sys-kernel/mips-sources/mips-sources-4.2.0.ebuild |
344 |
similarity index 87% |
345 |
rename from sys-kernel/mips-sources/mips-sources-3.19.6.ebuild |
346 |
rename to sys-kernel/mips-sources/mips-sources-4.2.0.ebuild |
347 |
index efb1fd5..f18e0d4 100644 |
348 |
--- a/sys-kernel/mips-sources/mips-sources-3.19.6.ebuild |
349 |
+++ b/sys-kernel/mips-sources/mips-sources-4.2.0.ebuild |
350 |
@@ -5,30 +5,22 @@ |
351 |
# EAPI Version |
352 |
EAPI="5" |
353 |
|
354 |
-# INCLUDED: |
355 |
-# 1) linux sources from kernel.org |
356 |
-# 2) linux-mips.org GIT snapshot diff |
357 |
-# 3) Generic Fixes |
358 |
-# 4) Patch for the IOC3 Metadriver (IP27, IP30) |
359 |
-# 5) Patch for IP30 Support |
360 |
-# 6) Experimental patches (if needed) |
361 |
- |
362 |
#//------------------------------------------------------------------------------ |
363 |
|
364 |
# Version Data |
365 |
-OKV=${PV/_/-} |
366 |
-GITDATE="20150418" # Date of diff between kernel.org and lmo GIT |
367 |
-GENPATCHREV="2" # Tarball revision for patches |
368 |
+GITDATE="20150830" # Date of diff between kernel.org and lmo GIT |
369 |
+GENPATCHREV="1" # Tarball revision for patches |
370 |
|
371 |
# Directories |
372 |
S="${WORKDIR}/linux-${OKV}-${GITDATE}" |
373 |
MIPS_PATCHES="${WORKDIR}/mips-patches" |
374 |
|
375 |
# Kernel-2 Vars |
376 |
-K_SECURITY_UNSUPPORTED="1" |
377 |
-K_NOUSENAME="0" |
378 |
-K_NOUSEPR="0" |
379 |
-K_USEPV="0" |
380 |
+K_SECURITY_UNSUPPORTED="yes" |
381 |
+K_NOUSENAME="yes" |
382 |
+K_NOSETEXTRAVERSION="yes" |
383 |
+K_NOUSEPR="yes" |
384 |
+K_BASE_VER="4.0" |
385 |
ETYPE="sources" |
386 |
|
387 |
# Inherit Eclasses |
388 |
@@ -41,10 +33,9 @@ BASE_KV="$(get_version_component_range 1-2).0" |
389 |
[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}" |
390 |
|
391 |
# Portage Vars |
392 |
-HOMEPAGE="http://www.linux-mips.org/ https://www.gentoo.org/" |
393 |
-SLOT="${OKV}" |
394 |
+HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/" |
395 |
KEYWORDS="-* ~mips" |
396 |
-IUSE="cobalt ip27 ip28 ip30 ip32r10k" |
397 |
+IUSE="cobalt ip27 ip28 ip30" |
398 |
DEPEND=">=sys-devel/gcc-4.6.0" |
399 |
RDEPEND="" |
400 |
|
401 |
@@ -153,8 +144,8 @@ load_eblit_funcs() { |
402 |
eblit-include show_ip22_info v3 |
403 |
eblit-include show_ip27_info v3 |
404 |
eblit-include show_ip28_info v1 |
405 |
- eblit-include show_ip30_info v3 |
406 |
- eblit-include show_ip32_info v3 |
407 |
+ eblit-include show_ip30_info v4 |
408 |
+ eblit-include show_ip32_info v4 |
409 |
eblit-include show_cobalt_info v1 |
410 |
|
411 |
# This makes sure pkg_setup & pkg_postinst gets into any binpkg. |
412 |
@@ -171,6 +162,6 @@ pkg_setup() { |
413 |
pkg_setup |
414 |
} |
415 |
|
416 |
-src_unpack() { eblit-run src_unpack v5 ; } |
417 |
+src_unpack() { eblit-run src_unpack v6 ; } |
418 |
|
419 |
#//------------------------------------------------------------------------------ |