Skip to contentSkip to conversation

Fix rebuilding in xmtest

PATCH New Paul Larson 1 participant 1 message Jun 14, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix rebuilding in xmtest

I had a build of the ramdisk fail on me with xmtest and noticed that it doesn't like to build if you've already gone partway through it because of some patches that will now fail since they are already applied. This makes it default to forward-apply the patches so that it won't ask you, and it forces make to ignore the error if the patch has been already applied. The downside is that it will also get ignored if the patch fails to apply for any other reason, though I can't say I've ever seen this as being an issue in building the xmtest ramdisk.

tools/xm-test/ramdisk/Makefile.am +2 -2
diff -r 360f9dc71f51 tools/xm-test/ramdisk/Makefile.am
@@ -33,8 +33,8 @@ endif
 	cp configs/buildroot $(BR_SRC)/.config
 	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 && cd ..; done )
+	-(for i in patches/buildroot/*.patch; do \
+	  cd $(BR_SRC) && patch -N -p1 <../$$i && cd ..; done )
 	cd $(BR_SRC) && make oldconfig && make
 
 $(XMTEST_VER_IMG): $(BR_IMG)

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel