Просмотр исходного кода

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

SVN-Revision: 23369
Jo-Philipp Wich 15 лет назад
Родитель
Сommit
356ec178f0
2 измененных файлов с 18 добавлено и 2 удалено
  1. 2 2
      package/iptables/Makefile
  2. 16 0
      package/iptables/patches/100-bash-location.patch

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

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