From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 9 Oct 2010 17:47:55 +0000 (+0000)
Subject: [package] iptables: don't use /bin/bash in autogen.sh, breaks FreeBSD. Also move... 
X-Git-Tag: fast2504n-3.10.28-merged~10875
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=bc5689e8e70c3f6b94562430eba3601007488f58;p=openwrt.git

[package] iptables: don't use /bin/bash in autogen.sh, breaks FreeBSD. Also move autogen.sh invocation to Build/Configure


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23369 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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
+ #