From: Paul Larson Subject: [PATCH] Fix rebuilding in xmtest Date: Wed, 14 Jun 2006 16:59:56 -0500 Message-ID: <200606141700.01160.pl@us.ibm.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1155383774==" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel List-Id: xen-devel@lists.xenproject.org --===============1155383774== Content-Type: multipart/signed; boundary="nextPart2811061.7zZC0tcUL8"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit --nextPart2811061.7zZC0tcUL8 Content-Type: multipart/mixed; boundary="Boundary-01=_cbIkEV5Ab4+FVmt" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_cbIkEV5Ab4+FVmt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline I had a build of the ramdisk fail on me with xmtest and noticed that it=20 doesn't like to build if you've already gone partway through it because of= =20 some patches that will now fail since they are already applied. This makes= =20 it default to forward-apply the patches so that it won't ask you, and it=20 forces make to ignore the error if the patch has been already applied. The= =20 downside is that it will also get ignored if the patch fails to apply for a= ny=20 other reason, though I can't say I've ever seen this as being an issue in=20 building the xmtest ramdisk. Signed-off-by: Paul Larson --Boundary-01=_cbIkEV5Ab4+FVmt Content-Type: text/x-diff; charset="us-ascii"; name="xmtest-rebuild.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xmtest-rebuild.patch" diff -r 360f9dc71f51 tools/xm-test/ramdisk/Makefile.am =2D-- a/tools/xm-test/ramdisk/Makefile.am Tue Jun 13 11:41:15 2006 +0100 +++ b/tools/xm-test/ramdisk/Makefile.am Wed Jun 14 16:53:18 2006 -0500 @@ -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 =2D (for i in patches/buildroot/*.patch; do \ =2D 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 =20 $(XMTEST_VER_IMG): $(BR_IMG) --Boundary-01=_cbIkEV5Ab4+FVmt-- --nextPart2811061.7zZC0tcUL8 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) iD8DBQBEkIbhBwrpIrndMlIRAhrMAKCqKvCBWrOih8t+d27FD0Ri5O2AUgCdFMus Iw/9lrsu1oMFfGU/lj5yb1E= =PR0o -----END PGP SIGNATURE----- --nextPart2811061.7zZC0tcUL8-- --===============1155383774== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --===============1155383774==--