Changeset 2336


Ignore:
Timestamp:
Oct 25, 2017, 12:42:04 AM (12 months ago)
Author:
bruno
Message:

Improve again apk build up to prepve

Location:
devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r2335 r2336  
    529529        pb_log(0,"Looking for $p");
    530530        my $res = system("apk info | grep -E '^$p\$'");
    531         next if ($res eq 0);
     531        if ($res eq 0) {
     532            pb_log(0, "... OK\n");
     533            next;
     534        }
    532535        pb_log(1, "INFO: missing dependency $p\n");
    533536    } else {
  • devel/pb/bin/pb

    r2334 r2336  
    19781978            my @apkfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBBUILDDIR'}/tmp","build");
    19791979
    1980             chdir "$ENV{'PBBUILDDIR'}/ || die "Unable to chdir to $ENV{'PBBUILDDIR'}/$pb->{'realpkg'}";
     1980            chdir "$ENV{'PBBUILDDIR'}/tmp" || die "Unable to chdir to $ENV{'PBBUILDDIR'}/tmp";
    19811981
    19821982            # Build
    19831983            foreach my $f (@apkfile) {
    19841984                if ($f =~ /^APKBUILD$/) {
    1985                     pb_system("abuild unpack ; abuild checksum ; abuild -r -P $ENV{'PBBUILDDIR'}/tmp build ; abuild -r -P .. root-pkg ; abuild -P pkg index","verbose");
     1985                    pb_system("abuild unpack ; abuild checksum ; abuild -r -P .. build ; abuild -P .. root-pkg ; abuild -P pkg index","verbose");
    19861986                }
    19871987            # Get the name of the generated packages
     
    38623862    } elsif ( -x "/usr/sbin/addgroup" ) {
    38633863        pb_system("/usr/sbin/addgroup $pbac->{$ENV{'PBPROJ'}}","Adding group $pbac->{$ENV{'PBPROJ'}}");
    3864         pb_system("/usr/sbin/addgroup $pbac->{$ENV{'PBPROJ'}} abuild","Adding $pbac->{$ENV{'PBPROJ'}} to group abuild");
    38653864    } else {
    38663865        die "Unable to find a command to add a group on this distribution";
     
    38723871    } elsif ( -x "/usr/sbin/adduser" ) {
    38733872        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'}})");
     3873        pb_system("/usr/sbin/addgroup $pbac->{$ENV{'PBPROJ'}} abuild","Adding $pbac->{$ENV{'PBPROJ'}} to group abuild");
    38743874    } else {
    38753875        die "Unable to find a command to add a user on this distribution";
Note: See TracChangeset for help on using the changeset viewer.