X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.openwrt;h=5ccb268398b865f75491193748cd2ad2ddd21e46;hb=a6a16b4403951d0108724160ba7b9593f77e4aaa;hp=a9165985b01dcdfcad204b415374bf3126b7f808;hpb=cf0f7c3cbfae74514e4a00018c6ed2ed3c413733;p=ipfw-google.git

diff --git a/Makefile.openwrt b/Makefile.openwrt
index a916598..5ccb268 100644
--- a/Makefile.openwrt
+++ b/Makefile.openwrt
@@ -17,8 +17,7 @@ MV ?= mv
 include $(INCLUDE_DIR)/package.mk
 
 #Stuff depending on kernel version
-$(warning -------- -kernel version $(KERNEL) -------)
-
+$(warning --- openwrt kernel version $(KERNEL) linux dir $(LINUX_DIR) -------)
 
 ifeq ($(KERNEL),2.4)
     VERS:=openwrt
@@ -26,7 +25,7 @@ ifeq ($(KERNEL),2.4)
     IPFW_MOD:=ipfw_mod.o
     IPFW_SRC_DIR:=SUBDIRS
 else
-    VERS:=2.6
+    #VERS:=2.6
     IPFW_MOD:=ipfw_mod.ko
     IPFW_SRC_DIR:=M
 endif
@@ -40,7 +39,7 @@ define KernelPackage/ipfw3
  TITLE:= IPFW and dummynet
  # FILES is what makes up the module, both kernel and userland
  # It must be in the KernelPackage section
- FILES := $(PKG_BUILD_DIR)/kipfw/$(IPFW_MOD) $(PKG_BUILD_DIR)/ipfw/ipfw
+ FILES := $(PKG_BUILD_DIR)/kipfw-mod/$(IPFW_MOD) $(PKG_BUILD_DIR)/ipfw/ipfw
  # AUTOLOAD:=$(call AutoLoad,80,ipfw_mod)
 endef
 
@@ -58,21 +57,31 @@ define Build/Prepare
   # $(warning Preparing ipfw sources)
 	mkdir -p $(PKG_BUILD_DIR)
 	$(CP) -Rp $(IPFW_DIR)/* $(PKG_BUILD_DIR)/
+	# The kernel sources are spread in multiple places,
+	# so we put everything in kipfw-mod
+	mkdir -p $(PKG_BUILD_DIR)/kipfw-mod
+	cp -Rp $(IPFW_DIR)/kipfw/* $(PKG_BUILD_DIR)/kipfw-mod
+	cp `find $(IPFW_DIR)/sys -name \*.c` $(PKG_BUILD_DIR)/kipfw-mod
+	# we do not need cross parameters
 	(cd $(PKG_BUILD_DIR)/ipfw && $(MAKE) include_e )
-	(cd $(PKG_BUILD_DIR)/kipfw && $(MAKE) include_e )
+	(cd $(PKG_BUILD_DIR)/kipfw-mod && $(MAKE) include_e )
 endef
 
 define Build/Compile
-	# compile the userland part for openwrt
+	# XXX check whether we need all linux_dir etc.
 	$(MAKE) -C $(PKG_BUILD_DIR)/ipfw \
+		LINUX_DIR=$(LINUX_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_WRT) -I./include_e -I./include -include ../glue.h -DNO_ALTQ -D__BSD_VISIBLE" \
-		VER=$(VERS) all
+		_VER=$(VERS) all
+	$(warning  compile the kernel part for ipfw/openwrt)
 	# compile the kernel part for openwrt
 	$(MAKE) -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
+		LINUX_DIR=$(LINUX_DIR) \
+		KERNELPATH=$(LINUX_DIR) \
 		ARCH="$(LINUX_KARCH)" \
-		$(IPFW_SRC_DIR)="$(PKG_BUILD_DIR)/kipfw" \
+		$(IPFW_SRC_DIR)="$(PKG_BUILD_DIR)/kipfw-mod" \
 		IPFW3_ROOT="$(PKG_BUILD_DIR)" \
 		_VER=$(VERS) modules
 endef