commit: b3f13ea5172f487bcd2787466d1af40aef48ed36
Author: Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 17:33:05 2016 +0000
Commit: Joshua Kinard <kumba <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 17:33:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3f13ea5
sys-kernel/mips-sources: bump to latest 4.4 LTS kernel & 4.8 kernel.
Includes numerous changes to enhance IP27 and IP30 support over the
past few kernel releases. IP27 still has issues, but should be
usable at this point.
Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-kernel/mips-sources/Manifest | 16 ++++-----
...pkg_postinst-v1.eblit => pkg_postinst-v2.eblit} | 4 +--
.../{pkg_setup-v1.eblit => pkg_setup-v2.eblit} | 14 ++------
..._ip27_info-v3.eblit => show_ip27_info-v4.eblit} | 6 ++--
..._ip30_info-v4.eblit => show_ip30_info-v5.eblit} | 37 ++++++++++----------
..._ip32_info-v4.eblit => show_ip32_info-v5.eblit} | 5 +--
.../{src_unpack-v6.eblit => src_unpack-v7.eblit} | 25 +++++++++-----
sys-kernel/mips-sources/metadata.xml | 10 +++---
...ces-4.2.8.ebuild => mips-sources-4.4.39.ebuild} | 40 +++++++++++++---------
...ces-4.3.3.ebuild => mips-sources-4.8.15.ebuild} | 34 ++++++++++--------
10 files changed, 99 insertions(+), 92 deletions(-)
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 73dfa7e..240a4d2 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,8 +1,8 @@
-DIST linux-4.2.tar.xz 85507784 SHA256
cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512
a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee
WHIRLPOOL
2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0
-DIST linux-4.3.tar.xz 86920812 SHA256
4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512
d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc
WHIRLPOOL
e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
-DIST mips-sources-4.2.0-patches-v4.tar.xz 156096 SHA256
171594c765df5beeb21170d1934fd0652eb58a6b5164694e946608acd94bc6e4 SHA512
8ca6bc5ff25576a7d4d9c79fab22520a5b4a6cc4b1dfe6fd254fb150eb6aabcfa4131c558b6fcfc490e4c6910c78042c1d94452e68b791bfd09f1b7b7b2f49d0
WHIRLPOOL
02842d4aca54c6c4f3eefe968317bc9da7748bb84ff5df7215ac2d775aae9e532661fe14b20fcde9ee431f12d812783ab62189b8b1424d6e68aad59e10989486
-DIST mips-sources-4.3.0-patches-v1.tar.xz 151104 SHA256
a08b5180eda10b71e229a9cb1da577412b64bba0dee12748754cbe1dcbb5c79c SHA512
33c216a2923b82778a36cc77bcd49b985974551c81b4102c8783119bbf72a23cfb6e6e3e7c9412fff0fd5310f289956e313ee72da6797e1d1e42111d971662d5
WHIRLPOOL
6c80f80718f11815e72f9a4eb3e812d0c1bfb13831ef638e5fe4f27182ddd3ea858f398289527e2c5a7f647b763f2ec7361f3159d602468fbb828d01f22d33de
-DIST mipsgit-4.2.0-20151126.diff.xz 6308 SHA256
a6f71ddc5f22008f4e3fdd57fa457dc5b9a1bbfc4e66b064bc02c9b04e0f0916 SHA512
58311ed6a6d3292d5f977c7514ae7357c77b96c98282ba5e9a2425b2278c9d8a90599393413cf640ec5b538707e23d06f9b46c158f8685c9ce96fcb99a9f9be2
WHIRLPOOL
ca5b63ec1bd817689bb564ed63ed32f0295f926c0f64c69b1342bf357e50105a9c16d0489b2d4a8d3c6aa519bb35461ec1f948adb12909297377e4aab5e01fc1
-DIST mipsgit-4.3.0-20151126.diff.xz 2184 SHA256
a919800a221e0fdb4cffca8a24eb42b156818eec2ea666d126866c3effab9938 SHA512
fb50654f0727e031aa7e37b39e4054cedf80d1be5f81f69d03e39c07181f35c95727a637436237f1f75afadaa8af5f5ec3090809adc14b49b5054de89b9daf23
WHIRLPOOL
dd61d9727600fe30834f4d6c3a8e12e5848b90580b1b24f30c769df08f72582c012fae9c3e08fcbbe846216e2cb6d36502f79c7ce9a592017609839155d5683a
-DIST patch-4.2.8.xz 267084 SHA256
712f93e2f5e8985248852753189001b036b8366008b8c10e3421bb1d45fc20bf SHA512
6353f1fb4e4d4229a9d45f61f666800beb04240d228499f4c4e84a9c7b32fb5a008698d906a722c996251bcf7d82426811a0a679243ff17fded88320c93ec325
WHIRLPOOL
5b6aa338c1b5f68acebb0783a579ef8aa57710cd992edf00f3df4feac63b7ac47426d74c2b4bf44c569df600cb10cbe01e055db6f952be435016d5c1cd9ce7da
-DIST patch-4.3.3.xz 72360 SHA256
95cd81fcbb87953f672150d60950548edc04a88474c42de713b91811557fefa5 SHA512
1b9cc343a589a7cdaa66284b3d7129be9869195f5b839dac0222050af42dc7a7451d4e2bf176c1a9939d6572a44a9b6f4534b0c7a79032881a9bc8f8f56c9c69
WHIRLPOOL
0a949df196f2b9d744af703910fc5a9a3da555648b190bd58febc14da1fdfc229f3528d38157dca3671301713857feaa747d0cf18a9477f62bd22d2ad1729472
+DIST linux-4.4.tar.xz 87295988 SHA256
401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512
13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
WHIRLPOOL
02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
+DIST linux-4.8.tar.xz 91966856 SHA256
3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a SHA512
a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c8790734b1d22182cf1f930fb87eaaa84e62ec8cc1f64ac4be9b949e7c0358
WHIRLPOOL
3888c8c07db0c069f827245d4d7306087f78f7d03e8240eb1fcd13622cd5dbe1c17cd8ed7dc11513f77f3efd5dbd84e2b48e82bdb9b9bfd2242fd62ae32812d5
+DIST mips-sources-4.4.0-patches-v2.tar.xz 156396 SHA256
7aa6ab5628c9094b2aab39e47a102ad6d9c021c6bd8e9dfc6cddece8fc8baaca SHA512
4186ee382037ec32126976ba453f78fc80c627a4ebdd79d8462f12559eb06dce25f926f3c205c7c4e5032cb501942ee10c8cb3a17339352cec3cf565c669dd52
WHIRLPOOL
86aba7143b3c38f34db0a68fc889d83676f6006eab594b89c13ea5d5abfd02ef64056472ad194aafbe15a86033c171e1fd06c0c7ffd6542cec19e553d7d6a716
+DIST mips-sources-4.8.0-patches-v1.tar.xz 218452 SHA256
4322e03fe7bb383cb6a9ab0e93ae8bc06b6911c6f2441baa3341dc2df5428e1f SHA512
ff4e1ab26f085b4d64bcb8410dd0478debb2a92c24e70bb11d460bf69b5e61a17f7116913e1a71cd7e89ea15a6a5d52118cefc15e918b9155a9780069271c907
WHIRLPOOL
5445d05a5a3b7e8cb24d09cef62317a87add0bb22f65719fdae8cc35459ac89819002b6d16d72041e28ba8cde11871a8badedc027103cc5dddc0581169441cc8
+DIST mipsgit-4.4.0-20160123.diff.xz 1908 SHA256
71ada981970c6271765fc4cb45af1899fdc32419b5493802ff3af8febd211fe3 SHA512
0086c470064dd4e5c2fefd8161b70200475659fe925e68d374ff139b506147c39163f366be689bbb92a9aaf72e8c58cdaaaff5def6718c5e87ff7e047551a1f8
WHIRLPOOL
973bc1f626566dc13be8bd315b1339ddecda2008ef829258b8d82b1220d146115960f11808970e34299a9bdffa2e08e4e730bde4cbd3d49a1850c386ac90e9e3
+DIST mipsgit-4.8.0-20161016.diff.xz 1932 SHA256
ad0ba84c2710cfc07c7a215a435d5aa89dd477172577c4d6bbecc2195208e9ec SHA512
578792e7ce7a5c25e6acccc442ada9b829cec9d113390e5aa705359d1bf6b1d67fb6ce761eac418d411fdaf3312b04c4cbaee17d0127ef69d6c1f4a1467f75cd
WHIRLPOOL
9382d87f0d71754272a1fa06eff1c4d413aa4554b903e138f5001456b7817e6780d744e82fee8681310852b864fc7b2fa7143d9303f7c728f769bcbe481c2fe5
+DIST patch-4.4.39.xz 861392 SHA256
fc2b60d221aeaf3eafec4f36f299e4002be81da85117c3f59963fdcb6facb929 SHA512
c4ab325bb4d49bc3fd12d55bb3c98aecdcd165aee6146afe4548607188bcb4f3ca18c8bf0c6f77fdac79b2c03c8ef369c4ac1ee9ed281362e54ab1e6298c48da
WHIRLPOOL
69b078e290f833752a0d0daa351828367e823f6a4762b52d69cfc2394334dfb106988f0a50d38cb881999cdc0abd62ed5ec21428819901670a295cfcc8fb63e8
+DIST patch-4.8.15.xz 268816 SHA256
cdeff3a6e0dc3d6189d1b1d4d6318f0942b9a28409491cf65592879e4c42b1f7 SHA512
d819c86f3fe93ee1d083fdce954ae06a683a22e8b0864da170714c5230c4c2fdecc29270194b1ad8a715b836b493141c8ff2c09e76a84426b7a89ebc31fb9e01
WHIRLPOOL
36ce7b4f47cb0f86991794f9e8df0160c8f38b1153d413082636f31edba2bcbbff2c5584062800b48c9471dbcb77f825f58d509f4641a9e48a1d396216860155
diff --git a/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit
b/sys-kernel/mips-sources/files/eblits/pkg_postinst-v2.eblit
similarity index 85%
rename from sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit
rename to sys-kernel/mips-sources/files/eblits/pkg_postinst-v2.eblit
index 7c76ffd..5848974 100644
--- a/sys-kernel/mips-sources/files/eblits/pkg_postinst-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/pkg_postinst-v2.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,7 +8,7 @@
eblit-mips-sources-pkg_postinst() {
# Symlink /usr/src/linux as appropriate
local my_ksrc="${S##*/}"
- for x in {ip27,ip28,ip30,cobalt}; do
+ for x in {ip27,ip28,ip30}; do
use ${x} && my_ksrc="${my_ksrc}.${x}"
done
diff --git a/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit
b/sys-kernel/mips-sources/files/eblits/pkg_setup-v2.eblit
similarity index 82%
rename from sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit
rename to sys-kernel/mips-sources/files/eblits/pkg_setup-v2.eblit
index b1b4ff9..3ee357f 100644
--- a/sys-kernel/mips-sources/files/eblits/pkg_setup-v1.eblit
+++ b/sys-kernel/mips-sources/files/eblits/pkg_setup-v2.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,22 +7,12 @@
# Some machine patches are mutually-exclusive to avoid conflicts:
# Affected: ip27 ip28 ip30
-# Not Affected: cobalt ip22 ip32
+# Not Affected: ip22 ip32
eblit-mips-sources-pkg_setup() {
local arch_is_selected="no"
local m_ip m_enable m_name
- # See if we're on a cobalt system first (must use the cobalt-mips
profile)
- if use cobalt; then
- arch_is_selected="yes"
- [ "${DO_CBLT}" = "test" ]
\
- && err_disabled_mach "Cobalt Microsystems" "CBLT"
"cobalt" "test"
- [ "${DO_CBLT}" = "no" ]
\
- && err_disabled_mach "Cobalt Microsystems" "CBLT"
"cobalt"
- show_cobalt_info
- fi
-
# Exclusive machine patchsets
# These are not allowed to be mixed together, thus only one of them may
be applied
# to a tree per merge.
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip27_info-v3.eblit
b/sys-kernel/mips-sources/files/eblits/show_ip27_info-v4.eblit
similarity index 81%
rename from sys-kernel/mips-sources/files/eblits/show_ip27_info-v3.eblit
rename to sys-kernel/mips-sources/files/eblits/show_ip27_info-v4.eblit
index 2f5dfef..a36db4e 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip27_info-v3.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip27_info-v4.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,8 +10,8 @@
show_ip27_info() {
echo -e ""
- ewarn "Heavy disk I/O on recent kernels may randomly trigger a BUG() in"
- ewarn "isolate_lru_pages() in mm/vmscan.c. The exact trigger cause is"
+ ewarn "Heavy disk I/O on recent kernels may randomly trigger a
VM_BUG_ON_PAGE()"
+ ewarn "in move_freepages() in mm/page_alloc.c. The exact trigger cause
is"
ewarn "unknown at this time. Please report any oops messages from this"
ewarn "bug to bugs.gentoo.org (assign to [email protected])"
echo -e ""
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v4.eblit
b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v5.eblit
similarity index 63%
rename from sys-kernel/mips-sources/files/eblits/show_ip30_info-v4.eblit
rename to sys-kernel/mips-sources/files/eblits/show_ip30_info-v5.eblit
index 90c3e5b..d1fd439 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip30_info-v4.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip30_info-v5.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,34 +10,33 @@
show_ip30_info() {
echo -e ""
- einfo "Octane SMP support works again as-of 4.1! Celebrate!"
- echo -e ""
eerror "Things that DON'T work:"
- eerror "\t- Do NOT use CONFIG_TRANSPARENT_HUGEPAGE, otherwise, when the
machine"
- eerror "\t\040\040starts to boot into userland, it will trigger
Instruction"
- eerror "\t\040\040Bus Errors (IBEs), which requires a complete
powerdown of the"
- eerror "\t\040\040machine for about 15 seconds to clear."
- eerror "\t- DO NOT USE CONFIG_SLUB, otherwise, you'll get errors when
booting"
- eerror "\t\040\040regarding duplicate /sys/kernel/slab/* entries in"
- eerror "\t\040\040sysfs."
- eerror "\t- Greater than 2GB memory causes problems with DMA. This is
a long-standing"
- eerror "\t\040\040problem and patches to fix it by DMA experts would be
greatly"
- eerror "\t\040\040appreciated!"
- eerror "\t- Do not use OHCI-based USB cards in Octane. They're broke
on this machine."
- eerror "\t\040\040Patches are welcome to fix the issue."
+ eerror "\t- Do not use CONFIG_SLUB, otherwise, you'll get errors when
booting"
+ eerror "\t\040\040regarding duplicate /sys/kernel/slab/* entries in
sysfs."
+ eerror "\t- Impact (MGRAS) Xorg driver no longer functions due to
severe bitrot."
+ eerror "\t- Octane is limited to a maximum of 2GB of memory right now
due to a"
+ eerror "\t\040\040hardware quirk in the BRIDGE PCI chip that limits
BRIDGE DMA"
+ eerror "\t\040\040addresses to 31-bits when converted into physical
addresses."
+ eerror "\t\040\040Patches that attempt to fix the issue are highly
welcome."
echo -e ""
ewarn "Things that might work, but have problems, or are unknown:"
+ ewarn "\t- CONFIG_TRANSPARENT_HUGEPAGE should work now, but there may
still be"
+ ewarn "\t\040\040intermittent issues. Additionally, CONFIG_HUGETLBFS
must also be"
+ ewarn "\t\040\040selected for hugepages to work. If use of this
feature continues"
+ ewarn "\t\040\040to trigger random Instruction Bus Errors (IBEs), then
it is best to"
+ ewarn "\t\040\040disable the functionality and perform a cold reset of
the machine"
+ ewarn "\t\040\040after powering it down for at least 30 seconds."
ewarn "\t- Serial support on the Octane uses a very basic UART driver
that drives"
ewarn "\t\040\040the 16550A chip on the IOC3 directly. It does not use
interrupts,"
ewarn "\t\040\040only a polling routine on a timer, which makes it slow
and CPU-"
ewarn "\t\040\040intensive. The baud rate is limited to no more than
38.4kbps on"
ewarn "\t\040\040this driver. Patches for getting the Altix IOC3
serial driver to"
ewarn "\t\040\040work (which uses DMA and supports faster baud rates)
are welcome."
- ewarn "\t- UHCI Cards are known to have issues, but should still have
some functionality."
+ ewarn "\t- UHCI Cards are known to have issues, but should still
function."
ewarn "\t\040\040This issue primarily manifests itself when using
pl2303 USB->Serial"
ewarn "\t\040\040adapters."
ewarn "\t- MENET boards appear to have the four ethernet ports
detected, however"
- ewarn "\t\040\040the six serial ports didn't appear to get picked up by
the IOC3"
+ ewarn "\t\040\040the six serial ports don't appear to get picked up by
the IOC3"
ewarn "\t\040\040UART driver. The NIC part number is also not read
correctly"
ewarn "\t\040\040from the four Number-In-a-Cans. Additional testing
would be"
ewarn "\t\040\040appreciated and patches welcome."
@@ -47,8 +46,8 @@ show_ip30_info() {
echo -e ""
einfo "Things that DO work:"
einfo "\t- SMP works again, celebrate!"
- einfo "\t- Impact (MGRAS) console and X driver, please report any bugs."
- einfo "\t- VPro (Odyssey) console, but no X driver exists yet."
+ einfo "\t- Impact (MGRAS) console only."
+ einfo "\t- VPro (Odyssey) console only (no X driver exists yet)."
einfo "\t- PCI Card Cages should work for many devices, except certain
types like"
einfo "\t\040\040PCI-to-PCI bridges (USB hubs, USB flash card readers
for example)."
einfo "\t- SCSI, RTC, basic PCI, IOC3 Ethernet, keyboard, and mouse.
Please"
diff --git a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v4.eblit
b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v5.eblit
similarity index 81%
rename from sys-kernel/mips-sources/files/eblits/show_ip32_info-v4.eblit
rename to sys-kernel/mips-sources/files/eblits/show_ip32_info-v5.eblit
index daac6d9..2e9f3e0 100644
--- a/sys-kernel/mips-sources/files/eblits/show_ip32_info-v4.eblit
+++ b/sys-kernel/mips-sources/files/eblits/show_ip32_info-v5.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,9 +15,6 @@ show_ip32_info() {
einfo "\t- Framebuffer console is limited to 4MB. Anything greater"
einfo "\t\040\040specified when building the kernel will likely oops"
einfo "\t\040\040or panic the kernel."
- einfo "\t- A new RTC driver is included that uses the RTC class"
- einfo "\t\040\040framework to interface with the O2's Dallas/Maxim
1687-5"
- einfo "\t\040\040RTC chip. Please report any bugs to the MIPS Team."
einfo "\t- X support is limited to the generic fbdev driver. No X"
einfo "\t\040\040gbefb driver exists for O2 yet. Feel free to submit"
einfo "\t\040\040patches!"
diff --git a/sys-kernel/mips-sources/files/eblits/src_unpack-v6.eblit
b/sys-kernel/mips-sources/files/eblits/src_unpack-v7.eblit
similarity index 73%
rename from sys-kernel/mips-sources/files/eblits/src_unpack-v6.eblit
rename to sys-kernel/mips-sources/files/eblits/src_unpack-v7.eblit
index c1428ea..c303519 100644
--- a/sys-kernel/mips-sources/files/eblits/src_unpack-v6.eblit
+++ b/sys-kernel/mips-sources/files/eblits/src_unpack-v7.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,8 +14,8 @@ eblit-mips-sources-src_unpack() {
cd "${WORKDIR}"
unpack "${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
- # Create a new folder, patch-symlinks, and create symlinks to
- # mips-patches in there. If we want to exclude a patch, we'll
+ # Create a new folder called 'patch-symlinks' and create symlinks to
+ # all mips-patches in there. If we want to exclude a patch, we'll
# just delete the symlink instead of the actual patch.
local psym="patch-symlinks"
mkdir "${psym}"
@@ -30,22 +30,31 @@ eblit-mips-sources-src_unpack() {
# See 0000_README for the patch numbers and their meanings.
local p_generic="51*"
local p_ip27="52*" p_ip28="53*" p_ip30="54*"
+ local p_xp="80*"
use ip27 && unset p_generic p_ip27
use ip28 && unset p_ip28
use ip30 && unset p_generic p_ip30
+ use experimental && unset p_xp
- # Remove symlinks for any patches that we don't want applied. We do
- # this by looping through all the above variables, and deleting
+ # Remove symlinks for any patches that we don't want applied. We
+ # do this by looping through all the above variables, and deleting
# matching symlinks that point to the corresponding patches.
# The remaining symlinks will be applied to the kernel source.
- local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30}"
- for x in $patchlist; do rm -f "./${x}"; done
+ #
+ # $P_EXCLUDE is a new var that can be set in an ebuild to exclude
+ # specific patches by wildcarding the patch number.
+ local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_xp}
${P_EXCLUDE}"
+ for x in $patchlist;
+ do rm -f "./${x}"
+ done
# Rename the source tree to match the linux-mips git checkout date and
# machine type.
local fkv="${F_KV%-*}"
local v="${fkv}-${GITDATE}"
- for x in {ip27,ip28,ip30,cobalt}; do use ${x} && v="${v}.${x}" &&
break; done
+ for x in {ip27,ip28,ip30}; do
+ use ${x} && v="${v}.${x}" && break
+ done
mv "${WORKDIR}/linux-${fkv/_/-}" "${WORKDIR}/linux-${v}" || die
S="${WORKDIR}/linux-${v}"
diff --git a/sys-kernel/mips-sources/metadata.xml
b/sys-kernel/mips-sources/metadata.xml
index c513f83..eaa2cd0 100644
--- a/sys-kernel/mips-sources/metadata.xml
+++ b/sys-kernel/mips-sources/metadata.xml
@@ -7,13 +7,13 @@
</maintainer>
<longdescription>
- mips-sources are git snapshots from the Linux-Mips.org git
server for MIPS-Based machines
+ mips-sources are git snapshots from the linux-mips.org git
server for MIPS-Based machines
</longdescription>
<use>
- <flag name="cobalt">Enables support for Cobalt Microserver
hardware (Qube2/RaQ2)</flag>
- <flag name="ip27">Enables support for SGI Origin (IP27)</flag>
- <flag name="ip28">Enables support for SGI Indigo2 Impact R10000
(IP28)</flag>
- <flag name="ip30">Enables support for SGI Octane (IP30,
'Speedracer')</flag>
+ <flag name="ip27">Enables additional support for SGI Origin
(IP27)</flag>
+ <flag name="ip28">Enables additional support for SGI Indigo2
Impact R10000 (IP28)</flag>
+ <flag name="ip30">Enables support for SGI Octane (IP30,
'Speedracer')</flag>
+ <flag name="experimental">Apply experimental (80xx)
patches.</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
diff --git a/sys-kernel/mips-sources/mips-sources-4.2.8.ebuild
b/sys-kernel/mips-sources/mips-sources-4.4.39.ebuild
similarity index 85%
rename from sys-kernel/mips-sources/mips-sources-4.2.8.ebuild
rename to sys-kernel/mips-sources/mips-sources-4.4.39.ebuild
index 0e93e52..32ecdf3 100644
--- a/sys-kernel/mips-sources/mips-sources-4.2.8.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.4.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,8 +8,8 @@ EAPI="5"
#//------------------------------------------------------------------------------
# Version Data
-GITDATE="20151126" # Date of diff between kernel.org and
lmo GIT
-GENPATCHREV="4" # Tarball revision for patches
+GITDATE="20160123" # Date of diff between kernel.org and
lmo GIT
+GENPATCHREV="2" # Tarball revision for patches
# Directories
S="${WORKDIR}/linux-${OKV}-${GITDATE}"
@@ -20,13 +20,18 @@ K_SECURITY_UNSUPPORTED="yes"
K_NOUSENAME="yes"
K_NOSETEXTRAVERSION="yes"
K_NOUSEPR="yes"
-K_BASE_VER="4.2"
+K_BASE_VER="4.3"
+K_FROM_GIT="yes"
ETYPE="sources"
# Inherit Eclasses
inherit kernel-2 eutils
detect_version
+# EPATCH Vars
+# XXX: Required to properly apply Impact/Odyssey driver patches.
+EPATCH_OPTS="-F3"
+
# Version Data
F_KV="${PVR}"
BASE_KV="$(get_version_component_range 1-2).0"
@@ -35,9 +40,15 @@ BASE_KV="$(get_version_component_range 1-2).0"
# Portage Vars
HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/";
KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30"
-DEPEND=">=sys-devel/gcc-4.6.0"
+IUSE="experimental ip27 ip28 ip30"
RDEPEND=""
+DEPEND="${RDEPEND}
+ >=sys-devel/gcc-4.7.0
+ >=sys-devel/patch-2.7.4"
+
+# Specify any patches or patch familes to NOT apply here.
+# Use only the 4-digit number followed by a '*'.
+P_EXCLUDE=""
# Machine Support Control Variables
DO_IP22="test" # If "yes", enable IP22 support
(SGI Indy, Indigo2 R4x00)
@@ -45,7 +56,6 @@ DO_IP27="yes" # IP27
support (SGI Origin)
DO_IP28="test" # IP28 support
(SGI Indigo2 Impact R10000)
DO_IP30="yes" # IP30 support
(SGI Octane)
DO_IP32="yes" # IP32 support
(SGI O2, R5000/RM5200 Only)
-DO_CBLT="test" # Cobalt Support
(Cobalt Microsystems)
# Machine Stable Version Variables
SV_IP22="" # If set && DO_IP22 == "no", indicates
last "good" IP22 version
@@ -53,14 +63,13 @@ SV_IP27="" # DO_IP27 ==
"no", IP27
SV_IP28="" # DO_IP28 == "no",
IP28
SV_IP30="" # DO_IP30 == "no",
IP30
SV_IP32="" # DO_IP32 == "no",
IP32
-SV_CBLT="" # DO_CBLT == "no",
Cobalt
DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
SRC_URI="${KERNEL_URI}
mirror://gentoo/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz
mirror://gentoo/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
-UNIPATCH_STRICTORDER="1"
+UNIPATCH_STRICTORDER="yes"
UNIPATCH_LIST="${DISTDIR}/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz"
#//------------------------------------------------------------------------------
@@ -142,16 +151,15 @@ load_eblit_funcs() {
eblit-include err_disabled_mach v1
eblit-include err_only_one_mach_allowed v1
eblit-include show_ip22_info v3
- eblit-include show_ip27_info v3
+ eblit-include show_ip27_info v4
eblit-include show_ip28_info v1
- eblit-include show_ip30_info v4
- eblit-include show_ip32_info v4
- eblit-include show_cobalt_info v1
+ eblit-include show_ip30_info v5
+ eblit-include show_ip32_info v5
# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
- eblit-pkg setup v1
- eblit-pkg postinst v1
+ eblit-pkg setup v2
+ eblit-pkg postinst v2
# Eblit load complete
MIPS_SOURCES_EBLITS_LOADED=1
@@ -162,6 +170,6 @@ pkg_setup() {
pkg_setup
}
-src_unpack() { eblit-run src_unpack v6 ; }
+src_unpack() { eblit-run src_unpack v7 ; }
#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-4.3.3.ebuild
b/sys-kernel/mips-sources/mips-sources-4.8.15.ebuild
similarity index 88%
rename from sys-kernel/mips-sources/mips-sources-4.3.3.ebuild
rename to sys-kernel/mips-sources/mips-sources-4.8.15.ebuild
index 53b423e..e419d9b 100644
--- a/sys-kernel/mips-sources/mips-sources-4.3.3.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.8.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,7 +8,7 @@ EAPI="5"
#//------------------------------------------------------------------------------
# Version Data
-GITDATE="20151126" # Date of diff between kernel.org and
lmo GIT
+GITDATE="20161016" # Date of diff between kernel.org and
lmo GIT
GENPATCHREV="1" # Tarball revision for patches
# Directories
@@ -20,7 +20,8 @@ K_SECURITY_UNSUPPORTED="yes"
K_NOUSENAME="yes"
K_NOSETEXTRAVERSION="yes"
K_NOUSEPR="yes"
-K_BASE_VER="4.3"
+K_BASE_VER="4.7"
+K_FROM_GIT="yes"
ETYPE="sources"
# Inherit Eclasses
@@ -39,9 +40,15 @@ BASE_KV="$(get_version_component_range 1-2).0"
# Portage Vars
HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/";
KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30"
-DEPEND=">=sys-devel/gcc-4.6.0"
+IUSE="experimental ip27 ip28 ip30"
RDEPEND=""
+DEPEND="${RDEPEND}
+ >=sys-devel/gcc-4.7.0
+ >=sys-devel/patch-2.7.4"
+
+# Specify any patches or patch familes to NOT apply here.
+# Use only the 4-digit number followed by a '*'.
+P_EXCLUDE=""
# Machine Support Control Variables
DO_IP22="test" # If "yes", enable IP22 support
(SGI Indy, Indigo2 R4x00)
@@ -49,7 +56,6 @@ DO_IP27="yes" # IP27
support (SGI Origin)
DO_IP28="test" # IP28 support
(SGI Indigo2 Impact R10000)
DO_IP30="yes" # IP30 support
(SGI Octane)
DO_IP32="yes" # IP32 support
(SGI O2, R5000/RM5200 Only)
-DO_CBLT="test" # Cobalt Support
(Cobalt Microsystems)
# Machine Stable Version Variables
SV_IP22="" # If set && DO_IP22 == "no", indicates
last "good" IP22 version
@@ -57,14 +63,13 @@ SV_IP27="" # DO_IP27 ==
"no", IP27
SV_IP28="" # DO_IP28 == "no",
IP28
SV_IP30="" # DO_IP30 == "no",
IP30
SV_IP32="" # DO_IP32 == "no",
IP32
-SV_CBLT="" # DO_CBLT == "no",
Cobalt
DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
SRC_URI="${KERNEL_URI}
mirror://gentoo/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz
mirror://gentoo/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
-UNIPATCH_STRICTORDER="1"
+UNIPATCH_STRICTORDER="yes"
UNIPATCH_LIST="${DISTDIR}/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz"
#//------------------------------------------------------------------------------
@@ -146,16 +151,15 @@ load_eblit_funcs() {
eblit-include err_disabled_mach v1
eblit-include err_only_one_mach_allowed v1
eblit-include show_ip22_info v3
- eblit-include show_ip27_info v3
+ eblit-include show_ip27_info v4
eblit-include show_ip28_info v1
- eblit-include show_ip30_info v4
- eblit-include show_ip32_info v4
- eblit-include show_cobalt_info v1
+ eblit-include show_ip30_info v5
+ eblit-include show_ip32_info v5
# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
- eblit-pkg setup v1
- eblit-pkg postinst v1
+ eblit-pkg setup v2
+ eblit-pkg postinst v2
# Eblit load complete
MIPS_SOURCES_EBLITS_LOADED=1
@@ -166,6 +170,6 @@ pkg_setup() {
pkg_setup
}
-src_unpack() { eblit-run src_unpack v6 ; }
+src_unpack() { eblit-run src_unpack v7 ; }
#//------------------------------------------------------------------------------
