Changeset 1279 in ProjectBuilder for devel/pb/bin

Timestamp:

Mar 25, 2011, 1:23:12 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Adds delivery of the public key to each repository ateach delivery
• Fix debian repo build
• Adds suport for .deb package signing

File:

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

devel/pb/bin/pb

@@ -1415 +1415 @@
                 next if ($tmp !~ /^SD BUILD.*:/);
                 $tmp =~ s|.*../(.*)_(.*).sd.*|$1|;
-                $made="$made $tmp"."_*.sd";
+                $made = "$made $tmp"."_*.sd";
             }
             close(LOG);
@@ -1610 +1610 @@
         chomp($src);
         close(KEEP);
-        $src="$src $ENV{'PBBUILDDIR'}/pbscript.$$";
+        $src = "$src $ENV{'PBBUILDDIR'}/pbscript.$$";
+    }
+    if (($cmt eq "Sources") || ($cmt eq "Packages")) {
+        my ($pbpackager) = pb_conf_get("pbpackager");
+        $ENV{'PBPACKAGER'} = $pbpackager->{$ENV{'PBPROJ'}};
+        pb_log(0,"Exporting public key for $ENV{'PBPACKAGER'}\n");
+        # Using pb_system is not working due to redirection below
+        system("gpg --export -a \'$ENV{'PBPACKAGER'}\' > $ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}.pubkey");
+        chmod 0644,"$ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}.pubkey";
+        $src = "$src $ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}.pubkey";
     }
     # Remove potential leading spaces (cause problem with basename)
@@ -1825 +1834 @@
 echo "Creating Release metadata ($pbos->{'arch'} aka $debarch)"
 cat \$TMPD/Release > dists/$pbos->{'version'}/contrib/binary-$debarch/Release
-echo "Architecture: $debarch >> dists/$pbos->{'version'}/contrib/binary-$debarch/Release
+echo "Architecture: $debarch" >> dists/$pbos->{'version'}/contrib/binary-$debarch/Release
 echo "Creating Source metadata"
 dpkg-scansources $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/source/Sources.gz
@@ -3806 +3815 @@
 $ENV{'PBPASSPATH'} = $passpath->{$ENV{'PBPROJ'}} if ((not defined $ENV{'PBPASSPATH'})&& (defined $passpath->{$ENV{'PBPROJ'}})) ;
 
+# Remove extra spaces
+$made =~ s/\s+/ /g;
+$made =~ s/^\s//g;
+$made =~ s/\s$//g;
+
 if ($pbos->{'type'} eq "rpm") {
     eval
@@ -3825 +3839 @@
 
         pb_log(0,"Signing RPM packages...\n");
-        $made =~ s/ +/ /g;
-        $made =~ s/^ //g;
-        $made =~ s/ $//g;
         pb_log(2,"pb_sign_pkg: pkgs:".Dumper(split(/ /,$made))."\n");
         $sign->rpmssign(split(/ /,$made));
     }
 } elsif ($pbos->{'type'} eq "deb") {
-    #pb_system("debsign $made","Signing DEB packages");
+    my $changes = "";
+    foreach my $c (split(/ /,$made)) {
+        $changes .= " $ENV{'PBBUILDDIR'}/$c" if ($c =~ /\.changes$/);
+    }
+    pb_system("debsign -m\'$ENV{'PBPACKAGER'}\' $changes","Signing DEB packages");
 } else {
     pb_log(0,"I don't know yet how to sign packages for type $pbos->{'type'}.\nPlease give feedback to dev team\n");
+}
 pb_log(2,"exiting pb_sign_pkg\n");
 }
-}
 
 1;