Package: bcm43xx-source Version: 20060108-5 Severity: wishlist Tags: patch Hi,
I want to compile the module from my own kernel tree. Therefore I build the ieee80211softmac-headers package and installed it. It places its files in /usr/src/linux-headers-2.6.15.1/. I run make-kpkg from /usr/src/linux-2.6.15.1/. Hence the ieee80211softmac include files don't get found by the compiler. The attached patch uses dpatch, so you must add it to the dependencies. Bye, Jörg. -- System Information: Debian Release: unstable/experimental APT prefers unstable APT policy: (990, 'unstable'), (1, 'experimental') Architecture: powerpc (ppc) Shell: /bin/sh linked to /bin/dash Kernel: Linux 2.6.15.1 Locale: LANG=de_DE, LC_CTYPE=de_DE (charmap=ISO-8859-1) Versions of packages bcm43xx-source depends on: ii bzip2 1.0.3-2 high-quality block-sorting file co ii debhelper 5.0.20 helper programs for debian/rules ii make 3.80+3.81.b4-1 The GNU version of the "make" util ii module-assistant 0.10.2 tool to make module package creati Versions of packages bcm43xx-source recommends: ii bcm43xx-fwcutter 20060108-3 Utility for extracting Broadcom 43 -- no debconf information
diff -u -Nr modules/bcm43xx/debian/patches/00list
/usr/src/modules/bcm43xx/debian/patches/00list
--- modules/bcm43xx/debian/patches/00list 1970-01-01 01:00:00.000000000
+0100
+++ /usr/src/modules/bcm43xx/debian/patches/00list 2006-02-03
10:57:37.000000000 +0100
@@ -0,0 +1,1 @@
+external_softmac
diff -u -Nr modules/bcm43xx/debian/patches/external_softmac.dpatch
/usr/src/modules/bcm43xx/debian/patches/external_softmac.dpatch
--- modules/bcm43xx/debian/patches/external_softmac.dpatch 1970-01-01
01:00:00.000000000 +0100
+++ /usr/src/modules/bcm43xx/debian/patches/external_softmac.dpatch
2006-02-03 10:59:25.000000000 +0100
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## external_softmac.dpatch by Jörg Sommer <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch _pre_pends the include directory for the softmac files to
+## DP: make they are found before the kernel include files, i.e. override
+## DP: the kernel include files.
+
[EMAIL PROTECTED]@
+diff -urNad bcm43xx~/Makefile bcm43xx/Makefile
+--- bcm43xx~/Makefile 2006-02-03 10:56:24.000000000 +0100
++++ bcm43xx/Makefile 2006-02-03 10:56:57.923444000 +0100
+@@ -26,7 +26,7 @@
+
+ CFLAGS += -DBCM43xx_VERSION=$(VERSION) -I/lib/modules/$(KVER)/include
+ ifneq ($(SOFTMAC_DIR),)
+-CFLAGS += -I$(SOFTMAC_DIR)
++CPPFLAGS := -I$(SOFTMAC_DIR) $(CPPFLAGS)
+ endif
+
+ ifneq ($(KERNELRELEASE),)
diff -u -Nr modules/bcm43xx/debian/rules /usr/src/modules/bcm43xx/debian/rules
--- modules/bcm43xx/debian/rules 2006-01-27 10:20:40.000000000 +0100
+++ /usr/src/modules/bcm43xx/debian/rules 2006-02-03 11:29:07.000000000
+0100
@@ -12,6 +12,8 @@
# either dep/indep for things like common files or userspace components
# needed for the kernel modules.
+include /usr/share/dpatch/dpatch.make
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -58,7 +60,7 @@
# by kdist* rules by dependency. It should configure the module so it is
# ready for compilation (mostly useful for calling configure).
# prep-deb-files from module-assistant creates the neccessary debian/ files
-kdist_config: prep-deb-files
+kdist_config: prep-deb-files patch-stamp
# the kdist_clean target is called by make-kpkg modules_clean and from
# kdist* rules. It is responsible for cleaning up any changes that have
@@ -78,7 +80,7 @@
ALL_FLAVOURS=$(I386_FLAVOURS) $(POWERPC_FLAVOURS)
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
dh_testdir
touch configure-stamp
@@ -115,8 +117,11 @@
dh_clean -k
dh_installdirs
- SOFTMAC_DIR=$(KSRC)/include KDIR=$(KSRC) KVER=$(KVERS) $(MAKE)
-
+ifeq "$(wildcard $(KSRC)/include/net/ieee80211softmac.h)" ""
+ $(MAKE) SOFTMAC_DIR=/usr/src/linux-headers-$(KVERS)/include
KDIR=$(KSRC) KVER=$(KVERS)
+else
+ $(MAKE) SOFTMAC_DIR=$(KSRC)/include KDIR=$(KSRC) KVER=$(KVERS)
+endif
# Install the module
mkdir -p
debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net/bcm43xx
cp $(sname).ko
debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net/bcm43xx
@@ -147,6 +152,8 @@
-$(MAKE) clean
rm -f *.ko-*
+ -$(MAKE) -f debian/rules unpatch
+
dh_clean
install: DH_OPTIONS=
pgpRtep3yLs9c.pgp
Description: PGP signature
