Changeset 2631 in ProjectBuilder

Timestamp:

Aug 18, 2020, 12:57:30 PM (5 years ago)

Author:

Bruno Cornec

Message:

• Start to add support for aur packages
• Fix packages built with a non tar.gz file, by storing extensions in the intermediate yml file between svn2build and build2pkg

File:

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

devel/pb/bin/pb

@@ -1143 +1143 @@
 
     my %pkgs;
+    my %ext;
     my $pb;             # Structure to store conf info
 
@@ -1572 +1573 @@
         # Prepare the dest directory for archive
         chdir "$ENV{'PBDESTDIR'}" || confess "Unable to change dir to $ENV{'PBDESTDIR'}";
+        my $ext = "";
         if (defined $preserve) {
             # In that case we want to preserve the original tar file for checksum purposes
@@ -1577 +1579 @@
             # Maybe check basename of both to be sure they are the same ?
             pb_log(0,"Preserving original tar file ");
-            move("$preserve","$pbpkg-$pbver$pbextdir.tar.gz");
+            my ($x, $y);
+            ($x,$y,$ext) = fileparse($preserve,("tar.gz","tar.bz2","tar.xz","tgz"));
+            move("$preserve","$pbpkg-$pbver$pbextdir.$ext");
         } else {
+                $ext = "tar.gz";
             # Possibility to look at PBSRC to guess more the filename
-            pb_system("tar cfz $pbpkg-$pbver$pbextdir.tar.gz --exclude=$pbpkg-$pbver$pbextdir/pbconf $pbpkg-$pbver$pbextdir","Creating $pbpkg tar files compressed");
-        }
-        pb_log(0,"Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.tar.gz\n");
+            pb_system("tar cfz $pbpkg-$pbver$pbextdir.$ext --exclude=$pbpkg-$pbver$pbextdir/pbconf $pbpkg-$pbver$pbextdir","Creating $pbpkg tar files compressed");
+        }
+        pb_log(0,"Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.$ext\n");
         pb_system("tar cfz $pbpkg-$pbver$pbextdir.pbconf.tar.gz $pbpkg-$pbver$pbextdir/pbconf","Creating pbconf tar files compressed");
         pb_log(0,"Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.pbconf.tar.gz\n");
@@ -1588 +1593 @@
         # Keep track of version-tag per pkg
         $pkgs{$pbpkg} = "$pbver-$pbtag";
+        # Keep track of extension
+        $ext{$pbpkg} = "$ext";
 
         # Final cleanup
@@ -1600 +1607 @@
     foreach my $pbpkg (keys %pkgs) {
         print PKG "  $pbpkg: $pkgs{$pbpkg}\n";
+    }
+    print PKG "ext:\n";
+    foreach my $pbpkg (keys %ext) {
+        print PKG "  $pbpkg: $ext{$pbpkg}\n";
     }
     close(PKG);
@@ -1694 +1705 @@
         } elsif ($pbos->{'type'} eq "hpux") {
             # TODO: HP-UX
+        } elsif ($pbos->{'type'} eq "aur") {
+            $ftype = "\/PKGBUILD\$";
         } elsif ($pbos->{'type'} eq "apk") {
             $ftype = "\/APKBUILD\$";
@@ -1730 +1743 @@
     my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.yml","pbpkg");
     $pkg = { } if (not defined $pkg);
+    my ($ext) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.yml","ext");
+    $ext = { } if (not defined $ext);
     my $pbextdir = pb_get_extdir();
 
@@ -1763 +1778 @@
         my $vertag = $pkg->{$pbpkg};
         pb_log(2,"Vertag: $vertag\n");
+        my $fext = $ext->{$pbpkg};
+        # Keep compatibility with previous generated files pre 0.14
+        $fext = "tar.gz" if (not defined $fext);
+        pb_log(2,"Extension: $fext\n");
         # get the version of the current package - maybe different
         ($pbver,$pbtag) = split(/-/,$vertag);
 
-        my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.tar.gz";
+        my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.$fext";
         my $src2="$ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.pbconf.tar.gz";
         pb_log(2,"Source file: $src\n");
@@ -1774 +1793 @@
         if ($pbos->{'type'} eq "rpm") {
             # Remove in case a previous link/file was there
+            pb_mkdir_p("$ENV{'PBBUILDDIR'}/SOURCES");
+            pb_mkdir_p("$ENV{'PBBUILDDIR'}/SPECS");
             unlink "$ENV{'PBBUILDDIR'}/SOURCES/".basename($src);
             symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || confess "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
@@ -1864 +1885 @@
                 }
                 # ...so modify the name of files to be Debian compliant
-                move("../$src","../$pbpkg-$pbver$pbextdir.orig.tar.gz");
+                move("../$src","../$pbpkg-$pbver$pbextdir.orig.$fext");
             }
 
@@ -1966 +1987 @@
                 }
             }
+
+        } elsif ($pbos->{'type'} eq "aur") {
+            pb_system("tar xfz $src2","Extracting pbconf");
+
+            pb_rm_rf("$ENV{'PBBUILDDIR'}/aur");
+            pb_mkdir_p("$ENV{'PBBUILDDIR'}/aur");
+            unlink "$ENV{'PBBUILDDIR'}/aur/".basename($src);
+            symlink "$src","$ENV{'PBBUILDDIR'}/aur/".basename($src) || confess "Unable to symlink $src in $ENV{'PBBUILDDIR'}/aur";
+            # We need to first extract the PKGBUILD file 
+            chdir "$ENV{'PBBUILDDIR'}/aur" || confess "Unable to chdir to $ENV{'PBBUILDDIR'}/aur";
+            my @aurfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBBUILDDIR'}/aur","build");
+
+            # Build
+            foreach my $f (@aurfile) {
+                if ($f =~ /PKGBUILD$/) {
+                    pb_system("makepkg","verbose");
+                }
+            }
+            # Get the name of the generated packages
+            open(LOG,"$ENV{'PBTMP'}/system.$$.log") || confess "Unable to open $ENV{'PBTMP'}/system.$$.log";
+            while (<LOG>) {
+                chomp($_);
+                next if ($_ !~ /: Create /);
+                s|.*: Create (.*.pkg)|$1|;
+                $made .= " $_";
+            }
+            close(LOG);
 
         } elsif ($pbos->{'type'} eq "apk") {
@@ -2126 +2174 @@
         }
         if ((defined  $chkcmd) && (-x $chkcmd)) {
-            my $ret = pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","mayfail");
+            $chkcmd .= " $chkopt" if (defined $chkopt);
+            my $ret = pb_system("$chkcmd $made2","Checking validity of debs with $chkcmd","mayfail");
             pb_log(0,"ERROR: when checking packages validity\n") if ($ret ne 0);
         }
@@ -2229 +2278 @@
 
         my $pkg = { };
+        my $ext = { };
         # Get content saved in cms2build
         if ((defined $ENV{'PBDESTDIR'}) && (defined $ENV{'PBPROJVER'}) && (defined $ENV{'PBPROJTAG'}) && (-f "$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.yml")) {
             ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.yml","pbpkg");
             $pkg = { } if (not defined $pkg);
+            ($ext) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.yml","ext");
+            $ext = { } if (not defined $ext);
         }
 
@@ -2239 +2291 @@
         foreach my $pbpkg (@pkgs) {
             my $vertag = $pkg->{$pbpkg};
+            my $fext = $ext->{$pbpkg};
+            $fext = "tar.gz" if (not defined $fext);
             # get the version of the current package - maybe different
             pb_log(2,"Vertag: $vertag\n");
+            pb_log(2,"Extension $fext\n");
             ($pbver,$pbtag) = split(/-/,$vertag);
 
             if (($cmt eq "Sources") || ($cmt =~ /(V[EM]|RM)(build|prep)/)) {
-                $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.tar.gz $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.pbconf.tar.gz";
-                my $cmd2 = "ln -sf $pbpkg-$pbver$pbextdir.tar.gz $pbpkg-latest.tar.gz";
+                $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.$fext $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.pbconf.tar.gz";
+                my $cmd2 = "ln -sf $pbpkg-$pbver$pbextdir.$fext $pbpkg-latest.$fext";
                 #my $cmd2 = "ln $pbpkg-$pbver$pbextdir.tar.gz $pbpkg-latest.tar.gz 2> /dev/null ; if [ \$? -ne 0 ]; then ln -sf $pbpkg-$pbver$pbextdir.tar.gz $pbpkg-latest.tar.gz ; fi";
                 if ($cmd eq "") {
@@ -2253 +2308 @@
                 }
             } elsif ($cmt eq "Web") {
-                $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.tar.gz"
+                $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver$pbextdir.$fext"
             }
 
@@ -4220 +4275 @@
     }
     print SCRIPT << 'EOF';
+# Call the programs in normal mode, not setupv mode
+delete($ENV{'PBSETUPV'});
 pb_system("pbdistrocheck",undef,"verbose");
 pb_system("pb --version",undef,"verbose");
@@ -5549 +5606 @@
 my ($v2,$all2) = pb_get_allv($vtype);
 pb_log(1,"INFO: velist is:\n");
-pb_log(1,Dumper(@$v2));
+pb_log(1,Dumper($v2));
 my $foundv = 0;
 foreach my $v3 (@$v2) {