libvirt: uprev to 1.3.2

Release notes here http://libvirt.org/news.html.

Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Yunguo Wei 2016-03-31 15:55:44 +08:00 committed by Bruce Ashfield
parent 2bb28a781f
commit da65e83a39
7 changed files with 87 additions and 126 deletions

View File

@ -1,4 +1,4 @@
From 62514c8c2925e48a4f20ce3d7d48387851cb76a5 Mon Sep 17 00:00:00 2001 From 8353dc1e642011199c3b3ba057d51d8768e4cd54 Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimaohui@cn.fujitsu.com> From: Lei Maohui <leimaohui@cn.fujitsu.com>
Date: Fri, 31 Jul 2015 03:17:07 +0900 Date: Fri, 31 Jul 2015 03:17:07 +0900
Subject: [PATCH] to fix build error Subject: [PATCH] to fix build error
@ -13,32 +13,34 @@ The error likes as following
| make[3]: *** Waiting for unfinished jobs.... | make[3]: *** Waiting for unfinished jobs....
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
[ywei: rebased to libvirt-1.3.2]
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
--- ---
docs/Makefile.am | 4 ++-- docs/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am diff --git a/docs/Makefile.am b/docs/Makefile.am
index daf37b6..125c5fd 100644 index 1b4353b..c199551 100644
--- a/docs/Makefile.am --- a/docs/Makefile.am
+++ b/docs/Makefile.am +++ b/docs/Makefile.am
@@ -162,7 +162,7 @@ EXTRA_DIST= \ @@ -164,7 +164,7 @@ EXTRA_DIST= \
sitemap.html.in aclperms.htmlinc \ todo.pl hvsupport.pl todo.cfg-example \
todo.pl hvsupport.pl todo.cfg-example $(schema_DATA)
-acl_generated = aclperms.htmlinc -acl_generated = aclperms.htmlinc
+acl.html:: $(srcdir)/aclperms.htmlinc +acl.html:: $(srcdir)/aclperms.htmlinc
$(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
$(srcdir)/genaclperms.pl Makefile.am $(srcdir)/genaclperms.pl Makefile.am
@@ -227,7 +227,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in @@ -221,7 +221,7 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \
$(top_srcdir)/docs/subsite.xsl $< > $@ \ convert -rotate 90 $< $@
|| { rm $@ && exit 1; }; fi
-%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated) %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
+%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in - sitemap.html.in $(acl_generated)
+ sitemap.html.in
@if [ -x $(XSLTPROC) ] ; then \ @if [ -x $(XSLTPROC) ] ; then \
echo "Generating $@"; \ echo "Generating $@"; \
name=`echo $@ | sed -e 's/.tmp//'`; \ name=`echo $@ | sed -e 's/.tmp//'`; \
-- --
1.8.4.2 1.9.1

View File

@ -18,8 +18,8 @@ FILES_${PN}-python = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
SRC_URI += "http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python" SRC_URI += "http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python"
SRC_URI += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}" SRC_URI += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}"
SRC_URI[libvirt_python.md5sum] = "429e328028fc59b62404a4163004f2ae" SRC_URI[libvirt_python.md5sum] = "ed018c714d7ddbe93221c796dff283ed"
SRC_URI[libvirt_python.sha256sum] = "88ab63b0c53e435bd2c6e8551805fe273353708efd4dfab908257dc5f37bec49" SRC_URI[libvirt_python.sha256sum] = "6d35ae9e7801573393b9c92471f39e6700d479f10b641df81d041b469f160bf8"
export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml" export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
export LIBVIRT_CFLAGS = "-I${S}/include" export LIBVIRT_CFLAGS = "-I${S}/include"

View File

@ -1,4 +1,4 @@
From 171fc890bb5972e566bd7b3d87a40ac434a5b3e6 Mon Sep 17 00:00:00 2001 From dd915e7f70e676aea93f750c75d16ce646e71e4b Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@windriver.com> From: Mark Asselstine <mark.asselstine@windriver.com>
Date: Wed, 9 Sep 2015 11:52:44 -0400 Date: Wed, 9 Sep 2015 11:52:44 -0400
Subject: [PATCH] Revert "build: add $(prefix) to SYSTEMD_UNIT_DIR" Subject: [PATCH] Revert "build: add $(prefix) to SYSTEMD_UNIT_DIR"
@ -12,25 +12,19 @@ SYSTEMD_UNIT_DIR which is not flexible we have to resort to reverting
this upstream commit to avoid having ${prefix} added to the path. this upstream commit to avoid having ${prefix} added to the path.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
[ywei: rebased to libvirt-1.3.2]
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
--- ---
daemon/Makefile.am | 4 ++-- daemon/Makefile.am | 2 +-
src/Makefile.am | 4 ++-- src/Makefile.am | 2 +-
tools/Makefile.am | 4 ++-- tools/Makefile.am | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-) 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 00221ab..e5c5db8 100644 index 2dbe81b..41ea2db 100644
--- a/daemon/Makefile.am --- a/daemon/Makefile.am
+++ b/daemon/Makefile.am +++ b/daemon/Makefile.am
@@ -1,6 +1,6 @@ @@ -445,7 +445,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART
## Process this file with automake to produce Makefile.in
-## Copyright (C) 2005-2015 Red Hat, Inc.
+## Copyright (C) 2005-2015 Red Hat, Inc.
##
## This library is free software; you can redistribute it and/or
## modify it under the terms of the GNU Lesser General Public
@@ -387,7 +387,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART
if LIBVIRT_INIT_SCRIPT_SYSTEMD if LIBVIRT_INIT_SCRIPT_SYSTEMD
@ -38,39 +32,25 @@ index 00221ab..e5c5db8 100644
+SYSTEMD_UNIT_DIR = /lib/systemd/system +SYSTEMD_UNIT_DIR = /lib/systemd/system
BUILT_SOURCES += libvirtd.service libvirtd.socket BUILT_SOURCES += libvirtd.service libvirtd.socket
install-init-systemd: install-sysconfig libvirtd.service install-init-systemd: install-sysconfig libvirtd.service libvirtd.socket
diff --git a/src/Makefile.am b/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am
index 8f77658..57e163f 100644 index a316b4d..d271291 100644
--- a/src/Makefile.am --- a/src/Makefile.am
+++ b/src/Makefile.am +++ b/src/Makefile.am
@@ -1,6 +1,6 @@ @@ -2594,7 +2594,7 @@ EXTRA_DIST += \
## Process this file with automake to produce Makefile.in
-## Copyright (C) 2005-2015 Red Hat, Inc.
+## Copyright (C) 2005-2015 Red Hat, Inc.
##
## This library is free software; you can redistribute it and/or
## modify it under the terms of the GNU Lesser General Public
@@ -2220,7 +2220,7 @@ EXTRA_DIST += \
if WITH_LIBVIRTD if WITH_LIBVIRTD
if LIBVIRT_INIT_SCRIPT_SYSTEMD if LIBVIRT_INIT_SCRIPT_SYSTEMD
-SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system -SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+SYSTEMD_UNIT_DIR = /lib/systemd/system +SYSTEMD_UNIT_DIR = /lib/systemd/system
BUILT_SOURCES += virtlockd.service virtlockd.socket BUILT_SOURCES += virtlockd.service virtlockd.socket \
DISTCLEANFILES += virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket
diff --git a/tools/Makefile.am b/tools/Makefile.am diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6847f13..256a8f3 100644 index b3227a7..0e58f73 100644
--- a/tools/Makefile.am --- a/tools/Makefile.am
+++ b/tools/Makefile.am +++ b/tools/Makefile.am
@@ -1,4 +1,4 @@ @@ -356,7 +356,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh
-## Copyright (C) 2005-2014 Red Hat, Inc.
+## Copyright (C) 2005-2013 Red Hat, Inc.
##
## This library is free software; you can redistribute it and/or
## modify it under the terms of the GNU Lesser General Public
@@ -306,7 +306,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh
EXTRA_DIST += libvirt-guests.service.in EXTRA_DIST += libvirt-guests.service.in

View File

@ -10,6 +10,8 @@ one installed in the system. This may be used for example in autotest
or by packagers without the need to install libvirt into the system. or by packagers without the need to install libvirt into the system.
Signed-off-by: Martin Kletzander <mkletzan redhat com> Signed-off-by: Martin Kletzander <mkletzan redhat com>
[ywei: rebased to 1.3.2]
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
--- ---
setup.py | 25 ++++++++++++++++++++++--- setup.py | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-) 1 file changed, 22 insertions(+), 3 deletions(-)
@ -56,19 +58,19 @@ Index: libvirt-python-1.2.4/setup.py
c_modules = [] c_modules = []
py_modules = [] py_modules = []
- ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False) - ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
- cflags = get_pkgconfig_data(["--cflags"], "libvirt", False) - cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
+ libvirt_cflags = os.getenv("LIBVIRT_CFLAGS") + libvirt_cflags = os.getenv("LIBVIRT_CFLAGS")
+ if libvirt_cflags: + if libvirt_cflags:
+ cflags = libvirt_cflags + cflags = libvirt_cflags.split()
+ else: + else:
+ cflags = get_pkgconfig_data(["--cflags"], "libvirt", False) + cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
+ +
+ libvirt_libs = os.getenv("LIBVIRT_LIBS") + libvirt_libs = os.getenv("LIBVIRT_LIBS")
+ if libvirt_libs: + if libvirt_libs:
+ ldflags = libvirt_libs + ldflags = libvirt_libs.split()
+ else: + else:
+ ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False) + ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
module = Extension('libvirtmod', module = Extension('libvirtmod',
sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'], sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'],

View File

@ -20,8 +20,8 @@ Index: libvirt-1.2.4/tests/Makefile.am
+ -Dabs_builddir="\"$(PTEST_DIR)/tests\"" \ + -Dabs_builddir="\"$(PTEST_DIR)/tests\"" \
+ -Dabs_srcdir="\"$(PTEST_DIR)/tests\"" \ + -Dabs_srcdir="\"$(PTEST_DIR)/tests\"" \
$(LIBXML_CFLAGS) \ $(LIBXML_CFLAGS) \
$(LIBNL_CFLAGS) \
$(GNUTLS_CFLAGS) \ $(GNUTLS_CFLAGS) \
$(SASL_CFLAGS) \
@@ -48,7 +50,7 @@ @@ -48,7 +50,7 @@
if WITH_DRIVER_MODULES if WITH_DRIVER_MODULES

View File

@ -1,4 +1,4 @@
From dade75d1ce25df6ab61867250d7adb65b4912090 Mon Sep 17 00:00:00 2001 From a790bfe8fa7b24b68cb6f9a1b7205fda2c6d558e Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com> From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Fri, 2 Aug 2013 11:38:43 -0400 Date: Fri, 2 Aug 2013 11:38:43 -0400
Subject: [PATCH] tools: add libvirt-net-rpc to virt-host-validate when TLS is Subject: [PATCH] tools: add libvirt-net-rpc to virt-host-validate when TLS is
@ -9,78 +9,55 @@ generated in libvirt. Any binaries linking against libvirt, must also
link against libvirt-net-rpc which provides the implementation. link against libvirt-net-rpc which provides the implementation.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
[ywei: rebased to libvirt-1.3.2]
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
--- ---
examples/dominfo/Makefile.am | 7 +++++++ examples/Makefile.am | 19 +++++++++++++++++++
examples/domsuspend/Makefile.am | 7 +++++++ tools/Makefile.am | 13 +++++++++++++
examples/hellolibvirt/Makefile.am | 7 +++++++ 2 files changed, 32 insertions(+)
examples/openauth/Makefile.am | 6 ++++++
tools/Makefile.am | 13 +++++++++++++
5 files changed, 40 insertions(+)
diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am diff --git a/examples/Makefile.am b/examples/Makefile.am
index 4a30c7768df9..99b3e17eb741 100644 index 2adcefb..fff49d4 100644
--- a/examples/dominfo/Makefile.am --- a/examples/Makefile.am
+++ b/examples/dominfo/Makefile.am +++ b/examples/Makefile.am
@@ -23,3 +23,10 @@ noinst_PROGRAMS=info1 @@ -39,6 +39,10 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \
info1_SOURCES=info1.c LDADD = $(STATIC_BINARIES) $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) \
info1_LDFLAGS= $(top_builddir)/src/libvirt.la $(top_builddir)/gnulib/lib/libgnu.la
info1_LDADD= $(LDADDS)
+
+if WITH_GNUTLS +if WITH_GNUTLS
+info1_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \ +LDADD += $(top_builddir)/src/libvirt-net-rpc.la
+ $(top_builddir)/gnulib/lib/libgnu.la \ +endif
+
noinst_PROGRAMS=dominfo/info1 dommigrate/dommigrate domsuspend/suspend \
domtop/domtop hellolibvirt/hellolibvirt object-events/event-test \
openauth/openauth rename/rename
@@ -52,6 +56,21 @@ object_events_event_test_SOURCES = object-events/event-test.c
openauth_openauth_SOURCES = openauth/openauth.c
rename_rename_SOURCES = rename/rename.c
+if WITH_GNUTLS
+dominfo_info1_LDADD = $(top_builddir)/src/libvirt-net-rpc.la \
+ $(LDADD) \
+ $(NULL)
+domsuspend_suspend_LDADD = $(top_builddir)/src/libvirt-net-rpc.la \
+ $(LDADD) \
+ $(NULL)
+hellolibvirt_hellolibvirt_LDADD = $(top_builddir)/src/libvirt-net-rpc.la \
+ $(LDADD) \
+ $(NULL)
+openauth_openauth_LDADD = $(top_builddir)/src/libvirt-net-rpc.la \
+ $(LDADD) \
+ $(NULL) + $(NULL)
+endif +endif
+ +
diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am if WITH_APPARMOR_PROFILES
index b8e65f24a28d..9553e0f1d948 100644 apparmordir = $(sysconfdir)/apparmor.d/
--- a/examples/domsuspend/Makefile.am apparmor_DATA = \
+++ b/examples/domsuspend/Makefile.am
@@ -25,3 +25,10 @@ noinst_PROGRAMS=suspend
suspend_SOURCES=suspend.c
suspend_LDFLAGS=
suspend_LDADD= $(LDADDS)
+
+if WITH_GNUTLS
+suspend_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
+ $(top_builddir)/gnulib/lib/libgnu.la \
+ $(NULL)
+endif
+
diff --git a/examples/hellolibvirt/Makefile.am b/examples/hellolibvirt/Makefile.am
index 55ea972c42f8..a5272e2bb565 100644
--- a/examples/hellolibvirt/Makefile.am
+++ b/examples/hellolibvirt/Makefile.am
@@ -19,3 +19,10 @@ noinst_PROGRAMS = hellolibvirt
hellolibvirt_CFLAGS = $(WARN_CFLAGS)
hellolibvirt_SOURCES = hellolibvirt.c
hellolibvirt_LDADD = $(top_builddir)/src/libvirt.la
+
+if WITH_GNUTLS
+hellolibvirt_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
+ $(top_builddir)/gnulib/lib/libgnu.la \
+ $(NULL)
+endif
+
diff --git a/examples/openauth/Makefile.am b/examples/openauth/Makefile.am
index 7bb860491e73..34e9b47f65cb 100644
--- a/examples/openauth/Makefile.am
+++ b/examples/openauth/Makefile.am
@@ -19,3 +19,9 @@ noinst_PROGRAMS = openauth
openauth_CFLAGS = $(WARN_CFLAGS)
openauth_SOURCES = openauth.c
openauth_LDADD = $(top_builddir)/src/libvirt.la
+if WITH_GNUTLS
+openauth_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
+ $(top_builddir)/gnulib/lib/libgnu.la \
+ $(NULL)
+endif
+
diff --git a/tools/Makefile.am b/tools/Makefile.am diff --git a/tools/Makefile.am b/tools/Makefile.am
index 256a8f37a2a9..837a83fb612a 100644 index 0be3567..b3227a7 100644
--- a/tools/Makefile.am --- a/tools/Makefile.am
+++ b/tools/Makefile.am +++ b/tools/Makefile.am
@@ -147,6 +147,13 @@ virt_host_validate_LDADD = \ @@ -169,6 +169,13 @@ virt_host_validate_LDADD = \
../gnulib/lib/libgnu.la \ ../gnulib/lib/libgnu.la \
$(NULL) $(NULL)
@ -92,9 +69,9 @@ index 256a8f37a2a9..837a83fb612a 100644
+ +
+ +
virt_host_validate_CFLAGS = \ virt_host_validate_CFLAGS = \
$(LIBXML_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(PIE_CFLAGS) \ @@ -256,6 +263,12 @@ virt_admin_CFLAGS = \
@@ -214,6 +221,12 @@ virsh_CFLAGS = \
$(READLINE_CFLAGS) $(READLINE_CFLAGS)
BUILT_SOURCES = BUILT_SOURCES =
@ -108,5 +85,5 @@ index 256a8f37a2a9..837a83fb612a 100644
virsh_LDADD += virsh_win_icon.$(OBJEXT) virsh_LDADD += virsh_win_icon.$(OBJEXT)
-- --
1.8.1.2 1.9.1

View File

@ -3,7 +3,7 @@ HOMEPAGE = "http://libvirt.org"
LICENSE = "LGPLv2.1+" LICENSE = "LGPLv2.1+"
LICENSE_${PN}-ptest = "GPLv2+ & LGPLv2.1" LICENSE_${PN}-ptest = "GPLv2+ & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" file://COPYING.LESSER;md5=4b54a1fd55a448865a0b32d41598759d"
SECTION = "console/tools" SECTION = "console/tools"
PR = "r1" PR = "r1"
@ -35,8 +35,8 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \
file://Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch \ file://Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch \
" "
SRC_URI[libvirt.md5sum] = "bc3ab1ba5b6fabd2e4516c70ddd4d97c" SRC_URI[libvirt.md5sum] = "b48b06bbc7efbe9973ed0f3f223d6da2"
SRC_URI[libvirt.sha256sum] = "282c141f03331d640020c15f81464b27400e0ee307ef4c5190393b021caedd6e" SRC_URI[libvirt.sha256sum] = "e3c6fc2683178660b371efb3ac7a1103a3f4b78efac7ffe560bc5917974ccf05"
inherit autotools gettext update-rc.d pkgconfig ptest systemd inherit autotools gettext update-rc.d pkgconfig ptest systemd