diff options
| author | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2006-12-08 09:09:18 -0700 |
|---|---|---|
| committer | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2006-12-08 09:09:18 -0700 |
| commit | 074183415330495221dfb6d4b7ea4284350ee4fd (patch) | |
| tree | c72747fcfaefee0cc2a09eeb1e51aa1582a6fd9d /tools/xm-test | |
| parent | aa464f07de73523b957eeb056940bd2b4d50118a (diff) | |
| parent | b65f717688423c3b3f770d38d63ad681a53121c4 (diff) | |
| download | xen-074183415330495221dfb6d4b7ea4284350ee4fd.tar.gz xen-074183415330495221dfb6d4b7ea4284350ee4fd.tar.bz2 xen-074183415330495221dfb6d4b7ea4284350ee4fd.zip | |
merge with xen-unstable.hg
Diffstat (limited to 'tools/xm-test')
| -rw-r--r-- | tools/xm-test/ramdisk/Makefile.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/xm-test/ramdisk/Makefile.am b/tools/xm-test/ramdisk/Makefile.am index 14bfc9267c..b6c59d60e5 100644 --- a/tools/xm-test/ramdisk/Makefile.am +++ b/tools/xm-test/ramdisk/Makefile.am @@ -34,6 +34,7 @@ HVM_SCRIPT = bin/create_disk_image XMTEST_MAJ_VER = $(shell echo @PACKAGE_VERSION@ | perl -pe 's/(\d+)\.(\d+)\.\d+/\1.\2/') XMTEST_VER_IMG = initrd-$(XMTEST_MAJ_VER)-$(BR_ARCH).img +XMTEST_DL_IMG = $(shell echo $(XMTEST_VER_IMG) | sed -e 's/x86_64/i386/g') EXTRA_ROOT_DIRS = sys @@ -83,7 +84,12 @@ disk.img: existing existing: @if [ -n "$(INITRD)" ] && [ ! -f $(XMTEST_VER_IMG) ] ; then \ - wget $(INITRD)/$(XMTEST_VER_IMG); \ + if [ ! -f $(XMTEST_DL_IMG) ] ; then \ + wget $(INITRD)/$(XMTEST_DL_IMG); \ + fi; \ + if [ "$(XMTEST_DL_IMG)" != "$(XMTEST_VER_IMG)" ] ; then \ + ln -s $(XMTEST_DL_IMG) $(XMTEST_VER_IMG); \ + fi \ fi @if [ -f $(XMTEST_VER_IMG) ] ; then \ ln -sf $(XMTEST_VER_IMG) initrd.img; \ |