From 356ec178f083b59f763faa577354e7591f2ab2c9 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 9 Oct 2010 17:47:55 +0000 Subject: [PATCH] iptables: don't use /bin/bash in autogen.sh, breaks FreeBSD. Also move autogen.sh invocation to Build/Configure SVN-Revision: 23369 --- package/iptables/Makefile | 4 ++-- package/iptables/patches/100-bash-location.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 package/iptables/patches/100-bash-location.patch 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 + #