|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH 1/3] Don't accept fuzz when patching
On Fri, Jun 10, 2016 at 12:02:43PM +0100, Ross Lagerwall wrote:
> 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@xxxxxxxxxx>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |