1 |
commit: 50d614cc8c602bbc5ced0bab0c5de1ca3a91567d |
2 |
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 21 19:16:54 2019 +0000 |
4 |
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 20 11:47:03 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d614cc |
7 |
|
8 |
net-wireless/broadcom-sta: fix build for kernel 5.1, EAPI=7 |
9 |
|
10 |
* Apply Ubuntu's patch for the 5.1 kernel, taken from |
11 |
http://launchpadlibrarian.net/429676743/bcmwl_6.30.223.271+bdcom-0ubuntu4_6.30.223.271+bdcom-0ubuntu5.diff.gz. |
12 |
* Bump to EAPI 7 and use an array for PATCHES, fix one patch that didn't |
13 |
apply with -p1. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/685214 |
16 |
Closes: https://github.com/gentoo/gentoo/pull/12500 |
17 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
18 |
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org> |
19 |
|
20 |
....ebuild => broadcom-sta-6.30.223.271-r5.ebuild} | 32 ++++++++++------------ |
21 |
.../files/broadcom-sta-6.30.223.141-makefile.patch | 4 +-- |
22 |
.../broadcom-sta-6.30.223.271-r5-linux-5.1.patch | 29 ++++++++++++++++++++ |
23 |
3 files changed, 46 insertions(+), 19 deletions(-) |
24 |
|
25 |
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild |
26 |
similarity index 82% |
27 |
rename from net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild |
28 |
rename to net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild |
29 |
index 95eeba5c483..91581b52a4e 100644 |
30 |
--- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild |
31 |
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild |
32 |
@@ -1,7 +1,7 @@ |
33 |
-# Copyright 1999-2018 Gentoo Foundation |
34 |
+# Copyright 1999-2019 Gentoo Authors |
35 |
# Distributed under the terms of the GNU General Public License v2 |
36 |
|
37 |
-EAPI=5 |
38 |
+EAPI=7 |
39 |
inherit eutils linux-info linux-mod |
40 |
|
41 |
DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" |
42 |
@@ -71,22 +71,20 @@ pkg_setup() { |
43 |
BUILD_TARGETS="wl.ko" |
44 |
} |
45 |
|
46 |
-src_prepare() { |
47 |
- epatch \ |
48 |
- "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \ |
49 |
- "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \ |
50 |
- "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \ |
51 |
- "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" \ |
52 |
- "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" \ |
53 |
- "${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch" \ |
54 |
- "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.7.patch" \ |
55 |
- "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch" \ |
56 |
- "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch" \ |
57 |
- "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch" \ |
58 |
+PATCHES=( |
59 |
+ "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" |
60 |
+ "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" |
61 |
+ "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" |
62 |
+ "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" |
63 |
+ "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" |
64 |
+ "${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch" |
65 |
+ "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.7.patch" |
66 |
+ "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch" |
67 |
+ "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch" |
68 |
+ "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch" |
69 |
"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch" |
70 |
- |
71 |
- epatch_user |
72 |
-} |
73 |
+ "${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.1.patch" |
74 |
+) |
75 |
|
76 |
src_install() { |
77 |
linux-mod_src_install |
78 |
|
79 |
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch |
80 |
index 09c495d2a10..d5b97fe87eb 100644 |
81 |
--- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch |
82 |
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch |
83 |
@@ -1,5 +1,5 @@ |
84 |
---- Makefile.old 2013-04-28 22:42:59.000000000 +0200 |
85 |
-+++ Makefile 2013-04-28 22:45:53.000000000 +0200 |
86 |
+--- a/Makefile 2013-04-28 22:42:59.000000000 +0200 |
87 |
++++ b/Makefile 2013-04-28 22:45:53.000000000 +0200 |
88 |
@@ -128,9 +128,9 @@ |
89 |
|
90 |
EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped |
91 |
|
92 |
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch |
93 |
new file mode 100644 |
94 |
index 00000000000..fcee46ea3d0 |
95 |
--- /dev/null |
96 |
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch |
97 |
@@ -0,0 +1,29 @@ |
98 |
+From 20bb1a6da26c496572ee63d310cdf69a2f1553f8 Mon Sep 17 00:00:00 2001 |
99 |
+From: Seth Forshee <seth.forshee@×××××××××.com> |
100 |
+Date: Fri, 17 May 2019 20:32:20 +0000 |
101 |
+Subject: [PATCH] add support for linux 5.1 |
102 |
+ |
103 |
+get_ds() was removed and replaced universally with KERNEL_DS. |
104 |
+Provide a version of get_ds() to do likewise for 5.1 and later. |
105 |
+ |
106 |
+Signed-off-by: Seth Forshee <seth.forshee@×××××××××.com> |
107 |
+--- |
108 |
+ src/include/linuxver.h | 5 +++++ |
109 |
+ 1 file changed, 5 insertions(+) |
110 |
+ |
111 |
+diff --git a/src/include/linuxver.h b/src/include/linuxver.h |
112 |
+index b05bc32..2b88b30 100644 |
113 |
+--- a/src/include/linuxver.h |
114 |
++++ b/src/include/linuxver.h |
115 |
+@@ -591,4 +591,9 @@ do { \ |
116 |
+ #define netdev_priv(dev) dev->priv |
117 |
+ #endif |
118 |
+ |
119 |
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) |
120 |
++#include <linux/uaccess.h> |
121 |
++#define get_ds() (KERNEL_DS) |
122 |
++#endif |
123 |
++ |
124 |
+ #endif |
125 |
+-- |
126 |
+2.20.1 |