Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build kernel-4.2

Browse Source
This commit is contained in:
Ertuğrul Erata
2015-10-01 13:58:34 +03:00
parent 25b9564863
commit 591cc458dc
16 changed files with 212 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/drivers/module-bbswitch/pspec.xml
+10 -3
View File
@@ -11,7 +11,7 @@
<Summary>Kernel module allowing to switch dedicated graphics card on Optimus laptops</Summary>
<Description>kernel module allowing to switch dedicated graphics card on Optimus laptops</Description>
<BuildDependencies>
<Dependency version="4.1.8">kernel-module-headers</Dependency>
<Dependency version="4.2.2">kernel-module-headers</Dependency>
</BuildDependencies>
<Archive sha1sum="e282ee682d794e3962baa4dead01917c42571e78" type="targz">https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz</Archive>
<Patches>
@@ -20,7 +20,7 @@
<Package>
<Name>module-bbswitch</Name>
<RuntimeDependencies>
<Dependency version="4.1.8">kernel</Dependency>
<Dependency version="4.2.2">kernel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library" permanent="true">/lib/modules</Path>
@@ -33,7 +33,14 @@
</AdditionalFiles>
</Package>
<History>
<History>
<Update release="30">
<Date>2015-10-01</Date>
<Version>0.8</Version>
<Comment>Rebuild for kernel-4.2.2.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="29">
<Date>2015-09-23</Date>
<Version>0.8</Version>
kernel/drivers/module-broadcom-wl/files/patch/0018-cfg80211_disconnected.patch
+29
View File
@@ -0,0 +1,29 @@
From b14ac6e4b871b5e15f63389ba63d1fc23a54c58b Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 4 Aug 2015 09:02:10 -0600
Subject: [PATCH] cfg80211_disconnected
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
bcmwl-6.30.223.248+bdcom/src/src/wl/sys/wl_cfg80211_hybrid.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
index ea0726f..0131f01 100644
--- a/src/wl/sys/wl_cfg80211_hybrid.c
+++ b/src/wl/sys/wl_cfg80211_hybrid.c
@@ -2047,7 +2047,11 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
}
else if ((event == WLC_E_LINK && ~(flags & WLC_EVENT_MSG_LINK)) ||
event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL);
+#else
+ cfg80211_disconnected(ndev, 0, NULL, 0, false, GFP_KERNEL);
+#endif
clear_bit(WL_STATUS_CONNECTED, &wl->status);
wl_link_down(wl);
wl_init_prof(wl->profile);
--
2.5.0
kernel/drivers/module-broadcom-wl/files/patch/0019-broadcom-sta-6.30.223.248-3.18-null-pointer-fix.patch
+27
View File
@@ -0,0 +1,27 @@
Description: Fixing null pointer crash
Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773713
Bug-Ubuntu: https://launchpad.net/bugs/1415880
Last-Update: 2015-08-18
---
src/wl/sys/wl_linux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
index 860b935..295156f 100644
--- a/src/wl/sys/wl_linux.c
+++ b/src/wl/sys/wl_linux.c
@@ -2157,8 +2157,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev)
wlif = WL_DEV_IF(dev);
wl = WL_INFO(dev);
+ skb->prev = NULL;
if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
- skb->prev = NULL;
TXQ_LOCK(wl);
--
1.9.1
kernel/drivers/module-broadcom-wl/pspec.xml
+12 -3
View File
@@ -15,7 +15,7 @@
<Archive sha1sum="e02beac9cc713011551c483ae5f20f065f5b88c7" type="targz" target="i686">http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz</Archive>
<Archive sha1sum="bd55f1fdc6b0a4d0a70dc4ba4bb4169a824e238c" type="targz" target="x86_64">http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz</Archive>
<BuildDependencies>
<Dependency version="4.1.8">kernel-module-headers</Dependency>
<Dependency version="4.2.2">kernel-module-headers</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">patch/linux-40.patch</Patch>
@@ -24,13 +24,15 @@
<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-->
</Patches>
</Source>
<Package>
<Name>module-broadcom-wl</Name>
<RuntimeDependencies>
<Dependency version="4.1.8">kernel</Dependency>
<Dependency version="4.2.2">kernel</Dependency>
<Dependency release="current">module-broadcom-wl-userspace</Dependency>
</RuntimeDependencies>
<Replaces>
@@ -61,7 +63,14 @@
</BuildFlags>
</Package>
<History>
<History>
<Update release="50">
<Date>2015-10-01</Date>
<Version>6.30.223.248</Version>
<Comment>Rebuild for kernel 4.2.2.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="49">
<Date>2015-09-23</Date>
<Version>6.30.223.248</Version>
kernel/drivers/module-virtualbox-guest/pspec.xml
+9 -2
View File
@@ -14,14 +14,14 @@
<Description>This package provides the kernel modules needed for mouse integration and shared folder support between VirtualBox host and guest systems.</Description>
<Archive sha1sum="82194515516139801fdc690198495b043d1c9cbe" type="tarxz">http://source.pisilinux.org/1.0/module-virtualbox-guest-4.3.28.tar.xz</Archive>
<BuildDependencies>
<Dependency version="4.1.8">kernel-module-headers</Dependency>
<Dependency version="4.2.2">kernel-module-headers</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>module-virtualbox-guest</Name>
<RuntimeDependencies>
<Dependency version="4.1.8">kernel</Dependency>
<Dependency version="4.2.2">kernel</Dependency>
<Dependency>baselayout</Dependency>
<Dependency version="current">module-virtualbox-guest-userspace</Dependency>
</RuntimeDependencies>
@@ -52,6 +52,13 @@
</Package>
<History>
<Update release="51">
<Date>2015-10-01</Date>
<Version>4.3.28</Version>
<Comment>Rebuild for kernel-4.2.2.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="50">
<Date>2015-08-23</Date>
<Version>4.3.28</Version>
kernel/drivers/module-virtualbox/pspec.xml
+9 -2
View File
@@ -14,14 +14,14 @@
<Description>This package provides the kernel support for VirtualBox.</Description>
<Archive sha1sum="8850ebc24e00640835b682a5f8bbc8f05313d2d7" type="tarxz">http://source.pisilinux.org/1.0/module-virtualbox-4.3.28.tar.xz</Archive>
<BuildDependencies>
<Dependency version="4.1.8">kernel-module-headers</Dependency>
<Dependency version="4.2.2">kernel-module-headers</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>module-virtualbox</Name>
<RuntimeDependencies>
<Dependency version="4.1.8">kernel</Dependency>
<Dependency version="4.2.2">kernel</Dependency>
<Dependency version="current">module-virtualbox-userspace</Dependency>
</RuntimeDependencies>
<Files>
@@ -47,6 +47,13 @@
</Package>
<History>
<Update release="54">
<Date>2015-10-01</Date>
<Version>4.3.28</Version>
<Comment>Rebuild for kernel-4.2.2.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="53">
<Date>2015-09-23</Date>
<Version>4.3.28</Version>
kernel/drivers/ndiswrapper/actions.py
+2 -1
View File
@@ -14,7 +14,8 @@ KDIR = kerneltools.getKernelVersion()
def build():
shelltools.system("patch -p1 < ndiswrapper-1.59.patch")
shelltools.system("patch -p1 < kernel-4.2.patch")
autotools.make("-C driver KVERS_UNAME=%s" % KDIR)
autotools.make("-C utils")
kernel/drivers/ndiswrapper/files/kernel-4.2.patch
+33
View File
@@ -0,0 +1,33 @@
diff -Npur "ndiswrapper-1 .59.orig/driver/loader.c" "ndiswrapper-1 .59/driver/loader.c"
--- "ndiswrapper-1 .59.orig/driver/loader.c" 2013-11-28 20:42:35.000000000 +0100
+++ "ndiswrapper-1 .59/driver/loader.c" 2015-08-01 18:25:08.302141265 +0200
@@ -22,6 +22,7 @@
#include <linux/kmod.h>
#include <linux/miscdevice.h>
#include <asm/uaccess.h>
+#include <linux/vmalloc.h>
/*
Network adapter: ClassGuid = {4d36e972-e325-11ce-bfc1-08002be10318}
diff -Npur "ndiswrapper-1 .59.orig/driver/ntoskernel.c" "ndiswrapper-1 .59/driver/ntoskernel.c"
--- "ndiswrapper-1 .59.orig/driver/ntoskernel.c" 2013-11-28 20:42:36.000000000 +0100
+++ "ndiswrapper-1 .59/driver/ntoskernel.c" 2015-08-01 18:24:55.895942032 +0200
@@ -19,6 +19,7 @@
#include "pnp.h"
#include "loader.h"
#include "ntoskernel_exports.h"
+#include <linux/vmalloc.h>
/* MDLs describe a range of virtual address with an array of physical
* pages right after the header. For different ranges of virtual
diff -Npur "ndiswrapper-1 .59.orig/driver/pe_linker.c" "ndiswrapper-1 .59/driver/pe_linker.c"
--- "ndiswrapper-1 .59.orig/driver/pe_linker.c" 2013-11-28 20:42:36.000000000 +0100
+++ "ndiswrapper-1 .59/driver/pe_linker.c" 2015-08-01 18:28:37.992752176 +0200
@@ -25,6 +25,7 @@
//#define DEBUGLINKER 2
#include "ntoskernel.h"
+#include <linux/vmalloc.h>
#endif
kernel/drivers/ndiswrapper/pspec.xml
+11 -3
View File
@@ -15,20 +15,21 @@
<Description>module-ndiswrapper allows you to use Windows XP drivers for WLAN cards without proper Linux drivers.</Description>
<Archive sha1sum="75fbbda677fe91ee07a6f6a8e19b1f3e2479540f" type="targz">http://download.sourceforge.net/ndiswrapper/ndiswrapper-1.59.tar.gz</Archive>
<BuildDependencies>
<Dependency version="4.1.8">kernel-module-headers</Dependency>
<Dependency version="4.2.2">kernel-module-headers</Dependency>
</BuildDependencies>
<Patches>
<Patch>support_kernel-4.0.patch</Patch>
</Patches>
<AdditionalFiles>
<AdditionalFile target="ndiswrapper-1.59.patch">ndiswrapper-1.59.patch</AdditionalFile>
<AdditionalFile target="kernel-4.2.patch">kernel-4.2.patch</AdditionalFile>
</AdditionalFiles>
</Source>
<Package>
<Name>ndiswrapper</Name>
<RuntimeDependencies>
<Dependency version="4.1.8">kernel</Dependency>
<Dependency version="4.2.2">kernel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library" permanent="true">/lib/modules</Path>
@@ -43,7 +44,14 @@
</BuildFlags>
</Package>
<History>
<History>
<Update release="4">
<Date>2014-10-01</Date>
<Version>1.59</Version>
<Comment>Rebuild for kernel-4.2.2.</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2014-09-23</Date>
<Version>1.59</Version>