fix firewall script, add ar7 network if into the bridge by default

[openwrt.git] / target / linux / package / Makefile

diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index 055bd2f..a08d904 100644 (file)
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -2,39 +2,48 @@
 include $(TOPDIR)/rules.mk
 
 package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
+package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
 package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
 package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
+package-y += openwrt
+
+ifeq ($(BOARD),brcm)
+package-y += nvram
+
 ifeq ($(LINUX_VERSION),2.4.30)
 package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
 endif
 
+nvram-compile: openwrt-compile
+endif
+
 all: compile install
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 compile: $(patsubst %,%-compile,$(package-y) $(package-m))
 install: $(patsubst %,%-install,$(package-y))
 
-%-prepare:
-       $(MAKE) -C $(patsubst %-prepare,%,$@) \
+MAKEOPTS:=     BOARD="$(BOARD)" \
+               IPKG="$(IPKG)" \
                TARGET_DIR="$(TARGET_DIR)" \
                BUILD_DIR="$(BUILD_DIR)" \
                KERNEL_DIR="$(KERNEL_DIR)" \
                LINUX_VERSION="$(LINUX_VERSION)" \
+               KERNEL_RELEASE="$(KERNEL_RELEASE)"
+
+
+%-prepare:
+       $(MAKE) -C $(patsubst %-prepare,%,$@) \
+               $(MAKEOPTS) \
                prepare
 
 %-compile: %-prepare 
        $(MAKE) -C $(patsubst %-compile,%,$@) \
-               TARGET_DIR="$(TARGET_DIR)" \
-               BUILD_DIR="$(BUILD_DIR)" \
-               KERNEL_DIR="$(KERNEL_DIR)" \
-               LINUX_VERSION="$(LINUX_VERSION)" \
+               $(MAKEOPTS) \
                compile
 
 %-install: %-compile
        $(MAKE) -C $(patsubst %-install,%,$@) \
-               TARGET_DIR="$(TARGET_DIR)" \
-               BUILD_DIR="$(BUILD_DIR)" \
-               KERNEL_DIR="$(KERNEL_DIR)" \
-               LINUX_VERSION="$(LINUX_VERSION)" \
+               $(MAKEOPTS) \
                install
 
 %-clean: