diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-08-31 09:33:34 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:16 +0200 |
| commit | e994a91060c145ad08ef75dcf9862043202ac6ce (patch) | |
| tree | bbfb132ec0d9794b02f45acac91898ddb7a24fa4 | |
| parent | 79fce4ddeb8b45fd047a97507051cd9ca4245f60 (diff) | |
use downloaded rebase.exe with Win8 SDK
Change-Id: Ib7cb49e9c992ba3bd8cc69e7e492f82a493d7053
| -rw-r--r-- | postprocess/rebase/rebase.pl | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl index 546068efade2..f5e5ce05ccf1 100644 --- a/postprocess/rebase/rebase.pl +++ b/postprocess/rebase/rebase.pl @@ -179,7 +179,13 @@ sub rebase_again my $newfiles_ref = shift; my @grownfiles; my $solarbin ="$ENV{SOLARVERSION}/$ENV{INPATH}/bin$ENV{UPDMINOREXT}"; - my $command = "rebase " . $options_string; + my $command; + if ( $ENV{REBASE} eq "download" ) { + $command = $ENV{OUTDIR}."/bin/rebase " . $options_string; + } + else { + $command = "rebase " . $options_string; + } if ( $ENV{WRAPCMD} ) { $command = $ENV{WRAPCMD} . " " . $command; } @@ -241,7 +247,13 @@ sub rebase_again sub rebase_initially { my ($files_ref, $start_address) = @_; - my $command = "rebase "; + my $command; + if ( $ENV{REBASE} eq "download" ) { + $command = $ENV{OUTDIR}."/bin/rebase " . $options_string; + } + else { + $command = "rebase " . $options_string; + } if ( $ENV{WRAPCMD} ) { $command = $ENV{WRAPCMD} . " " . $command; } |