Merge pull request #88 from ertugerata/kernel-4.1.5

Kernel 4.1.5 is ready...
This commit is contained in:
Ertuğrul Erata
2015-08-13 10:13:12 +03:00
14 changed files with 126 additions and 87 deletions
+9 -2
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.3">kernel-module-headers</Dependency>
<Dependency version="4.1.5">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.3">kernel</Dependency>
<Dependency version="4.1.5">kernel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library" permanent="true">/lib/modules</Path>
@@ -34,6 +34,13 @@
</Package>
<History>
<Update release="26">
<Date>2015-08-13</Date>
<Version>0.8</Version>
<Comment>Rebuild for kernel-4.1.5.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="25">
<Date>2015-07-23</Date>
<Version>0.8</Version>
+9 -2
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.3">kernel-module-headers</Dependency>
<Dependency version="4.1.5">kernel-module-headers</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">patch/linux-40.patch</Patch>
@@ -30,7 +30,7 @@
<Package>
<Name>module-broadcom-wl</Name>
<RuntimeDependencies>
<Dependency version="4.1.3">kernel</Dependency>
<Dependency version="4.1.5">kernel</Dependency>
<Dependency release="current">module-broadcom-wl-userspace</Dependency>
</RuntimeDependencies>
<Replaces>
@@ -62,6 +62,13 @@
</Package>
<History>
<Update release="46">
<Date>2015-08-13</Date>
<Version>6.30.223.248</Version>
<Comment>Rebuild for kernel 4.1.5.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="45">
<Date>2015-07-23</Date>
<Version>6.30.223.248</Version>
@@ -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.3">kernel-module-headers</Dependency>
<Dependency version="4.1.5">kernel-module-headers</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>module-virtualbox-guest</Name>
<RuntimeDependencies>
<Dependency version="4.1.3">kernel</Dependency>
<Dependency version="4.1.5">kernel</Dependency>
<Dependency>baselayout</Dependency>
<Dependency version="current">module-virtualbox-guest-userspace</Dependency>
</RuntimeDependencies>
@@ -51,22 +51,29 @@
</BuildFlags>
</Package>
<History>
<Update release="47">
<History>
<Update release="48">
<Date>2015-08-13</Date>
<Version>4.3.28</Version>
<Comment>Rebuild for kernel-4.1.5.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="47">
<Date>2015-07-23</Date>
<Version>4.3.28</Version>
<Comment>Rebuild for kernel-4.1.3.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="46">
</Update>
<Update release="46">
<Date>2015-07-20</Date>
<Version>4.3.28</Version>
<Comment>Rebuild for kernel-4.1.2.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="45">
</Update>
<Update release="45">
<Date>2015-07-13</Date>
<Version>4.3.28</Version>
<Comment>Rebuild for kernel-4.0.8.</Comment>
+14 -7
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.3">kernel-module-headers</Dependency>
<Dependency version="4.1.5">kernel-module-headers</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>module-virtualbox</Name>
<RuntimeDependencies>
<Dependency version="4.1.3">kernel</Dependency>
<Dependency version="4.1.5">kernel</Dependency>
<Dependency version="current">module-virtualbox-userspace</Dependency>
</RuntimeDependencies>
<Files>
@@ -47,21 +47,28 @@
</Package>
<History>
<Update release="49">
<Update release="50">
<Date>2015-08-13</Date>
<Version>4.3.28</Version>
<Comment>Rebuild for kernel-4.1.5.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="49">
<Date>2015-07-23</Date>
<Version>4.3.28</Version>
<Comment>Rebuild for kernel-4.1.3.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="48">
</Update>
<Update release="48">
<Date>2015-07-20</Date>
<Version>4.3.28</Version>
<Comment>Rebuild for kernel-4.1.2.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="47">
</Update>
<Update release="47">
<Date>2015-07-13</Date>
<Version>4.3.28</Version>
<Comment>Rebuild for kernel-4.0.8.</Comment>
+7 -2
View File
@@ -20,8 +20,13 @@ def build():
autotools.make("-C utils")
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.insinto("/lib/modules/%s/extra" % KDIR, "*/*.ko")
pisitools.dosbin("utils/ndiswrapper*", "/usr/sbin")
pisitools.dosbin("utils/loadndisdriver", "/sbin")
# add man
pisitools.doman("*.8")
pisitools.dodir("/etc/ndiswrapper")
pisitools.dodoc("README", "AUTHORS", "ChangeLog")
@@ -0,0 +1,41 @@
From: Julian Andres Klode <jak@debian.org>
Date: Tue, 12 May 2015 17:11:11 +0200
Subject: Support kernel 4.0
---
driver/ndis.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/driver/ndis.c b/driver/ndis.c
index 9ace34b..fafd2e7 100644
--- a/driver/ndis.c
+++ b/driver/ndis.c
@@ -25,6 +25,10 @@
#define MAX_ALLOCATED_NDIS_PACKETS TX_RING_SIZE
#define MAX_ALLOCATED_NDIS_BUFFERS TX_RING_SIZE
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+#define strncasecmp strnicmp
+#endif
+
static struct work_struct ndis_work;
static struct nt_list ndis_work_list;
static spinlock_t ndis_work_list_lock;
@@ -438,7 +442,7 @@ static int read_setting(struct nt_list *setting_list, char *keyname, int length,
struct wrap_device_setting *setting;
mutex_lock(&loader_mutex);
nt_list_for_each_entry(setting, setting_list, list) {
- if (strnicmp(keyname, setting->name, length) == 0) {
+ if (strncasecmp(keyname, setting->name, length) == 0) {
TRACE2("setting %s='%s'", keyname, setting->value);
mutex_unlock(&loader_mutex);
*param = ndis_encode_setting(setting, type);
@@ -502,7 +506,7 @@ wstdcall void WIN_FUNC(NdisWriteConfiguration,4)
mutex_lock(&loader_mutex);
nt_list_for_each_entry(setting, &nmb->wnd->wd->settings, list) {
- if (strnicmp(keyname, setting->name, ansi.length) == 0) {
+ if (strncasecmp(keyname, setting->name, ansi.length) == 0) {
mutex_unlock(&loader_mutex);
if (ndis_decode_setting(setting, param))
*status = NDIS_STATUS_FAILURE;
+9 -3
View File
@@ -15,8 +15,11 @@
<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.2">kernel-module-headers</Dependency>
<Dependency version="4.1.5">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>
</AdditionalFiles>
@@ -25,7 +28,7 @@
<Package>
<Name>ndiswrapper</Name>
<RuntimeDependencies>
<Dependency version="4.1.2">kernel</Dependency>
<Dependency version="4.1.5">kernel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library" permanent="true">/lib/modules</Path>
@@ -35,11 +38,14 @@
<Path fileType="executable">/sbin</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
<BuildFlags>
<Flag>noDelta</Flag>
</BuildFlags>
</Package>
<History>
<Update release="1">
<Date>2014-04-28</Date>
<Date>2014-08-13</Date>
<Version>1.59</Version>
<Comment>First release</Comment>
<Name>PisiLinux Community</Name>
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 4.1.3 Kernel Configuration
# Linux/x86_64 4.1.5 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
Binary file not shown.
@@ -1,53 +0,0 @@
From: Thomas Reitmayr <treitmayr@devbase.at>
Date: Fri, 1 May 2015 20:18:04 -0300
Subject: [PATCH] media: Fix regression in some more dib0700 based devices
Fix an oops during device initialization by correctly setting size_of_priv
instead of leaving it 0.
The regression was introduced by 8abe4a0a3f6d4217b16a ("[media] dib7000:
export just one symbol") and only fixed for one type of dib0700 based
devices in 9e334c75642b6e5bfb95 ("[media] Fix regression in some dib0700
based devices").
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=92301
Fixes: 8abe4a0a3f6d4217b16a ("[media] dib7000: export just one symbol")
Cc: stable@vger.kernel.org # for version 3.17+
Signed-off-by: Thomas Reitmayr <treitmayr@devbase.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---
drivers/media/usb/dvb-usb/dib0700_devices.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
index d7d55a20e959..c170523226aa 100644
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
@@ -3944,6 +3944,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
}},
+ .size_of_priv = sizeof(struct
+ dib0700_adapter_state),
}, {
.num_frontends = 1,
.fe = {{
@@ -3956,6 +3958,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
}},
+ .size_of_priv = sizeof(struct
+ dib0700_adapter_state),
}
},
@@ -4009,6 +4013,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
}},
+ .size_of_priv = sizeof(struct
+ dib0700_adapter_state),
},
},
@@ -183,8 +183,6 @@ input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch
### Media
###
media-Fix-regression-in-some-more-dib0700-based-devi.patch
###
### Misc
###
+10 -3
View File
@@ -28,8 +28,8 @@ i<?xml version="1.0" ?>
</BuildDependencies>
<Patches>
<!-- Linux patches -->
<Patch level="1" compressionType="xz">patches/linux/patch-4.1.3.xz</Patch>
<!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.1.3/1.mga6/PATCHES/patches/series-->
<Patch level="1" compressionType="xz">patches/linux/patch-4.1.5.xz</Patch>
<!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.1.4/1.mga6/PATCHES/patches/series-->
<Patch level="1">patches/mageia/x86-pci-toshiba-equium-a60-assign-busses.patch</Patch>
<Patch level="1">patches/mageia/x86-boot-video-80x25-if-break.patch</Patch>
<Patch level="1">patches/mageia/x86-default_poweroff_up_machines.patch</Patch>
@@ -78,7 +78,6 @@ i<?xml version="1.0" ?>
<Patch level="1">patches/mageia/gpu-drm-mach64-3.17-buildfix.patch</Patch>
<Patch level="1">patches/mageia/gpu-drm-mach64-3.18-buildfix.patch</Patch>
<Patch level="1">patches/mageia/input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch</Patch>
<Patch level="1">patches/mageia/media-Fix-regression-in-some-more-dib0700-based-devi.patch</Patch>
<Patch level="1">patches/mageia/net-sis190-fix-list-usage.patch</Patch>
<Patch level="1">patches/mageia/net-netfilter-IFWLOG.patch</Patch>
<Patch level="1">patches/mageia/net-netfilter-IFWLOG-mdv.patch</Patch>
@@ -178,6 +177,14 @@ i<?xml version="1.0" ?>
</Package>
<History>
<Update release="58">
<Date>2015-08-13</Date>
<Version>4.1.5</Version>
<Comment>Version bump to 4.1.5 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5</Comment>
<Type package="kernel">security</Type>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="57">
<Date>2015-07-23</Date>
<Version>4.1.3</Version>
+11 -4
View File
@@ -18,7 +18,7 @@
</BuildDependencies>
<Patches>
<!-- Linux patches -->
<Patch level="1" compressionType="xz">patches/linux/patch-4.1.3.xz</Patch>
<Patch level="1" compressionType="xz">patches/linux/patch-4.1.5.xz</Patch>
</Patches>
</Source>
@@ -44,14 +44,21 @@
</Provides>-->
</Package>
<History>
<Update release="56">
<Update release="57">
<Date>2015-08-13</Date>
<Version>4.1.5</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="56">
<Date>2015-07-23</Date>
<Version>4.1.3</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="55">
</Update>
<Update release="55">
<Date>2015-07-20</Date>
<Version>4.1.2</Version>
<Comment>Version bump.</Comment>