[Xen-changelog] merge.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian.Campbell@xxxxxxxxxxxxx
# Node ID a450063e64ab225121f359f11bc6997342266ad7
# Parent  c84a051d89670408e696cad2528ad14d062f9345
# Parent  b96705f5343ccd737e7cd9b69505373e2a7b9ac3
merge.

diff -r c84a051d8967 -r a450063e64ab tools/xm-test/ramdisk/Makefile.am
--- a/tools/xm-test/ramdisk/Makefile.am Wed Feb  1 20:12:51 2006
+++ b/tools/xm-test/ramdisk/Makefile.am Wed Feb  1 20:15:08 2006
@@ -31,7 +31,7 @@
        cp configs/busybox $(BR_SRC)/package/busybox/busybox.config
        cp configs/uClibc $(BR_SRC)/toolchain/uClibc/uClibc.config
        (for i in patches/buildroot/*.patch; do \
-         cd $(BR_SRC) && patch -p1 <../$$i; done )
+         cd $(BR_SRC) && patch -p1 <../$$i && cd ..; done )
        cd $(BR_SRC) && make oldconfig && make
 
 $(XMTEST_VER_IMG): $(BR_IMG)
@@ -67,5 +67,4 @@
        rm -f *~
        rm -f initrd.img
        rm -f $(BR_TAR)
-       rm -Rf patches make.d
        rm -f disk.img

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