From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Thu, 16 Aug 2012 09:05:43 +0000 (+0300)
Subject: build.pl: Fix BUILD_ID update
X-Git-Tag: vofed-3.18-1~78
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=11718385ad6f3dcf0fd52343e8200b4ffc817a46;p=~vlad%2Fbuild.git

build.pl: Fix BUILD_ID update

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---

diff --git a/build.pl b/build.pl
index bdf6db9..f806ff9 100755
--- a/build.pl
+++ b/build.pl
@@ -639,6 +639,7 @@ mkpath([$TOPDIR . '/BUILD' ,$TOPDIR . '/RPMS',$TOPDIR . '/SOURCES',$TOPDIR . '/S
 
 open (BUILD_ID, "+> $destdir/BUILD_ID") or die "Can't open $destdir/BUILD_ID file: $!\n";
 print BUILD_ID "$distribution-$version:\n\n";
+close BUILD_ID;
 
 my %info;
 
@@ -685,6 +686,8 @@ for my $conf (<$CWD/$packages_dir/*.conf>) {
 				if (not $packages{$package}{'local_tarball'}) {
 					get_package($package);
 					update_build_id($package, "$packages{$package}{'URL'}\n");
+				} else {
+					update_build_id($package, "$packages{$package}{'local_tarball'}\n");
 				}
 				get_srpm($package);
 			} elsif ($packages{$package}{'getMethod'} =~ /srpm/) {
@@ -716,11 +719,10 @@ for my $conf (<$CWD/$packages_dir/*.conf>) {
 }
 
 my $ret = 0;
+my $res = 0;
+my $sig = 0;
 
 for $package ( @plist ) {
-	my $res = 0;
-	my $sig = 0;
-	
 	print "waiting for: package=$package child=$info{$package}{pid}\n" if ( $verbose );
 	waitpid ( $info{$package}{pid}, 0 );
 
@@ -743,6 +745,7 @@ for $package ( @plist ) {
 }
 
 if ($build_scripts) {
+	open (BUILD_ID, ">> $destdir/BUILD_ID") or die "Can't open $destdir/BUILD_ID file: $!\n";
 	$package = 'ofed-scripts';
 	print BUILD_ID "$package:\n";
 	print BUILD_ID "$packages{$package}{'git_url'} $packages{$package}{'git_branch'}\n";
@@ -750,9 +753,8 @@ if ($build_scripts) {
 	get_srpm($package);
 	push (@plist, $package);
 	move "$packages{$package}{'local_srpm'}", "$destdir/SRPMS";
-	# ex "rpm -ihv $force_debian --define \"_topdir $destdir\" $packages{$package}{'local_srpm'}";
+	close BUILD_ID;
 }
-close BUILD_ID;
 
 rmtree($TOPDIR);
 chdir $builddir;