Changeset 2458 in ProjectBuilder

Timestamp:

Nov 11, 2019, 9:51:55 PM (4 years ago)

Author:

Bruno Cornec

Message:

Fix #183 by pushing the repomd.xml.asc file for SUSE and fix also repo names

File:

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

devel/pb/bin/pb

@@ -2281 +2281 @@
         close(KEEP);
     }
+
+    $delivery->{$ENV{'PBPROJ'}} = "" if (not defined $delivery->{$ENV{'PBPROJ'}});
+    my $repotag = "";
+    $repotag = "-$delivery->{$ENV{'PBPROJ'}}" if ($delivery->{$ENV{'PBPROJ'}} ne "");
+
     if (($cmt eq "Sources") || ($cmt eq "Packages") || ($cmt eq "CPAN")) {
         my ($pbpackager) = pb_conf_get("pbpackager");
@@ -2286 +2291 @@
         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";
+        system("gpg --export -a \'$ENV{'PBPACKAGER'}\' > $ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}$repotag.pubkey");
+        chmod 0644,"$ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}$repotag.pubkey";
+        $src = "$src $ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}$repotag.pubkey";
 
         my ($gpgaddkey) = pb_conf_get_if("pbadditionalgpg");
@@ -2296 +2301 @@
             foreach my $k (split(/,/,$pbadditionalgpg)) {
                 pb_log(0,"Exporting public key $k\n");
-                system("gpg --export -a \'$k\' > $ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}-$k.pubkey");
-                $src = "$src $ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}-$k.pubkey";
+                system("gpg --export -a \'$k\' > $ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}$repotag-$k.pubkey");
+                $src = "$src $ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}$repotag-$k.pubkey";
             }
         }
@@ -2311 +2316 @@
     my ($sshhost,$sshdir) = pb_conf_get($host,$dir);
     # Not mandatory...
-    $delivery->{$ENV{'PBPROJ'}} = "" if (not defined $delivery->{$ENV{'PBPROJ'}});
     my ($sshlogin,$sshport) = pb_conf_get_if($login,$port);
     $sshport->{$ENV{'PBPROJ'}} = 22 if (not defined $sshport->{$ENV{'PBPROJ'}});
@@ -2373 +2377 @@
         my $repodir = $tdir;
         $repodir =~ s|^$remdir/||;
-        my $repotag = "";
-        $repotag = "-$delivery->{$ENV{'PBPROJ'}}" if ($delivery->{$ENV{'PBPROJ'}} ne "");
+        $repodir =~ s|//|/|g;
 
         my ($pbrepo) = pb_conf_get("pbrepo");
@@ -2390 +2393 @@
             my $pbgpgcheck;
             $pbgpgcheck = $gpgcheck->{$ENV{'PBPROJ'}} if (defined $gpgcheck);
-            my $pbgpgkey = "$pbrepo->{$ENV{'PBPROJ'}}/$repodir/$ENV{'PBPROJ'}.pubkey";
+            my $pbgpgkey = "$pbrepo->{$ENV{'PBPROJ'}}/$repodir/$ENV{'PBPROJ'}$repotag.pubkey";
             my ($gpgaddpkey) = pb_conf_get_if("pbadditionalgpg");
             my $pbadditionalgpg;
@@ -2396 +2399 @@
             if (defined $pbadditionalgpg) {
                 foreach my $k (split(/,/,$pbadditionalgpg)) {
-                    $pbgpgkey .= " $pbrepo->{$ENV{'PBPROJ'}}/$repodir/$ENV{'PBPROJ'}-$k.pubkey";
+                    $pbgpgkey .= " $pbrepo->{$ENV{'PBPROJ'}}/$repodir/$ENV{'PBPROJ'}$repotag-$k.pubkey";
                 }
             }
@@ -2410 +2413 @@
 cat > $ENV{'PBPROJ'}$repotag.repo << EOT
 [$ENV{'PBPROJ'}$repotag]
-name=$pbos->{'name'} $pbos->{'version'} $pbos->{'arch'} - $ENV{'PBPROJ'} Vanilla Packages
+name=$pbos->{'name'} $pbos->{'version'} $pbos->{'arch'} - $ENV{'PBPROJ'}$repotag Vanilla Packages
 baseurl=$pbrepo->{$ENV{'PBPROJ'}}/$repodir
 enabled=1
@@ -2427 +2430 @@
 createrepo -s $pbsha .
 # Link to the key
-if [ -s $ENV{'PBPROJ'}.pubkey ]; then
+if [ -s $ENV{'PBPROJ'}$repotag.pubkey ]; then
     # Avoiding creating empty repomd.xml.key; fails on opensuse 12.1
-    (cd repodata ; ln -sf ../$ENV{'PBPROJ'}.pubkey repomd.xml.key)
+    # Signature done later
+    (cd repodata ; ln -sf ../$ENV{'PBPROJ'}$repotag.pubkey repomd.xml.key)
 fi
-# sign the repomd (at least useful for SLES - which requires a local key)
-# gpg -a --detach-sign repodata/repomd.xml
 # SLES also looks for media.1/info.txt
 EOF
@@ -2440 +2442 @@
 # Prepare a script to ease urpmi setup
 cat > $ENV{'PBPROJ'}$repotag.addmedia << EOT
-#rpm --import $pbrepo->{$ENV{'PBPROJ'}}/$repodir/$ENV{'PBPROJ'}.pubkey
+#rpm --import $pbrepo->{$ENV{'PBPROJ'}}/$repodir/$ENV{'PBPROJ'}$repotag.pubkey
 urpmi.addmedia $ENV{'PBPROJ'}$repotag $pbrepo->{$ENV{'PBPROJ'}}/$repodir with media_info/hdlist.cz
 EOT
@@ -2452 +2454 @@
     genhdlist .
 fi
-(cd media_info ; ln -sf ../$ENV{'PBPROJ'}.pubkey pubkey)
+(cd media_info ; ln -sf ../$ENV{'PBPROJ'}$repotag.pubkey pubkey)
 EOF
             }
@@ -2926 +2928 @@
     # If target is deb family then sign Release file for Packages
     my $pbos2 = pb_distro_get_context($v);
+
     if (($cmt =~ /Packages/) && ($pbos2->{'type'} eq "deb")) {
         my $debarch = pb_get_debarch($pbos2);
@@ -2937 +2940 @@
             pb_system("$shcmdbase \"chmod 644 $debfile/$f.gpg\"","Set mode to 644 for $debfile/$f.gpg");
         }
+    } 
+
+    if (($cmt =~ /Packages/) && 
+        ((($pbos2->{'name'} eq "sles") && ($pbos2->{'version'} ge 15)) ||
+        (($pbos2->{'name'} eq "opensuse") && ($pbos2->{'version'} ge 15)))) {
+            pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $cptarget/repodata/repomd.xml . 2> /dev/null","Getting repomd.xml file from $cptarget/repodata");
+            pb_sign_file("$ENV{'PBBUILDDIR'}/repomd.xml");
+            pb_system("$cpcmd $ENV{'PBBUILDDIR'}/repomd.xml.gpg $cptarget/repodata/repomd.xml.asc 2> /dev/null","Putting back repomd.xml.asc file to $cptarget/repodata");
+            my ($void,$rpdir) = split(/:/,$cptarget);
+            pb_system("$shcmdbase \"chmod 644 $rpdir/repodata/repomd.xml.asc\"","Set mode to 644 for $rpdir/repodata/repomd.xml.asc");
     } 
 
@@ -3659 +3672 @@
         }
         if (/^testver/) {
-            s/^testver:\n\s+$ENV{'PBPROJ'}:(.*)$/#testver:\n#\s+$ENV{'PBPROJ'}: $1/;
+            s/^testver:\n\s+$ENV{'PBPROJ'}:(.*)$/#testver:\n#   $ENV{'PBPROJ'}: $1/;
             pb_log(0,"Commenting testver in $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.yml\n");
             my $txt = $_;
@@ -5294 +5307 @@
 
 pb_sign_setenv();
-pb_log(0,"Signing Debian Release file as $ENV{'PBPACKAGER'}...\n");
+pb_log(0,"Signing file $file as $ENV{'PBPACKAGER'}...\n");
 
 if (not defined $ENV{'PBPASSPHRASE'}) {