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, 28 May 2014 12:13:54 -0400 Message-ID: <53860B42.6050606@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> <537CAF8E.5000302@oracle.com> <1400681813.4856.107.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------050801090401050404010001" Return-path: In-Reply-To: <1400681813.4856.107.camel@kazak.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: Andrew Cooper , Olaf Hering , Ian Jackson , xen-devel List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------050801090401050404010001 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 --------------050801090401050404010001 Content-Type: text/x-patch; name="xen-tools-qemu-private.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen-tools-qemu-private.patch" commit e6171e9954901bad7bd118d9c27a030d980a866f 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..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 \ --------------050801090401050404010001 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 --------------050801090401050404010001--