Changeset 2336 in ProjectBuilder

Timestamp:

Oct 25, 2017, 12:42:04 AM (6 years ago)

Author:

Bruno Cornec

Message:

Improve again apk build up to prepve

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pb/bin/pb (modified) (3 diffs)

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

@@ -529 +529 @@
         pb_log(0,"Looking for $p");
         my $res = system("apk info | grep -E '^$p\$'");
-        next if ($res eq 0);
+        if ($res eq 0) {
+            pb_log(0, "... OK\n");
+            next;
+        }
         pb_log(1, "INFO: missing dependency $p\n");
     } else {

devel/pb/bin/pb

@@ -1978 +1978 @@
             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'}";
+            chdir "$ENV{'PBBUILDDIR'}/tmp" || die "Unable to chdir to $ENV{'PBBUILDDIR'}/tmp";
 
             # 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");
+                    pb_system("abuild unpack ; abuild checksum ; abuild -r -P .. build ; abuild -P .. root-pkg ; abuild -P pkg index","verbose");
                 }
             # Get the name of the generated packages
@@ -3862 +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";
@@ -3872 +3871 @@
     } elsif ( -x "/usr/sbin/adduser" ) {
         pb_system("/usr/sbin/adduser -G $pbac->{$ENV{'PBPROJ'}} -h $home/$pbac->{$ENV{'PBPROJ'}} -D $pbac->{$ENV{'PBPROJ'}}","Adding user $pbac->{$ENV{'PBPROJ'}} (group $pbac->{$ENV{'PBPROJ'}} - home $home/$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 user on this distribution";