Re: Re: [PATCH] ioemu: Fixes for build/install system

[Christoph Egger <Christoph.Egger@amd.com>]

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

On Thursday 23 April 2009 17:43:30 Ian Jackson wrote:
> Christoph Egger writes ("[Xen-devel] Re: [PATCH] ioemu: Fixes for 
build/install system"):
> >  install-doc: $(DOCS)
> > -	mkdir -p "$(DESTDIR)$(docdir)"
> > -	$(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
> > +	$(INSTALL_DIR) "$(DESTDIR)$(docdir)"
> > +	$(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
> >  ifndef CONFIG_WIN32
> > -	mkdir -p "$(DESTDIR)$(mandir)/man1"
> > -	$(INSTALL) -m 644 qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
> > -	mkdir -p "$(DESTDIR)$(mandir)/man8"
> > -	$(INSTALL) -m 644 qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
> > +	$(INSTALL_DIR) "$(DESTDIR)$(MAN1DIR)"
> > +	$(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(MAN1DIR)"
> > +	$(INSTALL_DIR) "$(DESTDIR)$(MAN8DIR)"
> > +	$(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(MAN8DIR)"
>
> Once again, these are changes to code from upstream.  I see that this
> change has been applied upstream.  Please try to avoid submitting
> changes for inclusion both in upstream and in qemu-xen-unstable.  That
> causes trouble when I pull.  If there is a compelling reason why
> the change should be included in Xen before we get it via upstream in
> the usual course of events, then we might relax this rule but you
> should mention this fact and give an explanation.
>
> In this case the upstream change comes too late to be included in 3.4
> - it is (quite correctly) only on the upstream main branch, not on the
> upstream stable branch.
>
> Ian.


Attached w/o qemu specific changes.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

[-- Attachment #2: xen_build_ioemu.diff --]
[-- Type: text/x-diff, Size: 2637 bytes --]

diff --git a/Makefile b/Makefile
index c395e77..d5941c7 100644
--- a/Makefile
+++ b/Makefile
@@ -46,10 +46,11 @@ $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a
 
 recurse-all: $(SUBDIR_RULES)
 
-tapdisk-ioemu: CPPFLAGS += -I$(XEN_ROOT)/tools/libxc
-tapdisk-ioemu: CPPFLAGS += -I$(XEN_ROOT)/tools/blktap/lib
-tapdisk-ioemu: CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore
-tapdisk-ioemu: CPPFLAGS += -I$(XEN_ROOT)/tools/include
+CPPFLAGS += -I$(XEN_ROOT)/tools/libxc
+CPPFLAGS += -I$(XEN_ROOT)/tools/blktap/lib
+CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore
+CPPFLAGS += -I$(XEN_ROOT)/tools/include
+
 tapdisk-ioemu: tapdisk-ioemu.c cutils.c block.c block-raw.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-qcow2.c hw/xen_blktap.c osdep.c
 	$(CC) -DQEMU_TOOL $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $(LDFLAGS) $(BASE_LDFLAGS) -o $@ $^ -lz $(LIBS)
 
diff --git a/xen-config.mak b/xen-config.mak
index 6210619..40984bc 100644
--- a/xen-config.mak
+++ b/xen-config.mak
@@ -8,4 +8,4 @@ CONFIG_SOFTMMU=yes
 
 CFLAGS += -I$(QEMU_ROOT)/hw
 
-bindir = ${prefix}/${LIBLEAFDIR}/xen/bin
+bindir = ${LIBEXEC}
diff --git a/xen-setup b/xen-setup
index 8ca0019..946dfc0 100755
--- a/xen-setup
+++ b/xen-setup
@@ -9,7 +9,7 @@ rm -f config-host.mak
 
 if test -f config-host.h; then mv config-host.h config-host.h~; fi
 
-./configure --disable-gfx-check --disable-curses --disable-slirp "$@" --prefix=/usr
+./configure --disable-gfx-check --disable-curses --disable-slirp "$@" --prefix=${PREFIX}
 
 target=i386-dm
 
diff --git a/xen-setup-stubdom b/xen-setup-stubdom
index 835e505..086c834 100755
--- a/xen-setup-stubdom
+++ b/xen-setup-stubdom
@@ -21,7 +21,7 @@ TARGET_CPPFLAGS += $TARGET_CPPFLAGS -DCONFIG_STUBDOM -D__XEN_TOOLS__
 TARGET_CFLAGS= $TARGET_CFLAGS
 TARGET_LDFLAGS= $TARGET_LDFLAGS
 
-bindir = \${prefix}/\${LIBLEAFDIR}/xen/bin
+bindir = \${LIBEXEC}
 END
 mv -f $target/config.mak.new $target/config.mak
 #----------
@@ -31,7 +31,7 @@ ln -sf ../i386-dm/hookslib.mak $target/
 
 #----------
 cat <<END >config-host.h.new
-#define CONFIG_QEMU_SHAREDIR "/usr/share/xen/qemu"
+#define CONFIG_QEMU_SHAREDIR "${SHAREDIR}/xen/qemu"
 #define HOST_I386 1
 #define HOST_LONG_BITS 32
 #define HAVE_BYTESWAP_H 1
@@ -46,11 +46,11 @@ mv -f config-host.h.new config-host.h
 #----------
 cat <<END >config-host.mak.new
 CONFIG_STUBDOM=yes
-prefix=/usr
+prefix=$(PREFIX)
 bindir=\${prefix}/bin
-mandir=\${prefix}/share/man
-datadir=\${prefix}/share/qemu
-docdir=\${prefix}/share/doc/qemu
+mandir=\$(MANDIR)
+datadir=\$(SHAREDIR)/qemu
+docdir=\$(SHAREDIR)/doc/qemu
 MAKE=make
 INSTALL=install
 CC=gcc

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

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