Browse Source

update: self-build-broadcom-wl

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11260 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 5 years ago
parent
commit
478f95da18

+ 16 - 0
nonfree/self-build-broadcom-wl/broadcom-wl-vl.spec

@@ -25,6 +25,13 @@ Source0:	%{downloadurl}/hybrid-v35_64-nodebug-pcoem-%{over}.tar.gz
 Source1:	blacklist-broadcom.conf
 
 #Patch100:	broadcom-wl-kernel318.patch
+# Patches from Debian-sid
+Patch101:	14-rdtscl.patch
+Patch102:	15-linux47.patch
+Patch103:	16-linux48.patch
+Patch104:	17-fix-kernel-warnings.patch
+Patch105:	18-linux411.patch
+Patch106:	19-linux412.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -64,6 +71,12 @@ installation of firmware, or ndiswrapper.
 %prep
 %setup -q -T -c -a0
 #%patch100 -p0 -b .kernel318
+%patch101 -p2 -b .rdtscl
+%patch102 -p2 -b .linux47
+%patch103 -p2 -b .linux48
+%patch104 -p2 -b .fix-kernel-warnings
+%patch105 -p2 -b .linux411
+%patch106 -p2 -b .linux412
 
 %install
 %{__rm} -rf %{buildroot}
@@ -113,6 +126,9 @@ dkms remove  -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all || :
 
 
 %changelog
+* Tue Dec 05 2017 Toshiaki Ara <ara_t@384.jp> 6.30.223.271-3
+- add patches for build with kernel 4.12
+
 * Wed Nov 22 2017 Toshiaki Ara <ara_t@384.jp> 6.30.223.271-2
 - change download URL
 

+ 17 - 3
nonfree/self-build-broadcom-wl/self-build-broadcom-wl-vl.spec

@@ -17,11 +17,18 @@ Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
 Name:		%{name}
 Version:	6.30.223.271
-Release: 	2%{?_dist_release}
+Release: 	3%{?_dist_release}
 Source0:	%{pkgname}-vl.spec
 Source1:	blacklist-broadcom.conf
 
 Source100:	broadcom-wl-kernel318.patch
+# Patches from Debian-sid
+Source101:	14-rdtscl.patch
+Source102:	15-linux47.patch
+Source103:	16-linux48.patch
+Source104:	17-fix-kernel-warnings.patch
+Source105:	18-linux411.patch
+Source106:	19-linux412.patch
 
 License:	Freeware and GPLv2 with exception
 Group:		Restricted Software
@@ -98,8 +105,12 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}
 sed -e 's|##VERSION##|%{version}|g' -e 's|##RELEASE##|%{release}|g' \
 	%{SOURCE0} > %{buildroot}%{_datadir}/%{name}/%{pkgname}-vl.spec
 
-%{__install} -m 644 %{SOURCE100} \
-	     $RPM_BUILD_ROOT/%{_datadir}/%{name}
+# %{__install} -m 644 %{SOURCE100} \
+# 	     $RPM_BUILD_ROOT/%{_datadir}/%{name}
+%{__install} -m 644 \
+ %{SOURCE101} %{SOURCE102} %{SOURCE103} \
+ %{SOURCE104} %{SOURCE105} %{SOURCE106} \
+ $RPM_BUILD_ROOT/%{_datadir}/%{name}
 
 
 %clean
@@ -117,6 +128,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 05 2017 Toshiaki Ara <ara_t@384.jp> 6.30.223.271-3
+- add patches for build with kernel 4.12
+
 * Wed Nov 22 2017 Toshiaki Ara <ara_t@384.jp> 6.30.223.271-2
 - change download URL