From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zhigang Wang Subject: Re: libcacard is been installed to /usr/lib while libdir=/usr/lib64 Date: Wed, 21 May 2014 09:52:14 -0400 Message-ID: <537CAF8E.5000302@oracle.com> References: <537162DD.7000304@oracle.com> <1400166650.19926.14.camel@kazak.uk.xensource.com> <5374E338.4060908@oracle.com> <1400589649.6946.31.camel@kazak.uk.xensource.com> <20140520130224.GA19255@aepfle.de> <537B5383.5010401@citrix.com> <537B56C0.20201@oracle.com> <537B8914.8060100@oracle.com> <20140521074631.GA5418@aepfle.de> <1400667931.4856.7.camel@kazak.uk.xensource.com> <20140521105052.GA10202@aepfle.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------030600060608040407000001" Return-path: In-Reply-To: <20140521105052.GA10202@aepfle.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Olaf Hering Cc: Andrew Cooper , Ian Jackson , Ian Campbell , xen-devel List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------030600060608040407000001 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 05/21/2014 06:50 AM, Olaf Hering wrote: > On Wed, May 21, Ian Campbell wrote: > >> On Wed, 2014-05-21 at 09:46 +0200, Olaf Hering wrote: >>> On Tue, May 20, Zhigang Wang wrote: >>> >>>> +++ b/tools/Makefile >>>> @@ -188,11 +188,14 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find >>>> $$source/configure --enable-xen --target-list=i386-softmmu \ >>>> $(QEMU_XEN_ENABLE_DEBUG) \ >>>> --prefix=$(PREFIX) \ >>> >>> Looks ok to me. You may want to change also --prefix to $PREFIX/lib/xen >>> with this patch >> >> I think it would be nice to get our special qemu build out of general >> $PATH. Ian J -- do you agree? >> >>> and see if anything needs adjustment. >> >> libxl certainly will I think, in qemu_xen_path at least > > This is already handled by --bindir=, the "if anything needs adjustment" > means most likely data and /etc paths. But then, qemu is supposed to > cope with any --prefix= so I guess the different prefix will just work. 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. 3. It seems nothing will conflict with system qemu or qemu-kvm any more. I think it's the right way to go. I will do more test and report any issues I find. Thanks, Zhigang --------------030600060608040407000001 Content-Type: text/x-patch; name="xen-tools-qemu-prefix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen-tools-qemu-prefix.patch" commit 50e098b1ea0b2ca0f81e29279071ba230d841b7b Author: Zhigang Wang 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 diff --git a/tools/Makefile b/tools/Makefile index 992fe3e..c21ec53 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -187,12 +187,15 @@ 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 \ -I$(XEN_ROOT)/tools/xenstore \ -I$(XEN_ROOT)/tools/xenstore/compat \ + -Wl,-rpath=$(PREFIX)/lib/xen/lib \ $(EXTRA_CFLAGS_QEMU_XEN)" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ -L$(XEN_ROOT)/tools/xenstore" \ --------------030600060608040407000001 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------030600060608040407000001--