[arch-commits] Commit in ndiswrapper-arch/repos/community-testing-x86_64 (4 files)
Jan Steffens
heftig at archlinux.org
Sun Nov 10 15:11:03 UTC 2019
Date: Sunday, November 10, 2019 @ 15:11:03
Author: heftig
Revision: 526453
archrelease: copy trunk to community-testing-x86_64
Added:
ndiswrapper-arch/repos/community-testing-x86_64/PKGBUILD
(from rev 526447, ndiswrapper-arch/trunk/PKGBUILD)
ndiswrapper-arch/repos/community-testing-x86_64/linux-5.3.patch
(from rev 526450, ndiswrapper-arch/trunk/linux-5.3.patch)
Deleted:
ndiswrapper-arch/repos/community-testing-x86_64/PKGBUILD
ndiswrapper-arch/repos/community-testing-x86_64/linux-5.3.patch
-----------------+
PKGBUILD | 76 ++++++++++++++---------------
linux-5.3.patch | 138 +++++++++++++++++++++++++++---------------------------
2 files changed, 107 insertions(+), 107 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-10 15:11:02 UTC (rev 526452)
+++ PKGBUILD 2019-11-10 15:11:03 UTC (rev 526453)
@@ -1,38 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: maz-1 <loveayawaka at gmail.com>
-
-pkgname=ndiswrapper-arch
-pkgver=1.62
-pkgrel=2
-pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors, kernel module for Arch kernel"
-arch=('x86_64')
-url="https://sourceforge.net/projects/ndiswrapper/"
-license=('GPL')
-makedepends=('linux-headers')
-provides=('NDISWRAPPER-MODULE')
-replaces=('ndiswrapper-module')
-source=("https://sourceforge.net/projects/ndiswrapper/files/stable/ndiswrapper-$pkgver.tar.gz"
- 'linux-5.3.patch')
-sha512sums=('a6e111bc699572642e44d6d31cc2f06374648a01b8dd7dd4e74d6ad5e187e39f99faee38f792c83a94d4618ae4d8866914fb3f60b1d80e838a753285ea7cf783'
- 'c404f35280534b172235c5c578657d7a30ac2253c7c2abedd65a183d09390e95e7c3030cb409accb4d198ff0411482f8029f8664418c99d5672f92e9c733801d')
-
-prepare() {
- cd ndiswrapper-$pkgver
- patch --no-backup-if-mismatch -p2 -i "$srcdir"/linux-5.3.patch
-}
-
-build() {
- _kernver="$(</usr/src/linux/version)"
-
- cd ndiswrapper-$pkgver
- make -C driver KVERS_UNAME="$_kernver"
-}
-
-package() {
- depends=('linux')
-
- _extradir="/usr/lib/modules/$(</usr/src/linux/version)/extramodules"
- cd ndiswrapper-$pkgver
- install -Dt "$pkgdir$_extradir" -m644 driver/*.ko
- find "$pkgdir" -name '*.ko' -exec xz {} +
-}
Copied: ndiswrapper-arch/repos/community-testing-x86_64/PKGBUILD (from rev 526447, ndiswrapper-arch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-10 15:11:03 UTC (rev 526453)
@@ -0,0 +1,38 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: maz-1 <loveayawaka at gmail.com>
+
+pkgname=ndiswrapper-arch
+pkgver=1.62
+pkgrel=3
+pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors, kernel module for Arch kernel"
+arch=('x86_64')
+url="https://sourceforge.net/projects/ndiswrapper/"
+license=('GPL')
+makedepends=('linux-headers')
+provides=('NDISWRAPPER-MODULE')
+replaces=('ndiswrapper-module')
+source=("https://sourceforge.net/projects/ndiswrapper/files/stable/ndiswrapper-$pkgver.tar.gz"
+ 'linux-5.3.patch')
+sha512sums=('a6e111bc699572642e44d6d31cc2f06374648a01b8dd7dd4e74d6ad5e187e39f99faee38f792c83a94d4618ae4d8866914fb3f60b1d80e838a753285ea7cf783'
+ 'c404f35280534b172235c5c578657d7a30ac2253c7c2abedd65a183d09390e95e7c3030cb409accb4d198ff0411482f8029f8664418c99d5672f92e9c733801d')
+
+prepare() {
+ cd ndiswrapper-$pkgver
+ patch --no-backup-if-mismatch -p2 -i "$srcdir"/linux-5.3.patch
+}
+
+build() {
+ _kernver="$(</usr/src/linux/version)"
+
+ cd ndiswrapper-$pkgver
+ make -C driver KVERS_UNAME="$_kernver"
+}
+
+package() {
+ depends=('linux')
+
+ _extradir="/usr/lib/modules/$(</usr/src/linux/version)/extramodules"
+ cd ndiswrapper-$pkgver
+ install -Dt "$pkgdir$_extradir" -m644 driver/*.ko
+ find "$pkgdir" -name '*.ko' -exec xz {} +
+}
Deleted: linux-5.3.patch
===================================================================
--- linux-5.3.patch 2019-11-10 15:11:02 UTC (rev 526452)
+++ linux-5.3.patch 2019-11-10 15:11:03 UTC (rev 526453)
@@ -1,69 +0,0 @@
-diff --git a/ndiswrapper/driver/ntoskernel.c b/ndiswrapper/driver/ntoskernel.c
-index 4fe0dc1..4dd7a89 100644
---- a/ndiswrapper/driver/ntoskernel.c
-+++ b/ndiswrapper/driver/ntoskernel.c
-@@ -2524,7 +2524,11 @@ int ntoskernel_init(void)
- info->task = NULL;
- info->count = 0;
- #ifdef CONFIG_SMP
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- cpumask_setall(&info->cpus_allowed);
-+#else
-+ cpumask_setall(&info->cpus_mask);
-+#endif
- #endif
- }
- } while (0);
-diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
-index 3c4c6ff..8a71ae3 100644
---- a/ndiswrapper/driver/ntoskernel.h
-+++ b/ndiswrapper/driver/ntoskernel.h
-@@ -107,7 +107,11 @@ static cpumask_t cpumasks[NR_CPUS];
- #endif /* CONFIG_SMP */
-
- #ifndef tsk_cpus_allowed
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
-+#else
-+#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_mask)
-+#endif
- #endif
-
- #ifndef __packed
-@@ -631,7 +635,12 @@ struct irql_info {
- int count;
- struct mutex lock;
- #ifdef CONFIG_SMP
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- cpumask_t cpus_allowed;
-+#else
-+ const cpumask_t *cpus_ptr;
-+ cpumask_t cpus_mask;
-+#endif
- #endif
- struct task_struct *task;
- };
-@@ -658,7 +667,11 @@ static inline KIRQL raise_irql(KIRQL newirql)
- /* TODO: is this enough to pin down to current cpu? */
- #ifdef CONFIG_SMP
- assert(task_cpu(current) == smp_processor_id());
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- cpumask_copy(&info->cpus_allowed, tsk_cpus_allowed(current));
-+#else
-+ cpumask_copy(&info->cpus_mask, tsk_cpus_allowed(current));
-+#endif
- set_cpus_allowed_ptr(current, cpumask_of(smp_processor_id()));
- #endif
- put_cpu_var(irql_info);
-@@ -682,7 +695,11 @@ static inline void lower_irql(KIRQL oldirql)
- if (--info->count == 0) {
- info->task = NULL;
- #ifdef CONFIG_SMP
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- set_cpus_allowed_ptr(current, &info->cpus_allowed);
-+#else
-+ set_cpus_allowed_ptr(current, &info->cpus_mask);
-+#endif
- #endif
- mutex_unlock(&info->lock);
- }
Copied: ndiswrapper-arch/repos/community-testing-x86_64/linux-5.3.patch (from rev 526450, ndiswrapper-arch/trunk/linux-5.3.patch)
===================================================================
--- linux-5.3.patch (rev 0)
+++ linux-5.3.patch 2019-11-10 15:11:03 UTC (rev 526453)
@@ -0,0 +1,69 @@
+diff --git a/ndiswrapper/driver/ntoskernel.c b/ndiswrapper/driver/ntoskernel.c
+index 4fe0dc1..4dd7a89 100644
+--- a/ndiswrapper/driver/ntoskernel.c
++++ b/ndiswrapper/driver/ntoskernel.c
+@@ -2524,7 +2524,11 @@ int ntoskernel_init(void)
+ info->task = NULL;
+ info->count = 0;
+ #ifdef CONFIG_SMP
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
+ cpumask_setall(&info->cpus_allowed);
++#else
++ cpumask_setall(&info->cpus_mask);
++#endif
+ #endif
+ }
+ } while (0);
+diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
+index 3c4c6ff..8a71ae3 100644
+--- a/ndiswrapper/driver/ntoskernel.h
++++ b/ndiswrapper/driver/ntoskernel.h
+@@ -107,7 +107,11 @@ static cpumask_t cpumasks[NR_CPUS];
+ #endif /* CONFIG_SMP */
+
+ #ifndef tsk_cpus_allowed
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
+ #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
++#else
++#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_mask)
++#endif
+ #endif
+
+ #ifndef __packed
+@@ -631,7 +635,12 @@ struct irql_info {
+ int count;
+ struct mutex lock;
+ #ifdef CONFIG_SMP
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
+ cpumask_t cpus_allowed;
++#else
++ const cpumask_t *cpus_ptr;
++ cpumask_t cpus_mask;
++#endif
+ #endif
+ struct task_struct *task;
+ };
+@@ -658,7 +667,11 @@ static inline KIRQL raise_irql(KIRQL newirql)
+ /* TODO: is this enough to pin down to current cpu? */
+ #ifdef CONFIG_SMP
+ assert(task_cpu(current) == smp_processor_id());
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
+ cpumask_copy(&info->cpus_allowed, tsk_cpus_allowed(current));
++#else
++ cpumask_copy(&info->cpus_mask, tsk_cpus_allowed(current));
++#endif
+ set_cpus_allowed_ptr(current, cpumask_of(smp_processor_id()));
+ #endif
+ put_cpu_var(irql_info);
+@@ -682,7 +695,11 @@ static inline void lower_irql(KIRQL oldirql)
+ if (--info->count == 0) {
+ info->task = NULL;
+ #ifdef CONFIG_SMP
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
+ set_cpus_allowed_ptr(current, &info->cpus_allowed);
++#else
++ set_cpus_allowed_ptr(current, &info->cpus_mask);
++#endif
+ #endif
+ mutex_unlock(&info->lock);
+ }
More information about the arch-commits
mailing list