Hello community, here is the log from the commit of package ndiswrapper for openSUSE:Factory checked in at Fri Nov 27 16:22:10 CET 2009. -------- --- ndiswrapper/ndiswrapper.changes 2009-09-07 19:57:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/ndiswrapper/ndiswrapper.changes 2009-11-23 12:47:36.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 23 12:35:35 CET 2009 - ro@suse.de + +- fix build on i586 (cmpxchg8b seems only exported on x86_64) +- do not build for xen kernel flavour + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fix-build.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ndiswrapper.spec ++++++ --- /var/tmp/diff_new_pack.aNUpkd/_old 2009-11-27 16:20:46.000000000 +0100 +++ /var/tmp/diff_new_pack.aNUpkd/_new 2009-11-27 16:20:46.000000000 +0100 @@ -24,19 +24,18 @@ AutoReqProv: on Summary: Use Microsoft NDIS Network Drivers for WLAN Cards Version: 1.55 -Release: 2 +Release: 3 Requires: pciutils Requires: ndiswrapper-kmp Source0: %name-%version.tar.bz2 Source2: README.SUSE Source3: preamble Patch0: ndiswrapper.diff -Patch1: fix-build.diff Url: http://ndiswrapper.sourceforge.net -License: GPL v2 or later +License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 -%suse_kernel_module_package -p %_sourcedir/preamble kdump um debug +%suse_kernel_module_package -p %_sourcedir/preamble kdump um debug xen %description Some wireless LAN vendors refuse to release hardware specifications or @@ -52,7 +51,7 @@ Pontus Fuchs <pof@users.sourceforge.net> %package KMP -License: GPL v2 or later +License: GPLv2+ Group: System/Kernel Summary: Use Microsoft NDIS Network Drivers for WLAN Cards @@ -72,7 +71,6 @@ %prep %setup %patch0 -%patch1 cp %SOURCE2 . mkdir obj ++++++ ndiswrapper.diff ++++++ --- /var/tmp/diff_new_pack.aNUpkd/_old 2009-11-27 16:20:46.000000000 +0100 +++ /var/tmp/diff_new_pack.aNUpkd/_new 2009-11-27 16:20:46.000000000 +0100 @@ -1,8 +1,19 @@ Index: utils/Makefile -=================================================================== ---- utils/Makefile.orig 2008-02-03 03:45:22.000000000 +0100 -+++ utils/Makefile 2008-02-22 02:33:40.000000000 +0100 -@@ -5,7 +5,7 @@ usrsbindir = $(DESTDIR)/usr/sbin +================================================================================ +--- driver/ntoskernel.h ++++ driver/ntoskernel.h +@@ -875,7 +875,7 @@ + #define u64_low_32(x) ((u32)x) + #define u64_high_32(x) ((u32)(x >> 32)) + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) || defined __i386__ + static inline u64 cmpxchg8b(volatile u64 *ptr, u64 old, u64 new) + { + u64 prev; +--- utils/Makefile ++++ utils/Makefile +@@ -5,7 +5,7 @@ DRIVER_DIR ?= ../driver CC = gcc @@ -11,11 +22,9 @@ DISTFILES=Makefile ndiswrapper loadndisdriver.c ndiswrapper-buginfo -Index: utils/loadndisdriver.c -=================================================================== ---- utils/loadndisdriver.c.orig 2008-02-03 03:45:22.000000000 +0100 -+++ utils/loadndisdriver.c 2008-02-22 02:30:53.000000000 +0100 -@@ -505,7 +505,7 @@ static int get_ioctl_device() +--- utils/loadndisdriver.c ++++ utils/loadndisdriver.c +@@ -505,7 +505,7 @@ int main(int argc, char *argv[0]) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org