Changeset 2334 in ProjectBuilder for devel

Timestamp:

Oct 25, 2017, 12:01:59 AM (6 years ago)

Author:

Bruno Cornec

Message:

Greatly improve apk build (still not finished however)

Location:

devel

Files:

• pb-modules/etc/pb.yml (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/Env.pm (modified) (1 diff)
• pb/bin/pb (modified) (11 diffs)

devel/pb-modules/etc/pb.yml

@@ -685 +685 @@
   mandrake-10.2: rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,diffutils,perl-DateManip,perl-YAML
   md: rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-File-BaseDir,perl-Date-Manip,diffutils,perl-YAML
-  apk: perl-date-manip,wget,patch,make,perl-file-basedir,perl-date-manip,perl-yaml,diffutils,alpine-sdk,bash
+  apk: perl-date-manip,wget,patch,make,perl-file-basedir,perl-yaml,diffutils,alpine-sdk,bash
   lsb: 
   deb: wget,patch,dpkg-dev,make,debian-builder,dh-make,fakeroot,ntpdate,libfile-mimeinfo-perl,libmodule-build-perl,libdate-manip-perl,libmail-sendmail-perl,diffutils,libyaml-perl

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -413 +413 @@
     $regexp = '^Build-Depends:(.*)$';
 } elsif ($pbos->{'type'} eq "apk") {
-    # TODO
-    $regexp = 'TODO\n';
+    $regexp = '^makedepends=(.*)$';
 } elsif ($pbos->{'type'} eq "ebuild") {
     $sep = '"'.$/;
@@ -527 +526 @@
         pb_log(1, "INFO: missing dependency $p\n");
     } elsif ($pbos->{'type'} eq "ebuild") {
+    } elsif ($pbos->{'type'} eq "apk") {
+        my $res = pb_system("apk info $p","Looking for $p","mayfail");
+        next if ($res eq 0);
+        pb_log(1, "INFO: missing dependency $p\n");
     } else {
         # Not reached

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -266 +266 @@
 pb_log(1,"PBDESTDIR: $ENV{'PBDESTDIR'}\n");
 #
-# Removes all directory existing below the delivery dir 
+# Removes all directories existing below the delivery dir 
 # as they are temp dir only except when called from a pbinit script
 # Files stay and have to be cleaned up manually if needed

devel/pb/bin/pb

@@ -891 +891 @@
 } elsif ($action =~ /^sbx2build$/) {
     pb_cms2build("SandBox");
-} elsif ($action =~ /^build2prep/) {
+} elsif ($action =~ /^build2prep$/) {
     pb_build2prep();
-} elsif ($action =~ /^sbx2prep/) {
+} elsif ($action =~ /^sbx2prep$/) {
     pb_cms2build("SandBox");
     pb_build2prep();
@@ -1701 +1701 @@
             # TODO: HP-UX
         } elsif ($pbos->{'type'} eq "apk") {
-            # TODO: Alpine
+            $ftype = "\/APKBUILD\$";
         } else {
             die "Unknown OS type format $pbos->{'type'}";
@@ -1971 +1971 @@
                 }
             }
+
+        } elsif ($pbos->{'type'} eq "apk") {
+            pb_mkdir_p("$ENV{'PBBUILDDIR'}/tmp");
+
+            # We need to first extract the APKBUILD file 
+            my @apkfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBBUILDDIR'}/tmp","build");
+
+            chdir "$ENV{'PBBUILDDIR'}/ || die "Unable to chdir to $ENV{'PBBUILDDIR'}/$pb->{'realpkg'}";
+
+            # Build
+            foreach my $f (@apkfile) {
+                if ($f =~ /^APKBUILD$/) {
+                    pb_system("abuild unpack ; abuild checksum ; abuild -r -P $ENV{'PBBUILDDIR'}/tmp build ; abuild -r -P .. root-pkg ; abuild -P pkg index","verbose");
+                }
+            # Get the name of the generated packages
+            open(LOG,"$ENV{'PBTMP'}/system.$$.log") || die "Unable to open $ENV{'PBTMP'}/system.$$.log";
+            while (<LOG>) {
+                chomp($_);
+                next if ($_ !~ /: Create /);
+                s|.*: Create (.*.apk)|$1|;
+                $made .= " $_";
+            }
+            close(LOG);
+
+}
 
         } elsif ($pbos->{'type'} eq "tgz") {
@@ -2346 +2371 @@
         $tdir = "$remdir/$delivery->{$ENV{'PBPROJ'}}";
     } elsif ($cmt eq "Packages") {
-        if (($pbos->{'type'} eq "rpm") || ($pbos->{'type'} eq "pkg") || ($pbos->{'type'} eq "hpux") || ($pbos->{'type'} eq "tgz")) {
+        if (($pbos->{'type'} eq "rpm") || ($pbos->{'type'} eq "pkg") || ($pbos->{'type'} eq "hpux") || ($pbos->{'type'} eq "tgz") || ($pbos->{'type'} eq "apk")) {
             # put packages under an arch subdir
             $tdir = "$remdir/$delivery->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
@@ -2573 +2598 @@
 done
 EOF
+        } elsif ($pbos->{'type'} eq "apk") {
+            # TODO
         }
         close(PBS);
@@ -3064 +3091 @@
 }
 
+$vetype = pb_ve_get_type($vetype);
+if ((($vtype =~ /vm/) || (($vtype =~ /ve/) && ($vetype eq "docker"))) && (((not defined $pbimage) || ($pbimage eq "")) && ($pbstep == 0))) {
+    confess "-i image parameter needed";
+}
+
 my $counter = 0;
 foreach my $v (@$vm) {
@@ -3134 +3166 @@
 # Launch the VMs/VEs
 if ($vtype eq "vm") {
-    confess "-i image parameter needed" if (((not defined $pbimage) || ($pbimage eq "")) && ($pbstep == 0));
-
     my ($ptr,$ptr2,$vmpath,$vmport,$vms) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize");
     my ($vmopt,$vmmm,$vmtmout,$vmsnap,$vmbuildtm,$vmmonport) = pb_conf_get_if("vmopt","vmmem","vmtmout","vmsnap","vmbuildtm","vmmonport");
@@ -3832 +3862 @@
     } elsif ( -x "/usr/sbin/addgroup" ) {
         pb_system("/usr/sbin/addgroup $pbac->{$ENV{'PBPROJ'}}","Adding group $pbac->{$ENV{'PBPROJ'}}");
+        pb_system("/usr/sbin/addgroup $pbac->{$ENV{'PBPROJ'}} abuild","Adding $pbac->{$ENV{'PBPROJ'}} to group abuild");
     } else {
         die "Unable to find a command to add a group on this distribution";
@@ -4308 +4339 @@
             my $ntag = "[2-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]";
             $pbver .= $ntag;
+            # TODO add apk
             $findstr .= "-name \'$pbrealpkgrpm-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgrpm-debug-$pbver-$pbtag\.*.rpm\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag"."_*\.deb\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag.dsc\' -o -name \'$pbrealpkgdeb"."_$pbver-$pbtag.tar.gz\' -o -name \'$pbrealpkg-$nver"."_p$ntag\.ebuild\' -o -name \'$pbrealpkg-$pbver-$pbtag*\.pkg\.gz\' -o -name \'$pbrealpkg-$pbver-$pbtag*\.sd\' ";
             $srcstr .= "src/$pbrealpkg-$pbver.tar.gz src/$pbrealpkg-$pbver.pbconf.tar.gz ";
@@ -4366 +4398 @@
                     $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkg-$pbver$prefix$pbtag.ebuild"} = 0;
                     $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkg-$pbver$prefix$pbtag.ebuild"} = "$pbos->{'arch'}";
+                } elsif ($pbos->{'type'} eq "apk") {
+                    # TODO
                 } elsif ($pbos->{'type'} eq "pkg") {
                     $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/$pbrealpkg-$pbver-$pbtag.pkg.gz"} = 0;
@@ -4446 +4480 @@
             $p =~ s/(-0\.[0-9]{8})[0-9]{6}/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
             $p =~ s/(-r|_p[0-9]+)\.ebuild/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
+            # TODO apk
             $theorlist{$p} = -2 if (not defined $theorlist{$p});
             $theorlist{$p} = $theorlist{$p} + 1;