Changeset 2337 in ProjectBuilder

Timestamp:

Nov 9, 2017, 8:54:07 PM (6 years ago)

Author:

Bruno Cornec

Message:

More alpine improvements (but still not done yet)

Files:

• devel/pb-modules/etc/pb.yml (modified) (2 diffs)
• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• devel/pb/bin/pb (modified) (4 diffs)
• pbconf/devel/ProjectBuilder/apk/APKBUILD (modified) (2 diffs)

devel/pb-modules/etc/pb.yml

@@ -685 +685 @@
   mandrake-10.2: rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,diffutils,perl-DateManip,perl-YAML
   md: rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-File-BaseDir,perl-Date-Manip,diffutils,perl-YAML
-  apk: perl-date-manip,wget,patch,make,perl-file-basedir,perl-yaml,diffutils,alpine-sdk,bash
+  apk: perl-date-manip,wget,patch,make,perl-file-basedir,perl-yaml,diffutils,alpine-sdk,bash,tzdata,openssh-keygen
   lsb: 
   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
   Module-Build: 0.4203
-  File-MimeInfo: 0.21
+  File-MimeInfo: 0.28
   File-BaseDir: 0.03
   YAML: 1.23

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

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

devel/pb/bin/pb

@@ -1981 +1981 @@
 
             # Build
+            my $keyfile = pb_ssh_get(1);
+            pb_mkdir_p("$ENV{'HOME'}/.abuild");
+            open(CONF,"> $ENV{'HOME'}/.abuild/abuild.conf") || confess "Unable to create the abuild conf file";
+            print CONF "PACKAGER_PRIVKEY=\"$keyfile\"\n" if (defined $keyfile);
+            close(CONF);
             foreach my $f (@apkfile) {
-                if ($f =~ /^APKBUILD$/) {
-                    pb_system("abuild unpack ; abuild checksum ; abuild -r -P .. build ; abuild -P .. root-pkg ; abuild -P pkg index","verbose");
+                if ($f =~ /APKBUILD$/) {
+                    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");
                 }
+            }
             # Get the name of the generated packages
             open(LOG,"$ENV{'PBTMP'}/system.$$.log") || die "Unable to open $ENV{'PBTMP'}/system.$$.log";
@@ -1994 +2000 @@
             }
             close(LOG);
-
-}
 
         } elsif ($pbos->{'type'} eq "tgz") {
@@ -3506 +3510 @@
     print SCRIPT "export PBPROJTAG=$ENV{'PBPROJTAG'}\n";
     print SCRIPT "export PBPACKAGER=\"$ENV{'PBPACKAGER'}\"\n";
+    # TODO: setup apk pkg/keys here
 
     # 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);
     pb_system("$debsigncmd -m\'$ENV{'PBPACKAGER'}\' $changes","Signing DEB packages as $ENV{'PBPACKAGER'}...","mayfail") if (($changes ne "") && (defined $debsigncmd));
+} elsif ($pbos->{'type'} eq "apk") {
+    pb_log(1,"Packages apk already signed during build phase\n");
 } else {
     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

@@ -1 @@
-# Contributor: PBPACKAGER
-# Maintainer:
+# Contributor: PBPACKAGER 
+# Maintainer: PBPACKAGER
 pkgname=PBREALPKG
 pkgver=PBVER
@@ -14 +14 @@
 subpackages="PBREALPKG-doc"
 source="../../pbdelivery/PBSRC"
-builddir="PBREALPKG-PBVERPBEXTDIR"
+builddir="src/PBREALPKG-PBVERPBEXTDIR"
 
 build() {