Changeset 2337 in ProjectBuilder
- Timestamp:
- Nov 9, 2017, 8:54:07 PM (6 years ago)
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/etc/pb.yml
r2334 r2337 685 685 mandrake-10.2: rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,diffutils,perl-DateManip,perl-YAML 686 686 md: rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-File-BaseDir,perl-Date-Manip,diffutils,perl-YAML 687 apk: perl-date-manip,wget,patch,make,perl-file-basedir,perl-yaml,diffutils,alpine-sdk,bash 687 apk: perl-date-manip,wget,patch,make,perl-file-basedir,perl-yaml,diffutils,alpine-sdk,bash,tzdata,openssh-keygen 688 688 lsb: 689 689 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 … … 703 703 Date-Manip: 6.42 704 704 Module-Build: 0.4203 705 File-MimeInfo: 0.2 1705 File-MimeInfo: 0.28 706 706 File-BaseDir: 0.03 707 707 YAML: 1.23 -
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r2336 r2337 527 527 } elsif ($pbos->{'type'} eq "ebuild") { 528 528 } elsif ($pbos->{'type'} eq "apk") { 529 pb_log(0,"Looking for $p"); 530 my $res = system("apk info | grep -E '^$p\$'"); 531 if ($res eq 0) { 532 pb_log(0, "... OK\n"); 533 next; 534 } 529 my $res = pb_system("apk -e info $p","Looking for $p","mayfail"); 530 next if ($res eq 0); 535 531 pb_log(1, "INFO: missing dependency $p\n"); 536 532 } else { -
devel/pb/bin/pb
r2336 r2337 1981 1981 1982 1982 # Build 1983 my $keyfile = pb_ssh_get(1); 1984 pb_mkdir_p("$ENV{'HOME'}/.abuild"); 1985 open(CONF,"> $ENV{'HOME'}/.abuild/abuild.conf") || confess "Unable to create the abuild conf file"; 1986 print CONF "PACKAGER_PRIVKEY=\"$keyfile\"\n" if (defined $keyfile); 1987 close(CONF); 1983 1988 foreach my $f (@apkfile) { 1984 if ($f =~ / ^APKBUILD$/) {1985 pb_system(" abuild unpack ; abuild checksum ; abuild -r -P .. build ; abuild -P .. root-pkg ; abuild -P pkg index","verbose");1989 if ($f =~ /APKBUILD$/) { 1990 pb_system("ls -al $ENV{'HOME'}/.ssh ; pwd ; ls -alR ../.. ; sh -x /usr/bin/abuild checksum ; abuild unpack ; abuild -r -P .. build ; abuild -P .. rootpkg ; abuild -P pkg index","verbose"); 1986 1991 } 1992 } 1987 1993 # Get the name of the generated packages 1988 1994 open(LOG,"$ENV{'PBTMP'}/system.$$.log") || die "Unable to open $ENV{'PBTMP'}/system.$$.log"; … … 1994 2000 } 1995 2001 close(LOG); 1996 1997 }1998 2002 1999 2003 } elsif ($pbos->{'type'} eq "tgz") { … … 3506 3510 print SCRIPT "export PBPROJTAG=$ENV{'PBPROJTAG'}\n"; 3507 3511 print SCRIPT "export PBPACKAGER=\"$ENV{'PBPACKAGER'}\"\n"; 3512 # TODO: setup apk pkg/keys here 3508 3513 3509 3514 # We may need to do some other tasks before building. Read a script here to finish setup … … 5196 5201 my $debsigncmd = pb_check_req("debsign",1); 5197 5202 pb_system("$debsigncmd -m\'$ENV{'PBPACKAGER'}\' $changes","Signing DEB packages as $ENV{'PBPACKAGER'}...","mayfail") if (($changes ne "") && (defined $debsigncmd)); 5203 } elsif ($pbos->{'type'} eq "apk") { 5204 pb_log(1,"Packages apk already signed during build phase\n"); 5198 5205 } else { 5199 5206 pb_log(0,"I don't know yet how to sign packages for type $pbos->{'type'}.\nPlease give feedback to dev team\n"); -
pbconf/devel/ProjectBuilder/apk/APKBUILD
r2334 r2337 1 # Contributor: PBPACKAGER 2 # Maintainer: 1 # Contributor: PBPACKAGER 2 # Maintainer: PBPACKAGER 3 3 pkgname=PBREALPKG 4 4 pkgver=PBVER … … 14 14 subpackages="PBREALPKG-doc" 15 15 source="../../pbdelivery/PBSRC" 16 builddir=" PBREALPKG-PBVERPBEXTDIR"16 builddir="src/PBREALPKG-PBVERPBEXTDIR" 17 17 18 18 build() {
Note:
See TracChangeset
for help on using the changeset viewer.