[Debian-eeepc-devel] [SCM] Packaging of rt2860-source branch, kbuild, updated. 0702b00632b71138bfbec3102f9ba28ec9b469b5

[Glenn Saberton]

The following commit has been merged in the kbuild branch:
commit 06a907b921b255fa4110588ae97bdd961cc171e9
Author: Glenn Saberton <gsaberton at foomagic.org>
Date:   Fri Nov 7 20:49:37 2008 +0900

    Rework patch series.

diff --git a/debian/patches/01_debian-makefile.patch b/debian/patches/01_debian-makefile.patch
new file mode 100644
index 0000000..644c5b6
--- /dev/null
+++ b/debian/patches/01_debian-makefile.patch
@@ -0,0 +1,32 @@
+diff --git a/Makefile b/Makefile
+index 3496a64..70405ad 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-obj-$(CONFIG_RT2860)	+= rt2860sta.o
++obj-m	+= rt2860sta.o
+ 
+ # TODO: all of these should be removed
+ EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
+@@ -6,6 +6,7 @@ EXTRA_CFLAGS += -DRT2860
+ EXTRA_CFLAGS += -DCONFIG_STA_SUPPORT
+ EXTRA_CFLAGS += -DDBG
+ EXTRA_CFLAGS += -DDOT11_N_SUPPORT
++EXTRA_CFLAGS += -DWPA_SUPPLICANT_SUPPORT -DNATIVE_WPA_SUPPLICANT_SUPPORT -DEEEPC_SPECIAL_SETTING
+ 
+ rt2860sta-objs :=	\
+ 	common/md5.o		\
+@@ -39,3 +40,13 @@ rt2860sta-objs :=	\
+ 	common/2860_rtmp_init.o	\
+ 	2860_main_dev.o		\
+ 	common/cmm_data_2860.o
++
++KSRC ?= /lib/modules/$(shell uname -r)/build
++
++all:
++	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
++
++clean:
++	rm -rf *.ko *.mod.* *.o .*.cmd .tmp_versions Module_symvers \
++	common/*.o sta/*.o common/.*.cmd sta/.*.cmd
++
diff --git a/debian/patches/01_remove-tft-lines-from-makefile.patch b/debian/patches/01_remove-tft-lines-from-makefile.patch
deleted file mode 100644
index c7bf412..0000000
--- a/debian/patches/01_remove-tft-lines-from-makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0c141da8c16c23837e8a56586c0ec742f48511ea Mon Sep 17 00:00:00 2001
-From: Glenn Saberton <gsaberton at foomagic.org>
-Date: Sat, 23 Aug 2008 15:46:03 +0800
-Subject: [PATCH] remove tft lines from makefile
-
----
- rt2860-1.7.0.0/Makefile |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -125,27 +125,9 @@ LINUX:
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
- 	cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
- 	make -C $(RT28xx_DIR)/os/linux/
--ifeq ($(RT28xx_MODE),AP)
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot
--else	
--ifeq ($(RT28xx_MODE),APSTA)
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot
--else
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
--endif	
--endif	
- else
- 	cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
- 	make  -C  $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
--ifeq ($(RT28xx_MODE),AP)
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot
--else	
--ifeq ($(RT28xx_MODE),APSTA)
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot
--else
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
--endif	
--endif
- endif
- 
- clean:
diff --git a/debian/patches/03_wpa-fix.patch b/debian/patches/03_wpa-fix.patch
index 1283600..5c39d68 100644
--- a/debian/patches/03_wpa-fix.patch
+++ b/debian/patches/03_wpa-fix.patch
@@ -31,39 +31,4 @@ Subject: [PATCH] Patch for eeepc wpa support.
 +
  #ifdef CONFIG_STA_SUPPORT
  #ifdef RT2860
- 	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
---- a/os/linux/config.mk
-+++ b/os/linux/config.mk
-@@ -5,10 +5,10 @@ HAS_ATE=n
- HAS_28xx_QA=n
- 
- # Support Wpa_Supplicant
--HAS_WPA_SUPPLICANT=n
-+HAS_WPA_SUPPLICANT=y
- 
- # Support Native WpaSupplicant for Network Maganger
--HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n
-+HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y
- 
- #Support Net interface block while Tx-Sw queue full
- HAS_BLOCK_NET_IF=n
-@@ -39,6 +39,8 @@ HAS_SINGLE_SKU_SUPPORT=n
- #Support features of 802.11n
- HAS_DOT11_N_SUPPORT=y
- 
-+#Support EeePC Special setting
-+HAS_EEEPC_SPECIAL_SETTING=y
- 
- #################################################
- 
-@@ -50,6 +52,10 @@ WFLAGS := -DAGGREGATION_SUPPORT -DPIGGYB
- 
- #################################################
- 
-+ifeq ($(HAS_EEEPC_SPECIAL_SETTING),y)
-+WFLAGS += -DEEEPC_SPECIAL_SETTING
-+endif
-+
- #ifdef CONFIG_STA_SUPPORT
- # config for STA mode
- 
+ 	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
\ No newline at end of file
diff --git a/debian/patches/04_clean-install.patch b/debian/patches/04_clean-install.patch
deleted file mode 100644
index 4451279..0000000
--- a/debian/patches/04_clean-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Do not install anything in build system's /etc directory, please
-# also, no point of running depmod as the module is not yet in /lib
---- a/os/linux/Makefile.6
-+++ b/os/linux/Makefile.6
-@@ -72,15 +72,8 @@ clean:
- 	rm -f ../../sta/.*.{cmd,flags,d}
- 
- install:
--	rm -rf $(DAT_PATH)
--	$(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless)
--	mkdir $(DAT_PATH)
--	cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/.
- 	install -d $(LINUX_SRC_MODULE)
- 	install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE)
--	/sbin/depmod -a ${shell uname -r}
- 
- uninstall:
--#	rm -rf $(DAT_PATH)
- 	rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME)))
--	/sbin/depmod -a ${shell uname -r}
diff --git a/debian/patches/series b/debian/patches/series
index b9274b4..ab68849 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-01_remove-tft-lines-from-makefile.patch
+01_debian-makefile.patch
 03_wpa-fix.patch
-04_clean-install.patch
diff --git a/debian/rules.modules b/debian/rules.modules
index ea5f3ef..6e11a35 100644
--- a/debian/rules.modules
+++ b/debian/rules.modules
@@ -20,9 +20,7 @@ binary-modules: kdist_config
 	$(MAKE) -C $(CURDIR) M=`pwd`
 	
 	# Install modules
-	$(MAKE) -C $(CURDIR) install \
-	KERNELPATH=$(KSRC) KERNELRELEASE=$(KVERS) KERNELCONF=$(KSRC)/.config \
-	LINUX_SRC_MODULE=$(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/drivers/wireless
+	dh_install rt2860sta.ko /lib/modules/$(KVERS)/kernel/drivers/net/wireless
 	# upstream has some .dat file to be used in the absence of
 	# wpa_supplicant/network-manager/iwconfig/iwpriv in /etc/Wireless
 	# ship that in doc/examples instead

-- 
Packaging of rt2860-source