Libvirt hard dependencies [2]

Libvirt hard dependencies [2]

[Jonatan Schlag]

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


Hi,
this is the second patch series for the hard dependencies of Libvirt.
The only difference between this series and the previous one ist that the rootfiles of all build dependencies are moved into config/rootfiles/common. 
Everything should build now.

@Michael Tremer :
I will send a patch series for dmidecode standalone because there are some  patches which are recommended by the project for dmidecode 3.
These patches would blow up this patch series to much. 

Regards Jonatan

[PATCH 1/4] New package util-macros (required by libpciaccess (only for build))

[Jonatan Schlag]

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

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 config/rootfiles/common/util-macros |  4 ++
 lfs/util-macros                     | 83 +++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 config/rootfiles/common/util-macros
 create mode 100644 lfs/util-macros

diff --git a/config/rootfiles/common/util-macros b/config/rootfiles/common/util-macros
new file mode 100644
index 0000000..1858667
--- /dev/null
+++ b/config/rootfiles/common/util-macros
@@ -0,0 +1,4 @@
+#usr/share/aclocal/xorg-macros.m4
+#usr/share/pkgconfig/xorg-macros.pc
+#usr/share/util-macros
+#usr/share/util-macros/INSTALL
diff --git a/lfs/util-macros b/lfs/util-macros
new file mode 100644
index 0000000..f2c347f
--- /dev/null
+++ b/lfs/util-macros
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  <info(a)ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.19.0
+
+THISAPP    = util-macros-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = util-macros
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 40e1caa49a71a26e0aa68ddd00203717
+
+install : $(TARGET)
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:.
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
-- 
2.1.4

[PATCH 2/4] New package libpciaccess (required by libvirt)

[Jonatan Schlag]

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

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 config/rootfiles/packages/libpciaccess |  7 +++
 lfs/libpciaccess                       | 83 ++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 config/rootfiles/packages/libpciaccess
 create mode 100644 lfs/libpciaccess

diff --git a/config/rootfiles/packages/libpciaccess b/config/rootfiles/packages/libpciaccess
new file mode 100644
index 0000000..d4a3c41
--- /dev/null
+++ b/config/rootfiles/packages/libpciaccess
@@ -0,0 +1,7 @@
+#usr/include/pciaccess.h
+#usr/lib/libpciaccess.a
+#usr/lib/libpciaccess.la
+#usr/lib/libpciaccess.so
+usr/lib/libpciaccess.so.0
+usr/lib/libpciaccess.so.0.11.1
+#usr/lib/pkgconfig/pciaccess.pc
diff --git a/lfs/libpciaccess b/lfs/libpciaccess
new file mode 100644
index 0000000..0df4f45
--- /dev/null
+++ b/lfs/libpciaccess
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  <info(a)ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.13.4
+
+THISAPP    = libpciaccess-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = libpciaccess
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = cc1fad87da60682af1d5fa43a5da45a4
+
+install : $(TARGET)
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:.
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
-- 
2.1.4

[PATCH 3/4] New package libyajl (required by libvirt)

[Jonatan Schlag]

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

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 config/rootfiles/packages/libyajl | 13 ++++++
 lfs/libyajl                       | 83 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 config/rootfiles/packages/libyajl
 create mode 100644 lfs/libyajl

diff --git a/config/rootfiles/packages/libyajl b/config/rootfiles/packages/libyajl
new file mode 100644
index 0000000..f575f6a
--- /dev/null
+++ b/config/rootfiles/packages/libyajl
@@ -0,0 +1,13 @@
+usr/bin/json_reformat
+usr/bin/json_verify
+#usr/include/yajl
+#usr/include/yajl/yajl_common.h
+#usr/include/yajl/yajl_gen.h
+#usr/include/yajl/yajl_parse.h
+#usr/include/yajl/yajl_tree.h
+#usr/include/yajl/yajl_version.h
+#usr/lib/libyajl.so
+usr/lib/libyajl.so.2
+usr/lib/libyajl.so.2.1.0
+#usr/lib/libyajl_s.a
+#usr/share/pkgconfig/yajl.pc
diff --git a/lfs/libyajl b/lfs/libyajl
new file mode 100644
index 0000000..41f70ac
--- /dev/null
+++ b/lfs/libyajl
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  <info(a)ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.1.0
+
+THISAPP    = libyajl-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = libyajl
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)
+
+$(DL_FILE)_MD5 = 58c61232e1be991fd9a7ceecfc78836c
+
+install : $(TARGET)
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:.
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && cmake -DCMAKE_INSTALL_PREFIX=/usr .
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
-- 
2.1.4

[PATCH 4/4] Add all new packages (util-macros, libpciaccess, libyajl) to make.sh

[Jonatan Schlag]

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

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 make.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/make.sh b/make.sh
index da4bf16..565596a 100755
--- a/make.sh
+++ b/make.sh
@@ -851,6 +851,9 @@ buildipfire() {
   ipfiremake lua
   ipfiremake dnsdist
   ipfiremake bird
+  ipfiremake util-macros
+  ipfiremake libpciaccess
+  ipfiremake libyajl
 }
 
 buildinstaller() {
-- 
2.1.4

Re: Libvirt hard dependencies [2]

[Michael Tremer]

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

This looks good.

I would still like to delay the merge until the remaining parts are ready
because this is useless until then.

Best,
-Michael

On Tue, 2016-03-29 at 21:52 +0200, Jonatan Schlag wrote:
> Hi,
> this is the second patch series for the hard dependencies of Libvirt.
> The only difference between this series and the previous one ist that the
> rootfiles of all build dependencies are moved into config/rootfiles/common. 
> Everything should build now.
> 
> @Michael Tremer :
> I will send a patch series for dmidecode standalone because there are
> some  patches which are recommended by the project for dmidecode 3.
> These patches would blow up this patch series to much. 
> 
> Regards Jonatan

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

Re: [PATCH 4/4] Add all new packages (util-macros, libpciaccess, libyajl) to make.sh

[Michael Tremer]

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

Okay, I will wait for the updated patchset.

Will you send a patch for dmidecode in a different commit? I didn't quite get
what the problem is with this.

Best,
-Michael

On Sat, 2016-03-26 at 09:13 +0100, Jonatan Schlag wrote:
> Hi,
> util-macros will not build not  spice-protocol python-pyparsing and python-
> six.
> Sorry, I do not notice that this was the wrong thread.
> 
> Regards Jonatan
> 
> Am Sa, 26. Mär, 2016 um 9:11 schrieb Jonatan Schlag <jonatan.schlag(a)ipfire.org
> >:
> > Hi,
> > sadly I have to write that this series is superseded.
> > The creation of the packages fails because spice-protocol python-pyparsing
> > and python-six are empty. 
> > Tar do not like to pack empty packages. 
> > 
> > Regards Jonatan

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

[PATCH 4/4] Add all new packages (util-macros, libpciaccess, libyajl) to make.sh

[Jonatan Schlag]

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

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 make.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/make.sh b/make.sh
index da4bf16..565596a 100755
--- a/make.sh
+++ b/make.sh
@@ -851,6 +851,9 @@ buildipfire() {
   ipfiremake lua
   ipfiremake dnsdist
   ipfiremake bird
+  ipfiremake util-macros
+  ipfiremake libpciaccess
+  ipfiremake libyajl
 }
 
 buildinstaller() {
-- 
2.1.4