Merge branch 'master' into kernel-4.7

This commit is contained in:
Ertuğrul Erata
2016-08-06 13:39:29 +03:00
20 changed files with 235 additions and 293 deletions
+4 -20
View File
@@ -5,8 +5,8 @@
<Name>module-broadcom-wl</Name>
<Homepage>http://www.broadcom.com/support/802.11/linux_sta.php</Homepage>
<Packager>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Packager>
<License>freedist</License>
<IsA>driver</IsA>
@@ -18,15 +18,9 @@
<Dependency version="4.7.0">kernel-module-headers</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">patch/linux-40.patch</Patch> -->
<!-- <Patch level="1">patch/linux-recent.patch</Patch> -->
<Patch level="1">patch/license.patch</Patch>
<Patch level="1">patch/wl_linux.c.patch</Patch>
<Patch level="1">patch/gcc.patch</Patch>
<Patch level="1">patch/wlan.patch</Patch>
<!-- <Patch level="1">patch/broadcom-sta-6.30.223.248-linux-3.18-null-pointer-crash.patch</Patch> -->
<!-- <Patch>patch/0018-cfg80211_disconnected.patch</Patch> -->
<!--Patch>patch/0019-broadcom-sta-6.30.223.248-3.18-null-pointer-fix.patch</Patch-->
<Patch level="1">patch/linux47.patch</Patch>
</Patches>
</Source>
@@ -36,9 +30,6 @@
<Dependency version="4.7.0">kernel</Dependency>
<Dependency release="current">module-broadcom-wl-userspace</Dependency>
</RuntimeDependencies>
<Replaces>
<Package>broadcom-wl</Package>
</Replaces>
<Files>
<Path fileType="library" permanent="true">/lib/modules</Path>
</Files>
@@ -65,15 +56,8 @@
</Package>
<History>
<Update release="4">
<Date>2016-07-25</Date>
<Version>6.30.223.271</Version>
<Comment>Rebuild for new kernel.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="3">
<Date>2016-06-28</Date>
<Date>2016-08-06</Date>
<Version>6.30.223.271</Version>
<Comment>Rebuild for new kernel.</Comment>
<Name>PisiLinux Community</Name>