1 From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2 Date: Fri, 31 May 2013 11:01:05 +0300
3 Subject: pristine-gz: obey the XDELTA_PROGRAM build parameter
5 Change-Id: I571466bacc8b50a7b2d2c7681b4d7ab1083508ad
6 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
8 pristine-gz | 9 +++++++--
9 1 file changed, 7 insertions(+), 2 deletions(-)
11 diff --git a/pristine-gz b/pristine-gz
12 index 3668256..00c0055 100755
15 @@ -96,6 +96,11 @@ use File::Basename qw/basename/;
19 +# The following assignment is potentially munged during the
20 +# build process to hold the value of XDELTA_PROGRAM
21 +# parameter as given to Makefile.PL.
22 +my $xdelta_program = "xdelta";
27 @@ -234,7 +239,7 @@ sub reproducegz {
29 # generate a binary delta and see if this is the
31 - my $ret=system("xdelta delta -0 --pristine $tempout $orig $tempdir/tmpdelta 2>/dev/null") >> 8;
32 + my $ret=system("$xdelta_program delta -0 --pristine $tempout $orig $tempdir/tmpdelta 2>/dev/null") >> 8;
33 # xdelta exits 1 on success
35 my $size=(stat("$tempdir/tmpdelta"))[7];
36 @@ -297,7 +302,7 @@ sub gengz {
37 my $tempdir=tempdir();
38 my $tfile="$tempdir/".basename($file).".gz";
39 doit_redir($file, $tfile, @zgz);
40 - doit("xdelta", "patch", "--pristine", $delta->{delta}, $tfile, "$file.gz");
41 + doit("$xdelta_program", "patch", "--pristine", $delta->{delta}, $tfile, "$file.gz");
44 doit_redir("$file", "$file.gz", @zgz);