* [V2][PATCH 0/1] libvirt: uprev to 1.3.2
@ 2016-03-31 5:58 Yunguo Wei
2016-03-31 5:58 ` [PATCH 1/1] " Yunguo Wei
0 siblings, 1 reply; 4+ messages in thread
From: Yunguo Wei @ 2016-03-31 5:58 UTC (permalink / raw)
To: bruce.ashfield, meta-virtualization
Please ignore V1 as I found some issue.
V2 changes:
1. use git "-M" option to generate patch for easy review.
2. Drop the patch 0001-Add-missing-split-to-properly-retrieve-cflags-and-ld.patch
in V1 as the patch was actually fixing an issue introduced during rebasing 1.2.19 patches.
3. Rebase existing patches to make 2) happen.
Comments (indicate scope for each "y" above):
---------------------------------------------
commit 4a68cdf2d0acd939c6217d002a77455e316a41fe
Author: Yunguo Wei <yunguo.wei@windriver.com>
Date: Mon Mar 28 16:54:04 2016 +0800
libvirt: uprev to 1.3.2
Release notes here http://libvirt.org/news.html.
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
Added Files:
------------
.../libvirt-1.3.2/0001-to-fix-build-error.patch | 46 ++++
recipes-extended/libvirt/libvirt_1.3.2.bb | 286 +++++++++++++++++++++
Removed Files:
--------------
.../libvirt-1.2.19/0001-to-fix-build-error.patch | 44 ----
recipes-extended/libvirt/libvirt_1.2.19.bb | 287 ---------------------
Remaining Changes (diffstat):
-----------------------------
recipes-extended/libvirt/libvirt-python.inc | 4 +-
...vert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch | 52 +++-------
.../libvirt/libvirt/libvirt_api_xml_path.patch | 14 +--
recipes-extended/libvirt/libvirt/runptest.patch | 2 +-
...ibvirt-net-rpc-to-virt-host-validate-when.patch | 107 ++++++++-------------
Test steps:
t@SDP_Wildcat_Pass-1:/media# libvirtd -V
libvirtd (libvirt) 1.3.2
root@SDP_Wildcat_Pass-1:/media# systemctl status libvirtd
● libvirtd.service - Virtualization daemon
Loaded: loaded (/lib/systemd/system/libvirtd.service; enabled; vendor
preset: enabled)
Active: active (running) since Thu 2016-03-31 03:43:57 UTC; 2s ago
Docs: man:libvirtd(8)
http://libvirt.org
Process: 2200 ExecStart=/usr/sbin/libvirtd $LIBVIRTD_ARGS
(code=exited, status=0/SUCCESS)
Main PID: 2202 (libvirtd)
CGroup: /system.slice/libvirtd.service
├─2026 /usr/bin/dnsmasq
--conf-file=/var/lib/libvirt/dnsmasq/default.conf --leasefile-ro
--dhcp-script=/usr/lib64/libvirt/libvirt_leaseshelper
├─2027 /usr/bin/dnsmasq
--conf-file=/var/lib/libvirt/dnsmasq/default.conf --leasefile-ro
--dhcp-script=/usr/lib64/libvirt/libvirt_leaseshelper
└─2202 /usr/sbin/libvirtd --listen --daemon
Mar 31 03:43:55 SDP_Wildcat_Pass-1 systemd[1]: Starting Virtualization
daemon...
Mar 31 03:43:57 SDP_Wildcat_Pass-1 libvirtd[2200]: 2016-03-31
03:43:57.284+0000: 2200: info : libvirt version: 1.3.2
Mar 31 03:43:57 SDP_Wildcat_Pass-1 libvirtd[2200]: 2016-03-31
03:43:57.284+0000: 2200: info : hostname: SDP_Wildcat_Pass-1
Mar 31 03:43:57 SDP_Wildcat_Pass-1 libvirtd[2200]: 2016-03-31
03:43:57.284+0000: 2200: warning : virGetHostnameImpl:703 : getaddrinfo
failed for 'SD...ot known
Mar 31 03:43:57 SDP_Wildcat_Pass-1 systemd[1]: Started Virtualization
daemon.
Mar 31 03:43:57 SDP_Wildcat_Pass-1 dnsmasq[2026]: read /etc/hosts - 6
addresses
Mar 31 03:43:57 SDP_Wildcat_Pass-1 dnsmasq[2026]: read
/var/lib/libvirt/dnsmasq/default.addnhosts - 0 addresses
Mar 31 03:43:57 SDP_Wildcat_Pass-1 dnsmasq-dhcp[2026]: read
/var/lib/libvirt/dnsmasq/default.hostsfile
Hint: Some lines were ellipsized, use -l to show in full.
root@SDP_Wildcat_Pass-1:/media# cat test.xml
<domain type='kvm'>
<name>test</name>
<memory>2048000</memory>
<currentMemory>1024000</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd' />
<kernel>/media/guest.kernel</kernel>
<cmdline>root=/dev/vda2 selinux=0 enforcing=0
console=ttyS0 rw </cmdline>
</os>
<devices>
<disk type='file' device='disk'>
<source file='/media/guest_70013.img' />
<target dev='vda' bus='virtio'/>
</disk>
<serial type='pty'>
<target port='0'/>
</serial>
<console type='pty'>
<target type='serial' port='0'/>
</console>
</devices>
<devices>
<memballoon model='virtio'/>
</devices>
</domain>
root@SDP_Wildcat_Pass-1:/media# virsh define test.xml
Domain test defined from test.xml
root@SDP_Wildcat_Pass-1:/media# virsh start test
Domain test started
root@SDP_Wildcat_Pass-1:/media# virsh console test
Connected to domain test
Escape character is ^]
EXT4-fs (vda2): re-mounted. Opts: (null)
[ OK ] Started Remount Root and Kernel File Systems.
fuse init (API version 7.22)
Starting Create Static Device Nodes in /dev...
[ OK ] Started Load Kernel Modules.
Mounting FUSE Control File System...
Starting Apply Kernel Variables...
[ OK ] Mounted FUSE Control File System.
[ OK ] Started Apply Kernel Variables.
[ OK ] Started LSB: Set hostname based on /etc/hostname.
Starting (null)...
[ OK ] Started (null).
[ OK ] Started Create Static Device Nodes in /dev.
Starting udev Kernel Device Manager...
[ OK ] Reached target Local File Systems (Pre).
Mounting /mnt/huge...
systemd-udevd[178]: starting version 216
Mounting /var/volatile...
[ OK ] Mounted /mnt/huge.
[ OK ] Started udev Kernel Device Manager.
[ OK ] Mounted /var/volatile.
Starting Load/Save Random Seed...
[ OK ] Started LVM activation.
[ OK ] Started Load/Save Random Seed.
[ OK ] Found device /dev/ttyS0.
[ OK ] Found device
/dev/disk/by-uuid/c30d65b1-ac9c-4843-8ed0-1c572c45f411.
Starting File System Check on
/dev/...1-ac9c-4843-8ed0-1c572c45f411...
[ OK ] Found device
/dev/disk/by-uuid/dcb63b7b-29c5-46ca-bed4-561ddce91a10.
Activating swap
/dev/disk/by-uuid/d...b-29c5-46ca-bed4-561ddce91a10...
Adding 204796k swap on /dev/vda3. Priority:-1 extents:1 across:204796k
[ OK ] Activated swap
/dev/disk/by-uuid/dcb63b7b-29c5-46ca-bed4-561ddce91a10.
[ OK ] Reached target Swap.
systemd-fsck[235]: /dev/vda1: recovering journal
systemd-fsck[235]: /dev/vda1: clean, 251/128016 files, 260578/512000
blocks
[ OK ] Started File System Check on
/dev/d...5b1-ac9c-4843-8ed0-1c572c45f411.
Mounting /boot...
EXT4-fs (vda1): mounted filesystem with ordered data mode. Opts: (null)
[ OK ] Mounted /boot.
[ OK ] Reached target Local File Systems.
Starting Trigger Flushing of Journal to Persistent Storage...
Starting Create Volatile Files and Directories...
systemd-journald[131]: Received request to flush runtime journal from
PID 1
[ OK ] Started Trigger Flushing of Journal to Persistent Storage.
[ OK ] Started Create Volatile Files and Directories.
[ OK ] Reached target System Time Synchronized.
Starting Security Auditing Service...
systemd-journald[131]: File
/var/log/journal/1a524f82242b49afb8353a2ab625087a/system.journal
corrupted or uncleanly shut down, renaming and replacing.
[ OK ] Started Security Auditing Service.
Starting Update UTMP about System Boot/Shutdown...
[ OK ] Started Update UTMP about System Boot/Shutdown.
[ OK ] Reached target System Initialization.
audit: type=1305 audit(1459395895.903:2): audit_pid=261 old=0
auid=4294967295 ses=4294967295 res=1
[ OK ] Listening on CUPS Printing Service Sockets.
[ OK ] Listening on RPCbind Server Activation Socket.
[ OK ] Listening on Avahi mDNS/DNS-SD Stack Activation Socket.
[ OK ] Reached target Paths.
[ OK ] Listening on D-Bus System Message Bus Socket.
[ OK ] Reached target Timers.
Starting Restore Sound Card State...
[ OK ] Listening on sshd.socket.
[ OK ] Reached target Sockets.
[ OK ] Reached target Basic System.
Starting LSB: Raise network interfaces....
Starting Ethernet Bridge Filtering Tables...
Starting Dynamic Host Configuration Protocol (DHCP)...
[ OK ] Started Dynamic Host Configuration Protocol (DHCP).
Starting irqbalance daemon...
[ OK ] Started irqbalance daemon.
Starting GNU Zebra routing manager...
Starting Job spooling tools...
[ OK ] Started Job spooling tools.
Starting Avahi mDNS/DNS-SD Stack...
Starting System Logging Service...
Starting strongSwan IPsec...
[ OK ] Started strongSwan IPsec.
Starting ACPI Event Daemon...
Starting Periodic Command Scheduler...
[ OK ] Started Periodic Command Scheduler.
Starting Apply Cpu Microcode...
Starting Permit User Sessions...
Starting Login Service...
Starting D-Bus System Message Bus...
[ OK ] Started D-Bus System Message Bus.
[ OK ] Started Avahi mDNS/DNS-SD Stack.
Starting Network Service...
[ OK ] Started System Logging Service.
[ OK ] Started Restore Sound Card State.
[FAILED] Failed to start LSB: Raise network interfaces..
See 'systemctl status networking.service' for details.
[ OK ] Started Ethernet Bridge Filtering Tables.
[ OK ] Started ACPI Event Daemon.
[ OK ] Started Apply Cpu Microcode.
[ OK ] Started Permit User Sessions.
[ OK ] Started Login Service.
Starting (null)...
NET: Registered protocol family 15
[ OK ] Started Network Service.
Starting Wait for Network to be Configured...
Initializing XFRM netlink socket
[ OK ] Started (null).
[ OK ] Started GNU Zebra routing manager.
Starting IS-IS routing daemon...
[ OK ] Reached target Network.
Starting Simple Network Management Protocol (SNMP) Trap
Daemon....
Starting Distccd A Distributed Compilation Server...
[ OK ] Started Distccd A Distributed Compilation Server.
Starting FreeRADIUS high performance RADIUS server....
Starting Xinetd A Powerful Replacement For Inetd...
Starting DNS forwarder and DHCP server...
Starting Postfix Mail Transport Agent...
Starting Vsftpd ftp daemon...
[ OK ] Started Vsftpd ftp daemon.
Starting Network Time Service...
Starting Berkeley Internet Name Domain (DNS)...
Starting The RPC portmapper...
Starting Collectd...
[ OK ] Started Collectd.
Starting HP Agentless Management Service daemon...
[ OK ] Started HP Agentless Management Service daemon.
Starting Check tcf-agent autostart...
Starting Simple Network Management Protocol (SNMP) Daemon....
Starting /etc/rc.local Compatibility...
Starting OSPF routing daemon...
Starting RIP routing daemon for IPv6...
Starting OSPF routing daemon for IPv6...
Starting Babel routing daemon...
Starting RIP routing daemon...
Starting BGP routing daemon...
[ OK ] Started IS-IS routing daemon.
[ OK ] Started Xinetd A Powerful Replacement For Inetd.
[ OK ] Started Network Time Service.
[ OK ] Started The RPC portmapper.
[ OK ] Started /etc/rc.local Compatibility.
Starting Serial Getty on ttyS0...
[ OK ] Started Serial Getty on ttyS0.
Starting Getty on tty1...
[ OK ] Started Getty on tty1.
[ OK ] Reached target Login Prompts.
[ OK ] Started Babel routing daemon.
[ OK ] Started RIP routing daemon for IPv6.
[ OK ] Started OSPF routing daemon for IPv6.
[ OK ] Started RIP routing daemon.
[ OK ] Started OSPF routing daemon.
[ OK ] Started DNS forwarder and DHCP server.
[ OK ] Started BGP routing daemon.
tcf-agent: not configured to autostart, use /etc/cafe/tcf-agent.init
force-start
[ OK ] Started Check tcf-agent autostart.
systemd-journald[131]: File
/var/log/journal/1a524f82242b49afb8353a2ab625087a/user-65534.journal
corrupted or uncleanly shut down, renaming and replacing.
[ OK ] Started Simple Network Management Protocol (SNMP) Trap Daemon..
[ OK ] Started Simple Network Management Protocol (SNMP) Daemon..
[ OK ] Started Berkeley Internet Name Domain (DNS).
[ OK ] Reached target Host and Network Name Lookups.
[ OK ] Started Postfix Mail Transport Agent.
[ OK ] Started FreeRADIUS high performance RADIUS server..
Wind River Linux CGP 7.0.0.13 cgp-70013 ttyS0
cgp-70013 login: root
Password:
Last login: Tue Mar 29 04:21:57 EDT 2016 on ttyS0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] libvirt: uprev to 1.3.2
2016-03-31 5:58 [V2][PATCH 0/1] libvirt: uprev to 1.3.2 Yunguo Wei
@ 2016-03-31 5:58 ` Yunguo Wei
2016-03-31 6:18 ` Yunguo Wei
0 siblings, 1 reply; 4+ messages in thread
From: Yunguo Wei @ 2016-03-31 5:58 UTC (permalink / raw)
To: bruce.ashfield, meta-virtualization
Release notes here http://libvirt.org/news.html.
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
---
.../0001-to-fix-build-error.patch | 24 ++---
recipes-extended/libvirt/libvirt-python.inc | 4 +-
...vert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch | 52 +++-------
.../libvirt/libvirt/libvirt_api_xml_path.patch | 14 +--
recipes-extended/libvirt/libvirt/runptest.patch | 2 +-
...ibvirt-net-rpc-to-virt-host-validate-when.patch | 107 ++++++++-------------
.../{libvirt_1.2.19.bb => libvirt_1.3.2.bb} | 7 +-
7 files changed, 85 insertions(+), 125 deletions(-)
rename recipes-extended/libvirt/{libvirt-1.2.19 => libvirt-1.3.2}/0001-to-fix-build-error.patch (65%)
rename recipes-extended/libvirt/{libvirt_1.2.19.bb => libvirt_1.3.2.bb} (97%)
diff --git a/recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch b/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
similarity index 65%
rename from recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
rename to recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
index 61a54e1..089ee33 100644
--- a/recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
+++ b/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
@@ -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>
Date: Fri, 31 Jul 2015 03:17:07 +0900
Subject: [PATCH] to fix build error
@@ -13,32 +13,34 @@ The error likes as following
| make[3]: *** Waiting for unfinished jobs....
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 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
-index daf37b6..125c5fd 100644
+index 1b4353b..c199551 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
-@@ -162,7 +162,7 @@ EXTRA_DIST= \
- sitemap.html.in aclperms.htmlinc \
- todo.pl hvsupport.pl todo.cfg-example
+@@ -164,7 +164,7 @@ EXTRA_DIST= \
+ todo.pl hvsupport.pl todo.cfg-example \
+ $(schema_DATA)
-acl_generated = aclperms.htmlinc
+acl.html:: $(srcdir)/aclperms.htmlinc
$(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
$(srcdir)/genaclperms.pl Makefile.am
-@@ -227,7 +227,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
- $(top_srcdir)/docs/subsite.xsl $< > $@ \
- || { rm $@ && exit 1; }; fi
+@@ -221,7 +221,7 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \
+ convert -rotate 90 $< $@
--%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated)
-+%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in
+ %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
+- sitemap.html.in $(acl_generated)
++ sitemap.html.in
@if [ -x $(XSLTPROC) ] ; then \
echo "Generating $@"; \
name=`echo $@ | sed -e 's/.tmp//'`; \
--
-1.8.4.2
+1.9.1
diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index 015b4b6..c1dafe9 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -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 += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}"
-SRC_URI[libvirt_python.md5sum] = "429e328028fc59b62404a4163004f2ae"
-SRC_URI[libvirt_python.sha256sum] = "88ab63b0c53e435bd2c6e8551805fe273353708efd4dfab908257dc5f37bec49"
+SRC_URI[libvirt_python.md5sum] = "ed018c714d7ddbe93221c796dff283ed"
+SRC_URI[libvirt_python.sha256sum] = "6d35ae9e7801573393b9c92471f39e6700d479f10b641df81d041b469f160bf8"
export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
export LIBVIRT_CFLAGS = "-I${S}/include"
diff --git a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch b/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
index c2606bd..16c3a16 100644
--- a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
+++ b/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
@@ -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>
Date: Wed, 9 Sep 2015 11:52:44 -0400
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.
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 ++--
- src/Makefile.am | 4 ++--
- tools/Makefile.am | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
+ daemon/Makefile.am | 2 +-
+ src/Makefile.am | 2 +-
+ tools/Makefile.am | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index 00221ab..e5c5db8 100644
+index 2dbe81b..41ea2db 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
-@@ -1,6 +1,6 @@
- ## 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
+@@ -445,7 +445,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART
if LIBVIRT_INIT_SCRIPT_SYSTEMD
@@ -38,39 +32,25 @@ index 00221ab..e5c5db8 100644
+SYSTEMD_UNIT_DIR = /lib/systemd/system
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
-index 8f77658..57e163f 100644
+index a316b4d..d271291 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1,6 +1,6 @@
- ## 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 += \
+@@ -2594,7 +2594,7 @@ EXTRA_DIST += \
if WITH_LIBVIRTD
if LIBVIRT_INIT_SCRIPT_SYSTEMD
-SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+SYSTEMD_UNIT_DIR = /lib/systemd/system
- BUILT_SOURCES += virtlockd.service virtlockd.socket
- DISTCLEANFILES += virtlockd.service virtlockd.socket
+ BUILT_SOURCES += virtlockd.service virtlockd.socket \
+ virtlogd.service virtlogd.socket
diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 6847f13..256a8f3 100644
+index b3227a7..0e58f73 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
-@@ -1,4 +1,4 @@
--## 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
+@@ -356,7 +356,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh
EXTRA_DIST += libvirt-guests.service.in
diff --git a/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch b/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
index 16321db..3c2622c 100644
--- a/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
+++ b/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
@@ -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.
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 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
@@ -56,19 +58,19 @@ Index: libvirt-python-1.2.4/setup.py
c_modules = []
py_modules = []
-- ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False)
-- cflags = get_pkgconfig_data(["--cflags"], "libvirt", False)
+- ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
+- cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
+ libvirt_cflags = os.getenv("LIBVIRT_CFLAGS")
+ if libvirt_cflags:
-+ cflags = libvirt_cflags
++ cflags = libvirt_cflags.split()
+ else:
-+ cflags = get_pkgconfig_data(["--cflags"], "libvirt", False)
++ cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
+
+ libvirt_libs = os.getenv("LIBVIRT_LIBS")
+ if libvirt_libs:
-+ ldflags = libvirt_libs
++ ldflags = libvirt_libs.split()
+ else:
-+ ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False)
++ ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
module = Extension('libvirtmod',
sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'],
diff --git a/recipes-extended/libvirt/libvirt/runptest.patch b/recipes-extended/libvirt/libvirt/runptest.patch
index 873a959..a33f569 100644
--- a/recipes-extended/libvirt/libvirt/runptest.patch
+++ b/recipes-extended/libvirt/libvirt/runptest.patch
@@ -20,8 +20,8 @@ Index: libvirt-1.2.4/tests/Makefile.am
+ -Dabs_builddir="\"$(PTEST_DIR)/tests\"" \
+ -Dabs_srcdir="\"$(PTEST_DIR)/tests\"" \
$(LIBXML_CFLAGS) \
+ $(LIBNL_CFLAGS) \
$(GNUTLS_CFLAGS) \
- $(SASL_CFLAGS) \
@@ -48,7 +50,7 @@
if WITH_DRIVER_MODULES
diff --git a/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch b/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
index 9141044..a7fc727 100644
--- a/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
+++ b/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
@@ -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>
Date: Fri, 2 Aug 2013 11:38:43 -0400
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.
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/domsuspend/Makefile.am | 7 +++++++
- examples/hellolibvirt/Makefile.am | 7 +++++++
- examples/openauth/Makefile.am | 6 ++++++
- tools/Makefile.am | 13 +++++++++++++
- 5 files changed, 40 insertions(+)
+ examples/Makefile.am | 19 +++++++++++++++++++
+ tools/Makefile.am | 13 +++++++++++++
+ 2 files changed, 32 insertions(+)
-diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am
-index 4a30c7768df9..99b3e17eb741 100644
---- a/examples/dominfo/Makefile.am
-+++ b/examples/dominfo/Makefile.am
-@@ -23,3 +23,10 @@ noinst_PROGRAMS=info1
- info1_SOURCES=info1.c
- info1_LDFLAGS=
- info1_LDADD= $(LDADDS)
-+
-+if WITH_GNUTLS
-+info1_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
-+ $(top_builddir)/gnulib/lib/libgnu.la \
-+ $(NULL)
-+endif
-+
-diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am
-index b8e65f24a28d..9553e0f1d948 100644
---- a/examples/domsuspend/Makefile.am
-+++ 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
-+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 2adcefb..fff49d4 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -39,6 +39,10 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \
+ LDADD = $(STATIC_BINARIES) $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) \
+ $(top_builddir)/src/libvirt.la $(top_builddir)/gnulib/lib/libgnu.la
+
+if WITH_GNUTLS
-+hellolibvirt_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
-+ $(top_builddir)/gnulib/lib/libgnu.la \
-+ $(NULL)
++LDADD += $(top_builddir)/src/libvirt-net-rpc.la
+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
+ 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
-+openauth_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
-+ $(top_builddir)/gnulib/lib/libgnu.la \
-+ $(NULL)
++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)
+endif
+
+ if WITH_APPARMOR_PROFILES
+ apparmordir = $(sysconfdir)/apparmor.d/
+ apparmor_DATA = \
diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 256a8f37a2a9..837a83fb612a 100644
+index 0be3567..b3227a7 100644
--- a/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 \
$(NULL)
@@ -92,9 +69,9 @@ index 256a8f37a2a9..837a83fb612a 100644
+
+
virt_host_validate_CFLAGS = \
+ $(LIBXML_CFLAGS) \
$(WARN_CFLAGS) \
- $(PIE_CFLAGS) \
-@@ -214,6 +221,12 @@ virsh_CFLAGS = \
+@@ -256,6 +263,12 @@ virt_admin_CFLAGS = \
$(READLINE_CFLAGS)
BUILT_SOURCES =
@@ -108,5 +85,5 @@ index 256a8f37a2a9..837a83fb612a 100644
virsh_LDADD += virsh_win_icon.$(OBJEXT)
--
-1.8.1.2
+1.9.1
diff --git a/recipes-extended/libvirt/libvirt_1.2.19.bb b/recipes-extended/libvirt/libvirt_1.3.2.bb
similarity index 97%
rename from recipes-extended/libvirt/libvirt_1.2.19.bb
rename to recipes-extended/libvirt/libvirt_1.3.2.bb
index 4de284c..58ed3de 100644
--- a/recipes-extended/libvirt/libvirt_1.2.19.bb
+++ b/recipes-extended/libvirt/libvirt_1.3.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://libvirt.org"
LICENSE = "LGPLv2.1+"
LICENSE_${PN}-ptest = "GPLv2+ & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
+ file://COPYING.LESSER;md5=4b54a1fd55a448865a0b32d41598759d"
SECTION = "console/tools"
PR = "r1"
@@ -30,13 +30,12 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \
file://runptest.patch \
file://run-ptest \
file://tests-allow-separated-src-and-build-dirs.patch \
- file://libvirt-use-pkg-config-to-locate-libcap.patch \
file://0001-to-fix-build-error.patch \
file://Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch \
"
-SRC_URI[libvirt.md5sum] = "bc3ab1ba5b6fabd2e4516c70ddd4d97c"
-SRC_URI[libvirt.sha256sum] = "282c141f03331d640020c15f81464b27400e0ee307ef4c5190393b021caedd6e"
+SRC_URI[libvirt.md5sum] = "b48b06bbc7efbe9973ed0f3f223d6da2"
+SRC_URI[libvirt.sha256sum] = "e3c6fc2683178660b371efb3ac7a1103a3f4b78efac7ffe560bc5917974ccf05"
inherit autotools gettext update-rc.d pkgconfig ptest systemd
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] libvirt: uprev to 1.3.2
2016-03-31 5:58 ` [PATCH 1/1] " Yunguo Wei
@ 2016-03-31 6:18 ` Yunguo Wei
0 siblings, 0 replies; 4+ messages in thread
From: Yunguo Wei @ 2016-03-31 6:18 UTC (permalink / raw)
To: bruce.ashfield, meta-virtualization
On 03/31/2016 01:58 PM, Yunguo Wei wrote:
> Release notes here http://libvirt.org/news.html.
>
> Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
> ---
> .../0001-to-fix-build-error.patch | 24 ++---
> recipes-extended/libvirt/libvirt-python.inc | 4 +-
> ...vert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch | 52 +++-------
> .../libvirt/libvirt/libvirt_api_xml_path.patch | 14 +--
> recipes-extended/libvirt/libvirt/runptest.patch | 2 +-
> ...ibvirt-net-rpc-to-virt-host-validate-when.patch | 107 ++++++++-------------
> .../{libvirt_1.2.19.bb => libvirt_1.3.2.bb} | 7 +-
> 7 files changed, 85 insertions(+), 125 deletions(-)
> rename recipes-extended/libvirt/{libvirt-1.2.19 => libvirt-1.3.2}/0001-to-fix-build-error.patch (65%)
> rename recipes-extended/libvirt/{libvirt_1.2.19.bb => libvirt_1.3.2.bb} (97%)
>
> diff --git a/recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch b/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
> similarity index 65%
> rename from recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
> rename to recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
> index 61a54e1..089ee33 100644
> --- a/recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
> +++ b/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
> @@ -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>
> Date: Fri, 31 Jul 2015 03:17:07 +0900
> Subject: [PATCH] to fix build error
> @@ -13,32 +13,34 @@ The error likes as following
> | make[3]: *** Waiting for unfinished jobs....
>
> 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 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/docs/Makefile.am b/docs/Makefile.am
> -index daf37b6..125c5fd 100644
> +index 1b4353b..c199551 100644
> --- a/docs/Makefile.am
> +++ b/docs/Makefile.am
> -@@ -162,7 +162,7 @@ EXTRA_DIST= \
> - sitemap.html.in aclperms.htmlinc \
> - todo.pl hvsupport.pl todo.cfg-example
> +@@ -164,7 +164,7 @@ EXTRA_DIST= \
> + todo.pl hvsupport.pl todo.cfg-example \
> + $(schema_DATA)
>
> -acl_generated = aclperms.htmlinc
> +acl.html:: $(srcdir)/aclperms.htmlinc
>
> $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
> $(srcdir)/genaclperms.pl Makefile.am
> -@@ -227,7 +227,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
> - $(top_srcdir)/docs/subsite.xsl $< > $@ \
> - || { rm $@ && exit 1; }; fi
> +@@ -221,7 +221,7 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \
> + convert -rotate 90 $< $@
>
> --%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated)
> -+%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in
> + %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
> +- sitemap.html.in $(acl_generated)
> ++ sitemap.html.in
> @if [ -x $(XSLTPROC) ] ; then \
> echo "Generating $@"; \
> name=`echo $@ | sed -e 's/.tmp//'`; \
> --
> -1.8.4.2
> +1.9.1
>
> diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
> index 015b4b6..c1dafe9 100644
> --- a/recipes-extended/libvirt/libvirt-python.inc
> +++ b/recipes-extended/libvirt/libvirt-python.inc
> @@ -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 += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}"
>
> -SRC_URI[libvirt_python.md5sum] = "429e328028fc59b62404a4163004f2ae"
> -SRC_URI[libvirt_python.sha256sum] = "88ab63b0c53e435bd2c6e8551805fe273353708efd4dfab908257dc5f37bec49"
> +SRC_URI[libvirt_python.md5sum] = "ed018c714d7ddbe93221c796dff283ed"
> +SRC_URI[libvirt_python.sha256sum] = "6d35ae9e7801573393b9c92471f39e6700d479f10b641df81d041b469f160bf8"
>
> export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
> export LIBVIRT_CFLAGS = "-I${S}/include"
> diff --git a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch b/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
> index c2606bd..16c3a16 100644
> --- a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
> +++ b/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
> @@ -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>
> Date: Wed, 9 Sep 2015 11:52:44 -0400
> 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.
>
> 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 ++--
> - src/Makefile.am | 4 ++--
> - tools/Makefile.am | 4 ++--
> - 3 files changed, 6 insertions(+), 6 deletions(-)
> + daemon/Makefile.am | 2 +-
> + src/Makefile.am | 2 +-
> + tools/Makefile.am | 2 +-
> + 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/daemon/Makefile.am b/daemon/Makefile.am
> -index 00221ab..e5c5db8 100644
> +index 2dbe81b..41ea2db 100644
> --- a/daemon/Makefile.am
> +++ b/daemon/Makefile.am
> -@@ -1,6 +1,6 @@
> - ## 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
> +@@ -445,7 +445,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART
>
> if LIBVIRT_INIT_SCRIPT_SYSTEMD
>
> @@ -38,39 +32,25 @@ index 00221ab..e5c5db8 100644
> +SYSTEMD_UNIT_DIR = /lib/systemd/system
> 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
> -index 8f77658..57e163f 100644
> +index a316b4d..d271291 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> -@@ -1,6 +1,6 @@
> - ## 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 += \
> +@@ -2594,7 +2594,7 @@ EXTRA_DIST += \
> if WITH_LIBVIRTD
> if LIBVIRT_INIT_SCRIPT_SYSTEMD
>
> -SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
> +SYSTEMD_UNIT_DIR = /lib/systemd/system
>
> - BUILT_SOURCES += virtlockd.service virtlockd.socket
> - DISTCLEANFILES += virtlockd.service virtlockd.socket
> + BUILT_SOURCES += virtlockd.service virtlockd.socket \
> + virtlogd.service virtlogd.socket
> diff --git a/tools/Makefile.am b/tools/Makefile.am
> -index 6847f13..256a8f3 100644
> +index b3227a7..0e58f73 100644
> --- a/tools/Makefile.am
> +++ b/tools/Makefile.am
> -@@ -1,4 +1,4 @@
> --## 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
> +@@ -356,7 +356,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh
>
>
> EXTRA_DIST += libvirt-guests.service.in
> diff --git a/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch b/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
> index 16321db..3c2622c 100644
> --- a/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
> +++ b/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
> @@ -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.
>
> 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 ++++++++++++++++++++++---
> 1 file changed, 22 insertions(+), 3 deletions(-)
> @@ -56,19 +58,19 @@ Index: libvirt-python-1.2.4/setup.py
>
> c_modules = []
> py_modules = []
> -- ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False)
> -- cflags = get_pkgconfig_data(["--cflags"], "libvirt", False)
> +- ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
> +- cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
> + libvirt_cflags = os.getenv("LIBVIRT_CFLAGS")
> + if libvirt_cflags:
> -+ cflags = libvirt_cflags
> ++ cflags = libvirt_cflags.split()
> + else:
> -+ cflags = get_pkgconfig_data(["--cflags"], "libvirt", False)
> ++ cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
> +
> + libvirt_libs = os.getenv("LIBVIRT_LIBS")
> + if libvirt_libs:
> -+ ldflags = libvirt_libs
> ++ ldflags = libvirt_libs.split()
> + else:
> -+ ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False)
> ++ ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
>
> module = Extension('libvirtmod',
> sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'],
> diff --git a/recipes-extended/libvirt/libvirt/runptest.patch b/recipes-extended/libvirt/libvirt/runptest.patch
> index 873a959..a33f569 100644
> --- a/recipes-extended/libvirt/libvirt/runptest.patch
> +++ b/recipes-extended/libvirt/libvirt/runptest.patch
> @@ -20,8 +20,8 @@ Index: libvirt-1.2.4/tests/Makefile.am
> + -Dabs_builddir="\"$(PTEST_DIR)/tests\"" \
> + -Dabs_srcdir="\"$(PTEST_DIR)/tests\"" \
> $(LIBXML_CFLAGS) \
> + $(LIBNL_CFLAGS) \
> $(GNUTLS_CFLAGS) \
> - $(SASL_CFLAGS) \
> @@ -48,7 +50,7 @@
>
> if WITH_DRIVER_MODULES
> diff --git a/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch b/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
> index 9141044..a7fc727 100644
> --- a/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
> +++ b/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
> @@ -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>
> Date: Fri, 2 Aug 2013 11:38:43 -0400
> 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.
>
> 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/domsuspend/Makefile.am | 7 +++++++
> - examples/hellolibvirt/Makefile.am | 7 +++++++
> - examples/openauth/Makefile.am | 6 ++++++
> - tools/Makefile.am | 13 +++++++++++++
> - 5 files changed, 40 insertions(+)
> + examples/Makefile.am | 19 +++++++++++++++++++
> + tools/Makefile.am | 13 +++++++++++++
> + 2 files changed, 32 insertions(+)
>
> -diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am
> -index 4a30c7768df9..99b3e17eb741 100644
> ---- a/examples/dominfo/Makefile.am
> -+++ b/examples/dominfo/Makefile.am
> -@@ -23,3 +23,10 @@ noinst_PROGRAMS=info1
> - info1_SOURCES=info1.c
> - info1_LDFLAGS=
> - info1_LDADD= $(LDADDS)
> -+
> -+if WITH_GNUTLS
> -+info1_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
> -+ $(top_builddir)/gnulib/lib/libgnu.la \
> -+ $(NULL)
> -+endif
> -+
> -diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am
> -index b8e65f24a28d..9553e0f1d948 100644
> ---- a/examples/domsuspend/Makefile.am
> -+++ 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
> -+
> +diff --git a/examples/Makefile.am b/examples/Makefile.am
> +index 2adcefb..fff49d4 100644
> +--- a/examples/Makefile.am
> ++++ b/examples/Makefile.am
> +@@ -39,6 +39,10 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \
> + LDADD = $(STATIC_BINARIES) $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) \
> + $(top_builddir)/src/libvirt.la $(top_builddir)/gnulib/lib/libgnu.la
> +
> +if WITH_GNUTLS
> -+hellolibvirt_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
> -+ $(top_builddir)/gnulib/lib/libgnu.la \
> -+ $(NULL)
> ++LDADD += $(top_builddir)/src/libvirt-net-rpc.la
> +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
> + 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
> -+openauth_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
> -+ $(top_builddir)/gnulib/lib/libgnu.la \
> -+ $(NULL)
> ++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)
> +endif
> +
> + if WITH_APPARMOR_PROFILES
> + apparmordir = $(sysconfdir)/apparmor.d/
> + apparmor_DATA = \
> diff --git a/tools/Makefile.am b/tools/Makefile.am
> -index 256a8f37a2a9..837a83fb612a 100644
> +index 0be3567..b3227a7 100644
> --- a/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 \
> $(NULL)
>
> @@ -92,9 +69,9 @@ index 256a8f37a2a9..837a83fb612a 100644
> +
> +
> virt_host_validate_CFLAGS = \
> + $(LIBXML_CFLAGS) \
> $(WARN_CFLAGS) \
> - $(PIE_CFLAGS) \
> -@@ -214,6 +221,12 @@ virsh_CFLAGS = \
> +@@ -256,6 +263,12 @@ virt_admin_CFLAGS = \
> $(READLINE_CFLAGS)
> BUILT_SOURCES =
>
> @@ -108,5 +85,5 @@ index 256a8f37a2a9..837a83fb612a 100644
> virsh_LDADD += virsh_win_icon.$(OBJEXT)
>
> --
> -1.8.1.2
> +1.9.1
>
> diff --git a/recipes-extended/libvirt/libvirt_1.2.19.bb b/recipes-extended/libvirt/libvirt_1.3.2.bb
> similarity index 97%
> rename from recipes-extended/libvirt/libvirt_1.2.19.bb
> rename to recipes-extended/libvirt/libvirt_1.3.2.bb
> index 4de284c..58ed3de 100644
> --- a/recipes-extended/libvirt/libvirt_1.2.19.bb
> +++ b/recipes-extended/libvirt/libvirt_1.3.2.bb
> @@ -3,7 +3,7 @@ HOMEPAGE = "http://libvirt.org"
> LICENSE = "LGPLv2.1+"
> LICENSE_${PN}-ptest = "GPLv2+ & LGPLv2.1"
> LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> - file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
> + file://COPYING.LESSER;md5=4b54a1fd55a448865a0b32d41598759d"
> SECTION = "console/tools"
> PR = "r1"
>
> @@ -30,13 +30,12 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \
> file://runptest.patch \
> file://run-ptest \
> file://tests-allow-separated-src-and-build-dirs.patch \
> - file://libvirt-use-pkg-config-to-locate-libcap.patch \
Oops, this patch should not be dropped or it might lead to build error
or host contamination.
I will bring it back in V3.
Yunguo
> file://0001-to-fix-build-error.patch \
> file://Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch \
> "
>
> -SRC_URI[libvirt.md5sum] = "bc3ab1ba5b6fabd2e4516c70ddd4d97c"
> -SRC_URI[libvirt.sha256sum] = "282c141f03331d640020c15f81464b27400e0ee307ef4c5190393b021caedd6e"
> +SRC_URI[libvirt.md5sum] = "b48b06bbc7efbe9973ed0f3f223d6da2"
> +SRC_URI[libvirt.sha256sum] = "e3c6fc2683178660b371efb3ac7a1103a3f4b78efac7ffe560bc5917974ccf05"
>
> inherit autotools gettext update-rc.d pkgconfig ptest systemd
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] libvirt: uprev to 1.3.2
2016-03-31 7:55 [V3][PATCH 0/1] " Yunguo Wei
@ 2016-03-31 7:55 ` Yunguo Wei
0 siblings, 0 replies; 4+ messages in thread
From: Yunguo Wei @ 2016-03-31 7:55 UTC (permalink / raw)
To: bruce.ashfield, meta-virtualization
Release notes here http://libvirt.org/news.html.
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
---
.../0001-to-fix-build-error.patch | 24 ++---
recipes-extended/libvirt/libvirt-python.inc | 4 +-
...vert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch | 52 +++-------
.../libvirt/libvirt/libvirt_api_xml_path.patch | 14 +--
recipes-extended/libvirt/libvirt/runptest.patch | 2 +-
...ibvirt-net-rpc-to-virt-host-validate-when.patch | 107 ++++++++-------------
.../{libvirt_1.2.19.bb => libvirt_1.3.2.bb} | 6 +-
7 files changed, 85 insertions(+), 124 deletions(-)
rename recipes-extended/libvirt/{libvirt-1.2.19 => libvirt-1.3.2}/0001-to-fix-build-error.patch (65%)
rename recipes-extended/libvirt/{libvirt_1.2.19.bb => libvirt_1.3.2.bb} (97%)
diff --git a/recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch b/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
similarity index 65%
rename from recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
rename to recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
index 61a54e1..089ee33 100644
--- a/recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
+++ b/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
@@ -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>
Date: Fri, 31 Jul 2015 03:17:07 +0900
Subject: [PATCH] to fix build error
@@ -13,32 +13,34 @@ The error likes as following
| make[3]: *** Waiting for unfinished jobs....
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 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
-index daf37b6..125c5fd 100644
+index 1b4353b..c199551 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
-@@ -162,7 +162,7 @@ EXTRA_DIST= \
- sitemap.html.in aclperms.htmlinc \
- todo.pl hvsupport.pl todo.cfg-example
+@@ -164,7 +164,7 @@ EXTRA_DIST= \
+ todo.pl hvsupport.pl todo.cfg-example \
+ $(schema_DATA)
-acl_generated = aclperms.htmlinc
+acl.html:: $(srcdir)/aclperms.htmlinc
$(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
$(srcdir)/genaclperms.pl Makefile.am
-@@ -227,7 +227,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
- $(top_srcdir)/docs/subsite.xsl $< > $@ \
- || { rm $@ && exit 1; }; fi
+@@ -221,7 +221,7 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \
+ convert -rotate 90 $< $@
--%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated)
-+%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in
+ %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
+- sitemap.html.in $(acl_generated)
++ sitemap.html.in
@if [ -x $(XSLTPROC) ] ; then \
echo "Generating $@"; \
name=`echo $@ | sed -e 's/.tmp//'`; \
--
-1.8.4.2
+1.9.1
diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index 015b4b6..c1dafe9 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -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 += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}"
-SRC_URI[libvirt_python.md5sum] = "429e328028fc59b62404a4163004f2ae"
-SRC_URI[libvirt_python.sha256sum] = "88ab63b0c53e435bd2c6e8551805fe273353708efd4dfab908257dc5f37bec49"
+SRC_URI[libvirt_python.md5sum] = "ed018c714d7ddbe93221c796dff283ed"
+SRC_URI[libvirt_python.sha256sum] = "6d35ae9e7801573393b9c92471f39e6700d479f10b641df81d041b469f160bf8"
export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
export LIBVIRT_CFLAGS = "-I${S}/include"
diff --git a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch b/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
index c2606bd..16c3a16 100644
--- a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
+++ b/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
@@ -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>
Date: Wed, 9 Sep 2015 11:52:44 -0400
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.
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 ++--
- src/Makefile.am | 4 ++--
- tools/Makefile.am | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
+ daemon/Makefile.am | 2 +-
+ src/Makefile.am | 2 +-
+ tools/Makefile.am | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index 00221ab..e5c5db8 100644
+index 2dbe81b..41ea2db 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
-@@ -1,6 +1,6 @@
- ## 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
+@@ -445,7 +445,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART
if LIBVIRT_INIT_SCRIPT_SYSTEMD
@@ -38,39 +32,25 @@ index 00221ab..e5c5db8 100644
+SYSTEMD_UNIT_DIR = /lib/systemd/system
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
-index 8f77658..57e163f 100644
+index a316b4d..d271291 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1,6 +1,6 @@
- ## 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 += \
+@@ -2594,7 +2594,7 @@ EXTRA_DIST += \
if WITH_LIBVIRTD
if LIBVIRT_INIT_SCRIPT_SYSTEMD
-SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+SYSTEMD_UNIT_DIR = /lib/systemd/system
- BUILT_SOURCES += virtlockd.service virtlockd.socket
- DISTCLEANFILES += virtlockd.service virtlockd.socket
+ BUILT_SOURCES += virtlockd.service virtlockd.socket \
+ virtlogd.service virtlogd.socket
diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 6847f13..256a8f3 100644
+index b3227a7..0e58f73 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
-@@ -1,4 +1,4 @@
--## 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
+@@ -356,7 +356,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh
EXTRA_DIST += libvirt-guests.service.in
diff --git a/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch b/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
index 16321db..3c2622c 100644
--- a/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
+++ b/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
@@ -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.
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 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
@@ -56,19 +58,19 @@ Index: libvirt-python-1.2.4/setup.py
c_modules = []
py_modules = []
-- ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False)
-- cflags = get_pkgconfig_data(["--cflags"], "libvirt", False)
+- ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
+- cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
+ libvirt_cflags = os.getenv("LIBVIRT_CFLAGS")
+ if libvirt_cflags:
-+ cflags = libvirt_cflags
++ cflags = libvirt_cflags.split()
+ else:
-+ cflags = get_pkgconfig_data(["--cflags"], "libvirt", False)
++ cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split()
+
+ libvirt_libs = os.getenv("LIBVIRT_LIBS")
+ if libvirt_libs:
-+ ldflags = libvirt_libs
++ ldflags = libvirt_libs.split()
+ else:
-+ ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False)
++ ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split()
module = Extension('libvirtmod',
sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'],
diff --git a/recipes-extended/libvirt/libvirt/runptest.patch b/recipes-extended/libvirt/libvirt/runptest.patch
index 873a959..a33f569 100644
--- a/recipes-extended/libvirt/libvirt/runptest.patch
+++ b/recipes-extended/libvirt/libvirt/runptest.patch
@@ -20,8 +20,8 @@ Index: libvirt-1.2.4/tests/Makefile.am
+ -Dabs_builddir="\"$(PTEST_DIR)/tests\"" \
+ -Dabs_srcdir="\"$(PTEST_DIR)/tests\"" \
$(LIBXML_CFLAGS) \
+ $(LIBNL_CFLAGS) \
$(GNUTLS_CFLAGS) \
- $(SASL_CFLAGS) \
@@ -48,7 +50,7 @@
if WITH_DRIVER_MODULES
diff --git a/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch b/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
index 9141044..a7fc727 100644
--- a/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
+++ b/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
@@ -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>
Date: Fri, 2 Aug 2013 11:38:43 -0400
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.
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/domsuspend/Makefile.am | 7 +++++++
- examples/hellolibvirt/Makefile.am | 7 +++++++
- examples/openauth/Makefile.am | 6 ++++++
- tools/Makefile.am | 13 +++++++++++++
- 5 files changed, 40 insertions(+)
+ examples/Makefile.am | 19 +++++++++++++++++++
+ tools/Makefile.am | 13 +++++++++++++
+ 2 files changed, 32 insertions(+)
-diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am
-index 4a30c7768df9..99b3e17eb741 100644
---- a/examples/dominfo/Makefile.am
-+++ b/examples/dominfo/Makefile.am
-@@ -23,3 +23,10 @@ noinst_PROGRAMS=info1
- info1_SOURCES=info1.c
- info1_LDFLAGS=
- info1_LDADD= $(LDADDS)
-+
-+if WITH_GNUTLS
-+info1_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
-+ $(top_builddir)/gnulib/lib/libgnu.la \
-+ $(NULL)
-+endif
-+
-diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am
-index b8e65f24a28d..9553e0f1d948 100644
---- a/examples/domsuspend/Makefile.am
-+++ 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
-+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 2adcefb..fff49d4 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -39,6 +39,10 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \
+ LDADD = $(STATIC_BINARIES) $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) \
+ $(top_builddir)/src/libvirt.la $(top_builddir)/gnulib/lib/libgnu.la
+
+if WITH_GNUTLS
-+hellolibvirt_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
-+ $(top_builddir)/gnulib/lib/libgnu.la \
-+ $(NULL)
++LDADD += $(top_builddir)/src/libvirt-net-rpc.la
+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
+ 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
-+openauth_LDADD += $(top_builddir)/src/libvirt-net-rpc.la \
-+ $(top_builddir)/gnulib/lib/libgnu.la \
-+ $(NULL)
++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)
+endif
+
+ if WITH_APPARMOR_PROFILES
+ apparmordir = $(sysconfdir)/apparmor.d/
+ apparmor_DATA = \
diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 256a8f37a2a9..837a83fb612a 100644
+index 0be3567..b3227a7 100644
--- a/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 \
$(NULL)
@@ -92,9 +69,9 @@ index 256a8f37a2a9..837a83fb612a 100644
+
+
virt_host_validate_CFLAGS = \
+ $(LIBXML_CFLAGS) \
$(WARN_CFLAGS) \
- $(PIE_CFLAGS) \
-@@ -214,6 +221,12 @@ virsh_CFLAGS = \
+@@ -256,6 +263,12 @@ virt_admin_CFLAGS = \
$(READLINE_CFLAGS)
BUILT_SOURCES =
@@ -108,5 +85,5 @@ index 256a8f37a2a9..837a83fb612a 100644
virsh_LDADD += virsh_win_icon.$(OBJEXT)
--
-1.8.1.2
+1.9.1
diff --git a/recipes-extended/libvirt/libvirt_1.2.19.bb b/recipes-extended/libvirt/libvirt_1.3.2.bb
similarity index 97%
rename from recipes-extended/libvirt/libvirt_1.2.19.bb
rename to recipes-extended/libvirt/libvirt_1.3.2.bb
index 4de284c..42066c1 100644
--- a/recipes-extended/libvirt/libvirt_1.2.19.bb
+++ b/recipes-extended/libvirt/libvirt_1.3.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://libvirt.org"
LICENSE = "LGPLv2.1+"
LICENSE_${PN}-ptest = "GPLv2+ & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
+ file://COPYING.LESSER;md5=4b54a1fd55a448865a0b32d41598759d"
SECTION = "console/tools"
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 \
"
-SRC_URI[libvirt.md5sum] = "bc3ab1ba5b6fabd2e4516c70ddd4d97c"
-SRC_URI[libvirt.sha256sum] = "282c141f03331d640020c15f81464b27400e0ee307ef4c5190393b021caedd6e"
+SRC_URI[libvirt.md5sum] = "b48b06bbc7efbe9973ed0f3f223d6da2"
+SRC_URI[libvirt.sha256sum] = "e3c6fc2683178660b371efb3ac7a1103a3f4b78efac7ffe560bc5917974ccf05"
inherit autotools gettext update-rc.d pkgconfig ptest systemd
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-03-31 8:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-31 5:58 [V2][PATCH 0/1] libvirt: uprev to 1.3.2 Yunguo Wei
2016-03-31 5:58 ` [PATCH 1/1] " Yunguo Wei
2016-03-31 6:18 ` Yunguo Wei
-- strict thread matches above, loose matches on Subject: below --
2016-03-31 7:55 [V3][PATCH 0/1] " Yunguo Wei
2016-03-31 7:55 ` [PATCH 1/1] " Yunguo Wei
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.