Changeset 96

Timestamp:

09/03/07 20:11:41 (6 years ago)

Author:

bruno

Message:

Force topdir in rpmbuild to generate packages where we want.

File:

• devel/pb/bin/pb (modified) (5 diffs)

devel/pb/bin/pb

@@ -303 +303 @@
 
         if ($dtype eq "rpm") {
-            # rpm has its own standard build directory
-            my $tmp=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
-            chomp($tmp);
-            $ENV{'PBBUILDDIR'}=$tmp;
             print $LOG "Working under $ENV{'PBBUILDDIR'}\n" if ($debug >= 0);
             foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
                 if (! -d "$ENV{'PBBUILDDIR'}/$d") {
-                pb_mkdir_p("$ENV{'PBBUILDDIR'}/$d") || die "Please ensure that you can write into $ENV{'PBBUILDDIR'} to create $d\nSolution: setup _topdir in your ~/.rpmmacros or\nchown the $ENV{'PBBUILDDIR'} directory to your uid";
+                pb_mkdir_p("$ENV{'PBBUILDDIR'}/$d") || die "Please ensure that you can write into $ENV{'PBBUILDDIR'} to create $d\nchown the $ENV{'PBBUILDDIR'} directory to your uid";
                 }
             }
@@ -325 +321 @@
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
-                    pb_system("rpmbuild -ba $f","Building package with $f");
+                    pb_system("rpmbuild --define "_topdir $ENV{'PBBUILDDIR'}" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}");
                     last;
                 }
@@ -375 +371 @@
         } elsif ($cmt eq "Packages") {
             if ($dtype eq "rpm") {
-                $src="$ENV{'PBBUILDDIR'}/RPMS/*/$pbpkg$pbver-$pbtag$dsuf.*.rpm $ENV{'PBBUILDDIR'}/SRPMS/$pbpkg$pbver-$pbtag$dsuf.src.rpm"
+                # rpm has its own standard build directory
+                my $tmp=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
+                chomp($tmp);
+                $ENV{'PBBUILDDIR'}=$tmp;
+                $src="$ENV{'PBBUILDDIR'}/RPMS/*/$pbpkg-$pbver-$pbtag$dsuf.*.rpm $ENV{'PBBUILDDIR'}/SRPMS/$pbpkg-$pbver-$pbtag$dsuf.src.rpm"
             } elsif ($dtype eq "deb") {
                 my $tmp = "$ENV{'PBBUILDDIR'}/$pbpkg";
                 $src="$tmp"."_*.deb $tmp"."_*.dsc $tmp"."_*.tar.gz"
             } elsif ($dtype eq "ebuild") {
-                $src="$ENV{'PBBUILDDIR'}/portage/*/$pbpkg/$pbpkg$pbver.ebuild"
+                $src="$ENV{'PBBUILDDIR'}/portage/*/$pbpkg/$pbpkg-$pbver.ebuild"
             } elsif ($dtype eq "slackware") {
-                $src="$ENV{'PBBUILDDIR'}/build-$pbpkg/$pbpkg$pbver-*-$pbtag.tgz"
+                $src="$ENV{'PBBUILDDIR'}/build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz"
             } else {
                 die "Unknown dtype format $dtype";
@@ -390 +390 @@
         push @src, $src;
     }
-    my ($pt) = pb_conf_get("sshhost", "sshlogin", "sshdir");
-    my ($sshhost,$sshlogin,$sshdir) = @$pt;
+    my ($sshhost,$sshlogin,$sshdir) = pb_conf_get("sshhost", "sshlogin", "sshdir");
     my $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
     my $dir;
@@ -402 +401 @@
     }
     $src = join(' ',@src);
-    pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src\"","Preparing $dir on $mac");
+    pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src 2> /dev/null\"","Preparing $dir on $mac");
     pb_system("scp -p $src $mac:$dir","$cmt delivery in $dir on $mac");
 }