diff options
| author | John Crispin <blogic@openwrt.org> | 2008-08-11 22:27:36 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2008-08-11 22:27:36 +0000 |
| commit | 4b924f0d7b32978e5161a716acc032ad68007e72 (patch) | |
| tree | c66c8d821b4c251a41ef47fdd7f5237766662b57 /package/firewall/Makefile | |
| parent | ecc88154322e2996c0e6f9734b8224c94d5b070a (diff) | |
| download | upstream-4b924f0d7b32978e5161a716acc032ad68007e72.tar.gz upstream-4b924f0d7b32978e5161a716acc032ad68007e72.tar.bz2 upstream-4b924f0d7b32978e5161a716acc032ad68007e72.zip | |
uci firewall
- make uci firewall default and remove old code
- fix up dependencies
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12284 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/firewall/Makefile')
| -rw-r--r-- | package/firewall/Makefile | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/package/firewall/Makefile b/package/firewall/Makefile index e073b5771c..23f23e6dc1 100644 --- a/package/firewall/Makefile +++ b/package/firewall/Makefile @@ -18,52 +18,30 @@ define Package/firewall CATEGORY:=Base system URL:=http://openwrt.org/ TITLE:=OpenWrt firewall - DEPENDS:=+iptables + DEPENDS:=+iptables +iptables-mod-ipopt +iptables-mod-extra endef define Package/firewall/description firewall for openwrt, you can select if you want to use the old version or the new uci based script endef -define Package/firewall/config - source "$(SOURCE)/Config.in" -endef - define Build/Compile true endef -ifeq ($(CONFIG_FIREWALL_NEW),y) define Package/firewall/conffiles /etc/config/firewall endef define Package/firewall/install $(INSTALL_DIR) $(1)/lib/firewall - $(INSTALL_DATA) ./files/new/uci_firewall.sh $(1)/lib/firewall + $(INSTALL_DATA) ./files/uci_firewall.sh $(1)/lib/firewall $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/new/firewall.config $(1)/etc/config/firewall + $(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall $(INSTALL_DIR) $(1)/etc/init.d/ - $(INSTALL_BIN) ./files/new/firewall.init $(1)/etc/init.d/firewall + $(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - $(INSTALL_DATA) ./files/new/20-firewall $(1)/etc/hotplug.d/iface + $(INSTALL_DATA) ./files/20-firewall $(1)/etc/hotplug.d/iface endef -else - -define Package/firewall/conffiles -/etc/firewall.config -/etc/firewall.user -endef - -define Package/firewall/install - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/old/firewall.config $(1)/etc/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/old/firewall.init $(1)/etc/init.d/firewall - $(INSTALL_BIN) ./files/old/firewall.user $(1)/etc/ - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) ./files/old/firewall.awk $(1)/usr/lib -endef -endif $(eval $(call BuildPackage,firewall)) |