build ebtables with the new patch (nothing go into usr local)

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/ebtables b/config/rootfiles/packages/ebtables
index 7e10eee41f87ff07ff2adcafc9b86084025acb59..8eab1f62ac04175ce62673e63176792c8b098db0 100644 (file)
--- a/config/rootfiles/packages/ebtables
+++ b/config/rootfiles/packages/ebtables
@@ -23,8 +23,7 @@ usr/lib/libebtable_broute.so
 usr/lib/libebtable_filter.so
 usr/lib/libebtable_nat.so
 usr/lib/libebtc.so
-#usr/local/man/man8
-#usr/local/man/man8/ebtables.8
-usr/local/sbin/ebtables
-usr/local/sbin/ebtables-restore
-usr/local/sbin/ebtables-save
+#usr/man/man8/ebtables.8
+usr/sbin/ebtables
+usr/sbin/ebtables-restore
+usr/sbin/ebtables-save

diff --git a/lfs/ebtables b/lfs/ebtables
index 0c55a21c586d42874b245c3727d5111c0643cc92..60028fdd9e846756627af53d6339948d2427a30c 100644 (file)
--- a/lfs/ebtables
+++ b/lfs/ebtables
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
        cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)"
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)