[Xen-devel] Re: [PATCH] Improve plumbing for calling external qemu builds

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

I wrote:
> * Remove case-based arrangement for making XEN_ROOT absolute
>   and replace with $(abspath ...) since we depend on GNU make
>   anyway.

It turns out that this is a recently-introduced GNU make feature.
I must remember to check.

The attached patch, against current tip, reverts that part of 17992
(and fixes a quoting bug that was in the previous code).

Ian.

diff -r 5cd4fe68b6c2 Config.mk
--- a/Config.mk Tue Jul 08 17:25:04 2008 +0100
+++ b/Config.mk Wed Jul 09 09:50:36 2008 +0100
@@ -82,8 +82,8 @@ QEMU_REMOTE=http://www.chiark.greenend.o
 
 # Specify which qemu-dm to use. This may be `ioemu' to use the old
 # Mercurial in-tree version, or a local directory, or a git URL.
-CONFIG_QEMU     ?= ioemu
-# CONFIG_QEMU   ?= ../qemu-xen.git
+# CONFIG_QEMU     ?= ioemu
+CONFIG_QEMU   ?= /u/iwj/work/qemu-iwj.git
 # CONFIG_QEMU   ?= $(QEMU_REMOTE)
 
 # Optional components
diff -r 5cd4fe68b6c2 tools/Makefile
--- a/tools/Makefile    Tue Jul 08 17:25:04 2008 +0100
+++ b/tools/Makefile    Wed Jul 09 09:50:36 2008 +0100
@@ -82,7 +82,14 @@ ioemu-dir-find:
                rm -f ioemu-dir; \
                ln -sf ioemu-remote ioemu-dir; \
        fi
-       cd ioemu-dir && XEN_ROOT="$(abspath $(XEN_ROOT))" ./xen-setup
+       set -e; \
+               case "$(XEN_ROOT)" in \
+               /*)     XEN_ROOT=$(XEN_ROOT) ;; \
+               *)      XEN_ROOT=`pwd`/$(XEN_ROOT) ;; \
+               esac; \
+               export XEN_ROOT; \
+               cd ioemu-dir; \
+               ./xen-setup
 
 subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find
 

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