Libvirt and ebtables [2]

Libvirt and ebtables [2]

[Jonatan Schlag]

[-- Attachment #1: Type: text/plain, Size: 650 bytes --]


Hi,
this is the new patch series for ebtables. Now the binaries are installed into /usr/sbin (libvirt should find them there). 
I tried to achieve this with more instructions for make install (make install LIBDIR=/usr/lib MANDIR=/usr/share/man SBINDIR=/usr/sbin) but this work only partially. The binaries were still installed into /usr/local/sbin.
To avoid this definitely I create a patch for the Makefile of ebtables and now  nothing is installed into /usr/local. 
The first patch creates the patch file for ebtables the second contain the necessary change for the rootfile and the lfs file.
I hope this solution is ok.

Regards Jonatan

[PATCH 1/2] add a patch for ebtables (to fix the problem with usr local)

[Jonatan Schlag]

[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 ...ables-should-install-nothing-in-usr-local.patch | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch

diff --git a/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch b/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
new file mode 100644
index 0000000..2cccb90
--- /dev/null
+++ b/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
@@ -0,0 +1,28 @@
+From 373fb7d2d22fcf3328702e719793526e215822ca Mon Sep 17 00:00:00 2001
+From: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
+Date: Thu, 24 Mar 2016 18:35:51 +0100
+Subject: [PATCH] ebtables should install nothing in usr local
+
+Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c1106a4..b5f4447 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,8 +10,8 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed 's/\(.*\)\/.*/\1/')/
+ 
+ # default paths
+ LIBDIR:=/usr/lib
+-MANDIR:=/usr/local/man
+-BINDIR:=/usr/local/sbin
++MANDIR:=/usr/man
++BINDIR:=/usr/sbin
+ ETCDIR:=/etc
+ INITDIR:=/etc/rc.d/init.d
+ SYSCONFIGDIR:=/etc/sysconfig
+-- 
+2.1.4
+
-- 
2.1.4

[PATCH 2/2] build ebtables with the new patch (nothing go into usr local)

[Jonatan Schlag]

[-- Attachment #1: Type: text/plain, Size: 1337 bytes --]

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 config/rootfiles/packages/ebtables | 9 ++++-----
 lfs/ebtables                       | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/packages/ebtables b/config/rootfiles/packages/ebtables
index 7e10eee..8eab1f6 100644
--- 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 0c55a21..60028fd 100644
--- 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)
-- 
2.1.4

[PATCH 3/3] bump ebtables version number

[Jonatan Schlag]

[-- Attachment #1: Type: text/plain, Size: 447 bytes --]

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 lfs/ebtables | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lfs/ebtables b/lfs/ebtables
index 60028fd..0fe9731 100644
--- a/lfs/ebtables
+++ b/lfs/ebtables
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ebtables
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
-- 
2.1.4

Re: Libvirt and ebtables [2]

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1026 bytes --]

Hi,

apologies for not reviewing this earlier...

This looks good. I merged the patches. You can commit things like these in just
one commit. Especially adding the patch file and applying that should be one
commit. Just as a hint for the future.

Merged.

Best,
-Michael

On Fri, 2016-03-25 at 11:13 +0100, Jonatan Schlag wrote:
> Hi,
> this is the new patch series for ebtables. Now the binaries are installed into
> /usr/sbin (libvirt should find them there). 
> I tried to achieve this with more instructions for make install (make install
> LIBDIR=/usr/lib MANDIR=/usr/share/man SBINDIR=/usr/sbin) but this work only
> partially. The binaries were still installed into /usr/local/sbin.
> To avoid this definitely I create a patch for the Makefile of ebtables and
> now  nothing is installed into /usr/local. 
> The first patch creates the patch file for ebtables the second contain the
> necessary change for the rootfile and the lfs file.
> I hope this solution is ok.
> 
> Regards Jonatan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]