- Timestamp:
- Oct 25, 2017, 12:42:04 AM (7 years ago)
- Location:
- devel
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r2335 r2336 529 529 pb_log(0,"Looking for $p"); 530 530 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 } 532 535 pb_log(1, "INFO: missing dependency $p\n"); 533 536 } else { -
devel/pb/bin/pb
r2334 r2336 1978 1978 my @apkfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBBUILDDIR'}/tmp","build"); 1979 1979 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"; 1981 1981 1982 1982 # Build 1983 1983 foreach my $f (@apkfile) { 1984 1984 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"); 1986 1986 } 1987 1987 # Get the name of the generated packages … … 3862 3862 } elsif ( -x "/usr/sbin/addgroup" ) { 3863 3863 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");3865 3864 } else { 3866 3865 die "Unable to find a command to add a group on this distribution"; … … 3872 3871 } elsif ( -x "/usr/sbin/adduser" ) { 3873 3872 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"); 3874 3874 } else { 3875 3875 die "Unable to find a command to add a user on this distribution";
Note:
See TracChangeset
for help on using the changeset viewer.