[Xen-changelog] [xen-unstable] Merge with xen-isa64-unstable.hg

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID af2155df2aed30090468bd71981b6dc4b2bb7c27
# Parent  cf05aabe6e65840cd98a97f62cecd452de1b8716
# Parent  eabd485c042d302d3a502aa015cb00a70c8a8af0
Merge with xen-isa64-unstable.hg
---
 tools/xm-test/ramdisk/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r cf05aabe6e65 -r af2155df2aed tools/xm-test/ramdisk/Makefile.am
--- a/tools/xm-test/ramdisk/Makefile.am Wed Oct 25 15:29:00 2006 -0600
+++ b/tools/xm-test/ramdisk/Makefile.am Thu Oct 26 11:26:05 2006 +0100
@@ -17,9 +17,9 @@ BR_ARCH ?= $(shell uname -m | sed -e s/i
 BR_ARCH ?= $(shell uname -m | sed -e s/i.86/i386/ -e 's/ppc\(64\)*/powerpc/')
 
 @MK@ifdef BR_SNAPSHOT
-  BR_URL = 
http://buildroot.uclibc.org/downloads/snapshots/buildroot-snapshot.tar.bz2
+@MK@  BR_URL = 
http://buildroot.uclibc.org/downloads/snapshots/buildroot-snapshot.tar.bz2
 @MK@else
-  BR_URL ?= http://xm-test.xensource.com/ramdisks/buildroot-20061023.tar.bz2
+@MK@  BR_URL = http://xm-test.xensource.com/ramdisks/buildroot-20061023.tar.bz2
 @MK@endif
 BR_TAR = $(notdir $(BR_URL))
 

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