Your message dated Sat, 28 Mar 2009 17:17:11 +0000
with message-id <[email protected]>
and subject line Bug#521212: fixed in ndiswrapper 1.54-2
has caused the Debian Bug report #521212,
regarding ndiswrapper-source: fails to build against kernel 2.6.29.
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
521212: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521212
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: ndiswrapper-source
Version: 1.54-1
Severity: important
Tags: upstream, patch
Trying to build ndiswrapper-source 1.54(-1) against kernel 2.6.29 fails
with the following error messages:
/usr/bin/make -C
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper
KBUILD=/usr/src/linux-headers-2.6.29-rc8-sidux-amd64
make[3]: Entering directory
`/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper'
/usr/bin/make -C /usr/src/linux-headers-2.6.29-rc8-sidux-amd64
M=/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper
make[4]: Entering directory `/usr/src/linux-headers-2.6.29-rc8-sidux-amd64'
LD
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/built-in.o
MKEXPORT
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/crt_exports.h
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/crt.o
MKEXPORT
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/hal_exports.h
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/hal.o
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/iw_ndis.o
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/loader.o
MKEXPORT
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/ndis_exports.h
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/ndis.o
MKEXPORT
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/ntoskernel_exports.h
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/ntoskernel.o
MKEXPORT
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/ntoskernel_io_exports.h
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/ntoskernel_io.o
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/pe_linker.o
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/pnp.o
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/proc.o
MKEXPORT
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/rtl_exports.h
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/rtl.o
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/wrapmem.o
CC [M]
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/wrapndis.o
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/wrapndis.c:1747:
error: unknown field 'poll_controller' specified in initializer
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/wrapndis.c:1747:
warning: initialization from incompatible pointer type
/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/wrapndis.c:1747:
error: expected '}' before ';' token
make[5]: ***
[/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper/wrapndis.o]
Error 1
make[4]: ***
[_module_/tmp/buildd/linux-modules-sidux-main-2.6-2.6.29~rc8.git3/debian/build/build_amd64_none_sidux-amd64_ndiswrapper]
Error 2
make[4]: Leaving directory `/usr/src/linux-headers-2.6.29-rc8-sidux-amd64'
(yes, this still happens with the final 2.6.29)
The reason for this is actually two-fold, on the one hand the field name is
wrong, .poll_controller should be .ndo_poll_controller, on the other hand a
syntax error sneaked into the netdev_ops conditional (; instead of ,) which
only triggers on kernel >= 2.6.29.
fix C syntax error and field name in conditional netdev ops struct,
triggering on kernel >= 2.6.29 and CONFIG_NET_POLL_CONTROLLER=y.
Signed-off-by: Stefan Lippers-Hollmann <[email protected]>
--- a/driver/wrapndis.c
+++ b/driver/wrapndis.c
@@ -1744,7 +1744,7 @@ static const struct net_device_ops ndis_
.ndo_set_mac_address = ndis_set_mac_address,
.ndo_get_stats = ndis_get_stats,
#ifdef CONFIG_NET_POLL_CONTROLLER
- .poll_controller = ndis_poll_controller;
+ .ndo_poll_controller = ndis_poll_controller,
#endif
};
#endif
A complete debdiff is attached, build (amd64/ i386) and runtime (i386, SiS
163u) tested against 2.6.29 (the change is inside an >= 2.6.29 ifdef, so it
has no effect on <=2.6.28).
Regards
Stefan Lippers-Hollmann
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.29-0.slh.1-sidux-amd64 (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages ndiswrapper-source depends on:
ii bzip2 1.0.5-1 high-quality block-sorting file co
ii debhelper 7.2.6 helper programs for debian/rules
ii module-assistant 0.10.11.0 tool to make module package creati
ndiswrapper-source recommends no packages.
Versions of packages ndiswrapper-source suggests:
ii kernel-package 11.017 A utility for building Linux kerne
-- no debconf information
diff -u ndiswrapper-1.54/debian/rules ndiswrapper-1.54/debian/rules
--- ndiswrapper-1.54/debian/rules
+++ ndiswrapper-1.54/debian/rules
@@ -1,22 +1,23 @@
#!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
build: build-indep build-arch
build-indep: build-indep-stamp
-build-indep-stamp:
+build-indep-stamp: $(QUILT_STAMPFN)
touch $@
build-arch: build-arch-stamp
-build-arch-stamp:
+build-arch-stamp: $(QUILT_STAMPFN)
dh_testdir
$(MAKE) -C utils
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
diff -u ndiswrapper-1.54/debian/control ndiswrapper-1.54/debian/control
--- ndiswrapper-1.54/debian/control
+++ ndiswrapper-1.54/debian/control
@@ -4,7 +4,7 @@
Maintainer: Julian Andres Klode <[email protected]>
Uploaders: Kel Modderman <[email protected]>
Standards-Version: 3.8.1
-Build-Depends: debhelper (>= 5), bzip2
+Build-Depends: debhelper (>= 5), bzip2, quilt
Homepage: http://ndiswrapper.sourceforge.net/
Package: ndiswrapper-common
only in patch2:
unchanged:
--- ndiswrapper-1.54.orig/debian/patches/fix-typo-in-netdev-ops-struct.patch
+++ ndiswrapper-1.54/debian/patches/fix-typo-in-netdev-ops-struct.patch
@@ -0,0 +1,16 @@
+fix C syntax error and field name in conditional netdev ops struct,
+triggering on kernel >= 2.6.29 and CONFIG_NET_POLL_CONTROLLER=y.
+
+Signed-off-by: Stefan Lippers-Hollmann <[email protected]>
+
+--- a/driver/wrapndis.c
++++ b/driver/wrapndis.c
+@@ -1744,7 +1744,7 @@ static const struct net_device_ops ndis_
+ .ndo_set_mac_address = ndis_set_mac_address,
+ .ndo_get_stats = ndis_get_stats,
+ #ifdef CONFIG_NET_POLL_CONTROLLER
+- .poll_controller = ndis_poll_controller;
++ .ndo_poll_controller = ndis_poll_controller,
+ #endif
+ };
+ #endif
only in patch2:
unchanged:
--- ndiswrapper-1.54.orig/debian/patches/series
+++ ndiswrapper-1.54/debian/patches/series
@@ -0,0 +1 @@
+fix-typo-in-netdev-ops-struct.patch
signature.asc
Description: This is a digitally signed message part.
--- End Message ---
--- Begin Message ---
Source: ndiswrapper
Source-Version: 1.54-2
We believe that the bug you reported is fixed in the latest version of
ndiswrapper, which is due to be installed in the Debian FTP archive:
ndiswrapper-common_1.54-2_all.deb
to pool/main/n/ndiswrapper/ndiswrapper-common_1.54-2_all.deb
ndiswrapper-source_1.54-2_all.deb
to pool/main/n/ndiswrapper/ndiswrapper-source_1.54-2_all.deb
ndiswrapper-utils-1.9_1.54-2_amd64.deb
to pool/main/n/ndiswrapper/ndiswrapper-utils-1.9_1.54-2_amd64.deb
ndiswrapper_1.54-2.diff.gz
to pool/main/n/ndiswrapper/ndiswrapper_1.54-2.diff.gz
ndiswrapper_1.54-2.dsc
to pool/main/n/ndiswrapper/ndiswrapper_1.54-2.dsc
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Julian Andres Klode <[email protected]> (supplier of updated ndiswrapper package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sat, 28 Mar 2009 17:55:43 +0100
Source: ndiswrapper
Binary: ndiswrapper-common ndiswrapper-utils-1.9 ndiswrapper-source
Architecture: source all amd64
Version: 1.54-2
Distribution: unstable
Urgency: low
Maintainer: Julian Andres Klode <[email protected]>
Changed-By: Julian Andres Klode <[email protected]>
Description:
ndiswrapper-common - Common scripts required to use the utilities for
ndiswrapper
ndiswrapper-source - Source for the ndiswrapper Linux kernel module
ndiswrapper-utils-1.9 - Userspace utilities for the ndiswrapper Linux kernel
module
Closes: 521212
Changes:
ndiswrapper (1.54-2) unstable; urgency=low
.
* Fix FTBFS with kernel 2.6.29 (Closes: #521212)
- Patch by Stefan Lippers-Hollmann <[email protected]>
* debian/control: Change section of ndiswrapper-source to "kernel".
Checksums-Sha1:
d7805d350262f992677f5c114fa2b0ab164bbe04 1124 ndiswrapper_1.54-2.dsc
dd521eed967fdd896eb301cc39d5438f0df70d75 11004 ndiswrapper_1.54-2.diff.gz
4e5bbe3b859c67b95aadc16d110cd7b7489932fe 21116
ndiswrapper-common_1.54-2_all.deb
f0db39334284333fc79125d5cd4aaa1944338c43 161508
ndiswrapper-source_1.54-2_all.deb
9a42dd0ad4ab60015a1ea33f5391e3cc3ab2424a 36386
ndiswrapper-utils-1.9_1.54-2_amd64.deb
Checksums-Sha256:
df735e0b90d9335df5ad94d7670f850204ee2af31e149b6fa7635389330e7f07 1124
ndiswrapper_1.54-2.dsc
242f846db332c89d081bbba1b9ee08d3fc422902f117408d779108096b849c3c 11004
ndiswrapper_1.54-2.diff.gz
c64d1c8aee24b4c5e72cdc30957c2d3c1f30af9e0831fc355b0946ffd6e35b9a 21116
ndiswrapper-common_1.54-2_all.deb
113844d50fc81a7c3868a92cbafbed402b2adccff174cbef53d53a89c5114623 161508
ndiswrapper-source_1.54-2_all.deb
6dc6fc0a55aa3f098d5ef15a9c7a5d6bd17ea17cd96c8772d4d20e009d9a92cf 36386
ndiswrapper-utils-1.9_1.54-2_amd64.deb
Files:
0e10bbd55488c18ef093ab5ab077cda5 1124 misc optional ndiswrapper_1.54-2.dsc
4ae1e03774089d329a3464f543ebf863 11004 misc optional ndiswrapper_1.54-2.diff.gz
98fb0e22db6f1bab6b6197a44b8d3083 21116 misc optional
ndiswrapper-common_1.54-2_all.deb
09b24f8a46671147e33a56cfba333c43 161508 kernel optional
ndiswrapper-source_1.54-2_all.deb
3aeef07c4a83c9ad609236439cb58bdc 36386 misc optional
ndiswrapper-utils-1.9_1.54-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAknOWJcACgkQrCpf/gCCPsLNtACgo5FwKbscB6KCvpqZL/II4+2B
/sAAnjBAvy0RzjJWweRcaf0QO9RFzicO
=9aLy
-----END PGP SIGNATURE-----
--- End Message ---
