From: Ross Lagerwall <ross.lagerwall@citrix.com>
To: xen-devel@lists.xen.org
Cc: Ross Lagerwall <ross.lagerwall@citrix.com>
Subject: [PATCH 1/3] Don't accept fuzz when patching
Date: Fri, 10 Jun 2016 12:02:43 +0100 [thread overview]
Message-ID: <1465556565-26403-1-git-send-email-ross.lagerwall@citrix.com> (raw)
When testing and applying patches, set fuzz=0 so that patches must apply
exactly. Also set "-f" to avoid interactive questions, and reorder so
that patches are tested before the output directory is created.
Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
---
livepatch-build | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/livepatch-build b/livepatch-build
index a49e0d4..8dc8889 100755
--- a/livepatch-build
+++ b/livepatch-build
@@ -257,23 +257,22 @@ echo
if [ "${SKIP}" != "build" ]; then
[ -e "${OUTPUT}" ] && die "Output directory exists"
- mkdir -p "${OUTPUT}" || die
-
- echo "Testing patch file..."
cd "$SRCDIR" || die
- patch -s -N -p1 --dry-run < "$PATCHFILE" || die "source patch file failed to apply"
+ patch -s -N -p1 -f --fuzz=0 --dry-run < "$PATCHFILE" || die "Source patch file failed to apply"
+
+ mkdir -p "${OUTPUT}" || die
echo "Perform full initial build with ${CPUS} CPU(s)..."
build_full
echo "Apply patch and build with ${CPUS} CPU(s)..."
cd "$SRCDIR" || die
- patch -s -N -p1 < "$PATCHFILE" || die
+ patch -s -N -p1 -f --fuzz=0 < "$PATCHFILE" || die
build_special patched
echo "Unapply patch and build with ${CPUS} CPU(s)..."
cd "$SRCDIR" || die
- patch -s -R -p1 < "$PATCHFILE" || die
+ patch -s -R -p1 -f --fuzz=0 < "$PATCHFILE" || die
build_special original
fi
--
2.4.11
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next reply other threads:[~2016-06-10 11:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-10 11:02 Ross Lagerwall [this message]
2016-06-10 11:02 ` [PATCH 2/3] Update to use a .config file Ross Lagerwall
2016-06-14 15:35 ` Konrad Rzeszutek Wilk
2016-06-15 8:08 ` Ross Lagerwall
2016-06-15 14:00 ` Konrad Rzeszutek Wilk
2016-07-14 8:05 ` Ross Lagerwall
2016-07-15 13:36 ` Konrad Rzeszutek Wilk
2016-07-16 1:55 ` Konrad Rzeszutek Wilk
2016-07-18 9:33 ` Ross Lagerwall
2016-07-18 10:28 ` Konrad Rzeszutek Wilk
2016-06-10 11:02 ` [PATCH 3/3] Update README.md Ross Lagerwall
2016-06-14 15:36 ` Konrad Rzeszutek Wilk
2016-06-13 10:08 ` [PATCH 1/3] Don't accept fuzz when patching George Dunlap
2016-06-13 10:16 ` Andrew Cooper
2016-06-13 10:57 ` George Dunlap
2016-06-13 10:23 ` Ross Lagerwall
2016-06-14 15:33 ` Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465556565-26403-1-git-send-email-ross.lagerwall@citrix.com \
--to=ross.lagerwall@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.