Re: libcacard is been installed to /usr/lib while libdir=/usr/lib64

[Zhigang Wang <zhigang.x.wang@oracle.com>]

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

On 05/21/2014 10:16 AM, Ian Campbell wrote:
> On Wed, 2014-05-21 at 09:52 -0400, Zhigang Wang wrote:
> 
>> Here is my test result with attached patch:
>>
>> 1. qemu_helperdir = libexecdir = $prefix/libexec moves. Affection: /usr/libexec/qemu-bridge-helper moves to /usr/lib/xen/libexec/qemu-bridge-helper.
>>
>>      include/net/net.h:#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper"
>>
>>    As the C code already understands this path change, it's not a problem.
>>
>> 2. qemu_confdir = $prefix/etc/qeum moves. Affection: /usr/etc/qemu/target-x86_64.conf moves to /usr/lib/xen/etc/qemu/target-x86_64.conf
>>
>>    Also seems the C code understand this path change.
> 
> Agreed. I think /usr/lib/xen/etc/qemu/ is better than e.g. /etc/xen/qemu
> since that might give the impression of affecting the system qemu when
> used with Xen.
> 
> I think both target-86_64.conf and qemu-bridge-helper both don't do very
> much in a Xen system anyway.
> 
>> 3. It seems nothing will conflict with system qemu or qemu-kvm any more.
>>
>> I think it's the right way to go.
> 
> I agree.
> 
> With your change to --prefix I suspect that --libdir and --includedir
> aren't needed, but there's no harm in passing them I suppose.
> 
>> I will do more test and report any issues I find.
> 
> Thanks.

Here is the latest patch: maybe better to put -Wl,-rpath to LDFLAGS instead of CFLAGS.

It works well from my CentOS 6 test env.

Please review.

Thanks,

Zhigang


[-- Attachment #2: xen-tools-qemu-private.patch --]
[-- Type: text/x-patch, Size: 1299 bytes --]

commit e6171e9954901bad7bd118d9c27a030d980a866f
Author: Zhigang Wang <zhigang.x.wang@oracle.com>
Date:   Tue May 20 13:30:54 2014 -0400

    tools: install qemu libraries to xen private directory and add rpath to it
    
    This patch will prevent our qemu libraries from conflicting with system qemu
    libraries.
    
    Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>

diff --git a/tools/Makefile b/tools/Makefile
index 992fe3e..63382b1 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -187,7 +187,9 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 	cd qemu-xen-dir; \
 	$$source/configure --enable-xen --target-list=i386-softmmu \
 		$(QEMU_XEN_ENABLE_DEBUG) \
-		--prefix=$(PREFIX) \
+		--prefix=$(PREFIX)/lib/xen \
+		--libdir=$(PREFIX)/lib/xen/lib \
+		--includedir=$(PREFIX)/lib/xen/include \
 		--source-path=$$source \
 		--extra-cflags="-I$(XEN_ROOT)/tools/include \
 		-I$(XEN_ROOT)/tools/libxc \
@@ -195,7 +197,8 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 		-I$(XEN_ROOT)/tools/xenstore/compat \
 		$(EXTRA_CFLAGS_QEMU_XEN)" \
 		--extra-ldflags="-L$(XEN_ROOT)/tools/libxc \
-		-L$(XEN_ROOT)/tools/xenstore" \
+		-L$(XEN_ROOT)/tools/xenstore \
+		-Wl,-rpath=$(PREFIX)/lib/xen/lib" \
 		--bindir=$(LIBEXEC) \
 		--datadir=$(SHAREDIR)/qemu-xen \
 		--localstatedir=/var \

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel