aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-10-09 17:47:55 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-10-09 17:47:55 +0000
commit356ec178f083b59f763faa577354e7591f2ab2c9 (patch)
tree4ddd403e9192ef279ae0ebd92e5e250eeacbdf3d
parent2cf31be8576034647d2c9eaeee58a56c789463f9 (diff)
downloadupstream-356ec178f083b59f763faa577354e7591f2ab2c9.tar.gz
upstream-356ec178f083b59f763faa577354e7591f2ab2c9.tar.bz2
upstream-356ec178f083b59f763faa577354e7591f2ab2c9.zip
iptables: don't use /bin/bash in autogen.sh, breaks FreeBSD. Also move autogen.sh invocation to Build/Configure
SVN-Revision: 23369
-rw-r--r--package/iptables/Makefile4
-rw-r--r--package/iptables/patches/100-bash-location.patch16
2 files changed, 18 insertions, 2 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 8609b6d7c4..e637771871 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -305,9 +305,9 @@ MAKE_FLAGS := \
KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
KBUILD_OUTPUT="$(LINUX_DIR)" \
-define Build/Prepare
-$(call Build/Prepare/Default)
+define Build/Configure
(cd $(PKG_BUILD_DIR); ./autogen.sh)
+$(call Build/Configure/Default)
endef
define Build/InstallDev
diff --git a/package/iptables/patches/100-bash-location.patch b/package/iptables/patches/100-bash-location.patch
new file mode 100644
index 0000000000..818246e76b
--- /dev/null
+++ b/package/iptables/patches/100-bash-location.patch
@@ -0,0 +1,16 @@
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ autoreconf -fi;
+ rm -Rf autom4te*.cache;
+--- a/iptables-apply
++++ b/iptables-apply
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ #
+ # iptables-apply -- a safer way to update iptables remotely
+ #