PV-GRUB: Check for errors when applying patches to GRUB
authorMatt Wilson <msw@amazon.com>
Wed, 4 Apr 2012 10:09:14 +0000 (11:09 +0100)
committerMatt Wilson <msw@amazon.com>
Wed, 4 Apr 2012 10:09:14 +0000 (11:09 +0100)
We want to ensure that patches apply cleanly without rejects. Bail if
patch returns a non-zero exit code.

Signed-off-by: Matt Wilson <msw@amazon.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
stubdom/Makefile

index b63041e72905647581c760a8ce657e6c3f1c9cb3..2da70e3127e6373b2be44f490ec456695c702441 100644 (file)
@@ -331,7 +331,7 @@ grub-upstream: grub-$(GRUB_VERSION).tar.gz
        tar xzf $<
        mv grub-$(GRUB_VERSION) $@
        for i in grub.patches/* ; do \
-               patch -d $@ -p1 < $$i ; \
+               patch -d $@ -p1 < $$i || exit 1; \
        done
 
 .PHONY: grub