Changeset 2337


Ignore:
Timestamp:
Nov 9, 2017, 8:54:07 PM (3 months ago)
Author:
bruno
Message:

More alpine improvements (but still not done yet)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.yml

    r2334 r2337  
    685685  mandrake-10.2: rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,diffutils,perl-DateManip,perl-YAML
    686686  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
    688688  lsb:
    689689  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
     
    703703  Date-Manip: 6.42
    704704  Module-Build: 0.4203
    705   File-MimeInfo: 0.21
     705  File-MimeInfo: 0.28
    706706  File-BaseDir: 0.03
    707707  YAML: 1.23
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r2336 r2337  
    527527    } elsif ($pbos->{'type'} eq "ebuild") {
    528528    } 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);
    535531        pb_log(1, "INFO: missing dependency $p\n");
    536532    } else {
  • devel/pb/bin/pb

    r2336 r2337  
    19811981
    19821982            # 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);
    19831988            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");
    19861991                }
     1992            }
    19871993            # Get the name of the generated packages
    19881994            open(LOG,"$ENV{'PBTMP'}/system.$$.log") || die "Unable to open $ENV{'PBTMP'}/system.$$.log";
     
    19942000            }
    19952001            close(LOG);
    1996 
    1997 }
    19982002
    19992003        } elsif ($pbos->{'type'} eq "tgz") {
     
    35063510    print SCRIPT "export PBPROJTAG=$ENV{'PBPROJTAG'}\n";
    35073511    print SCRIPT "export PBPACKAGER=\"$ENV{'PBPACKAGER'}\"\n";
     3512    # TODO: setup apk pkg/keys here
    35083513
    35093514    # We may need to do some other tasks before building. Read a script here to finish setup
     
    51965201    my $debsigncmd = pb_check_req("debsign",1);
    51975202    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");
    51985205} else {
    51995206    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
    33pkgname=PBREALPKG
    44pkgver=PBVER
     
    1414subpackages="PBREALPKG-doc"
    1515source="../../pbdelivery/PBSRC"
    16 builddir="PBREALPKG-PBVERPBEXTDIR"
     16builddir="src/PBREALPKG-PBVERPBEXTDIR"
    1717
    1818build() {
Note: See TracChangeset for help on using the changeset viewer.