aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xm-test/ramdisk
diff options
context:
space:
mode:
authorstekloff@elm3b216.beaverton.ibm.com <stekloff@elm3b216.beaverton.ibm.com>2006-02-03 09:34:03 +0000
committerstekloff@elm3b216.beaverton.ibm.com <stekloff@elm3b216.beaverton.ibm.com>2006-02-03 09:34:03 +0000
commitd353d82ab3ad1a096fa5ab714120f3f5d355ea07 (patch)
treee32239bf97e26dbb97655101b781f1557d9dbffb /tools/xm-test/ramdisk
parentc8c4472c3d5c177581aa00d4f015f64e3723c9f2 (diff)
downloadxen-d353d82ab3ad1a096fa5ab714120f3f5d355ea07.tar.gz
xen-d353d82ab3ad1a096fa5ab714120f3f5d355ea07.tar.bz2
xen-d353d82ab3ad1a096fa5ab714120f3f5d355ea07.zip
Make "make disk.img" not require building the entire buildroot if initrd
already exists. Changed dependency for disk.img to "existing" and added a line to make existing false. Signed-off-by: Daniel Stekloff <dsteklof@us.ibm.com>
Diffstat (limited to 'tools/xm-test/ramdisk')
-rw-r--r--tools/xm-test/ramdisk/Makefile.am10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/xm-test/ramdisk/Makefile.am b/tools/xm-test/ramdisk/Makefile.am
index 9352501059..06cec439b7 100644
--- a/tools/xm-test/ramdisk/Makefile.am
+++ b/tools/xm-test/ramdisk/Makefile.am
@@ -43,7 +43,7 @@ $(XMTEST_VER_IMG): $(BR_IMG)
initrd.img: $(XMTEST_VER_IMG)
ln -sf $(XMTEST_VER_IMG) initrd.img
-disk.img: $(XMTEST_VER_IMG)
+disk.img: existing
chmod a+x $(HVM_SCRIPT)
@if test ! "$(HVMKERNEL)" = "no" -a ! "$(DRVDIR)" = "no"; then \
$(HVM_SCRIPT) -r $(XMTEST_VER_IMG) -k $(HVMKERNEL) \
@@ -57,8 +57,12 @@ disk.img: $(XMTEST_VER_IMG)
fi
existing:
- @[ -f $(XMTEST_VER_IMG) ] && ln -sf $(XMTEST_VER_IMG) initrd.img || \
- echo Error, $(XMTEST_VER_IMG) not found
+ @if [ -f $(XMTEST_VER_IMG) ] ; then \
+ ln -sf $(XMTEST_VER_IMG) initrd.img; \
+ else \
+ echo Error, $(XMTEST_VER_IMG) not found; \
+ false; \
+ fi
clean-local: am_config_clean-local