Changeset 1666 in ProjectBuilder for devel/pb

Timestamp:

Oct 27, 2012, 10:04:45 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Adds support for a 2ins target for all buildpkg call (example: sbx2pkg2ins) which adds the final installation of packages at the end

Location:

devel/pb

Files:

• bin/pb (modified) (8 diffs)
• t/pbtest (modified) (1 diff)

devel/pb/bin/pb

@@ -203 +203 @@
 
 sbx2build + build2pkg
+
+=item B<sbx2pkg2ins>
+
+sbx2pkg + final install of packages
 
 =item B<build2ssh>
@@ -781 +785 @@
 pb_log(0,"Action: $action\n");
 
+my $do_install = undef;
+# Possibility to add a 2ins to some commands to launch automatic installation
+$do_install = 1 if ($action =~ /2ins$/);
+
 # Act depending on action
 if ($action =~ /^cms2build$/) {
@@ -786 +794 @@
 } elsif ($action =~ /^sbx2build$/) {
     pb_cms2build("SandBox");
-} elsif ($action =~ /^build2pkg$/) {
-    pb_build2pkg();
-} elsif ($action =~ /^cms2pkg$/) {
+} elsif ($action =~ /^build2pkg/) {
+    pb_build2pkg($do_install);
+} elsif ($action =~ /^cms2pkg/) {
     pb_cms2build("CMS");
-    pb_build2pkg();
-} elsif ($action =~ /^sbx2pkg$/) {
+    pb_build2pkg($do_install);
+} elsif ($action =~ /^sbx2pkg/) {
     pb_cms2build("SandBox");
-    pb_build2pkg();
+    pb_build2pkg($do_install);
 } elsif ($action =~ /^build2ssh$/) {
     pb_build2ssh();
@@ -1406 +1414 @@
 sub pb_build2pkg {
 
+    my $do_install = shift;
+
     pb_log(0,"INFO: ------ Starting to build package ------\n");
     # Get the running distro to build on
@@ -1767 +1777 @@
     my ($chkcmd,$chkopt) = pb_distro_get_param($pbos,pb_conf_get_if("oschkcmd","oschkopt"));
 
+    my $ret = "";
     # Packages check if needed
     if ($pbos->{'type'} eq "rpm") {
@@ -1784 +1795 @@
         pb_log(0,"SRPM packages generated: $srpms\n");
         pb_log(0,"RPM packages generated: $rpms\n");
+        $ret = $rpms;
     } elsif ($pbos->{'type'} eq "deb") {
         my $made2 = "";
@@ -1794 +1806 @@
         }
         pb_log(0,"deb packages generated: $made2\n");
+        $ret = $made2;
     } else {
         pb_log(0,"No check done for $pbos->{'type'} yet\n");
         pb_log(0,"Packages generated: $made\n");
+        $ret = $made;
     }
 
@@ -1804 +1818 @@
     print KEEP "$made\n";
     close(KEEP);
+    pb_distro_installdeps(undef,$pbos,$ret) if ($do_install);
 }
 

devel/pb/t/pbtest

@@ -354 +354 @@
 d=mageia-2-i386
 sudopbtest "qemu-img create -f qcow2 $PBTEST/vm/$d.qemu 72G"
-sudopbtest "sudo qemu-kvm -m 1024 -kernel /pub/mageia/distrib/2/i586/isolinux/alt0/vmlinuz -initrd /pub/mageia/distrib/2/i586/isolinux/alt0/all.rdz -append "ramdisk_size=128000 root=/dev/ram3 kickstart=http://192.168.8.55/pub/ks/guerrero/ks.pl automatic=method:http,server:192.168.8.55,directory:/pub/mageia/distrib/2/i586,network:dhcp" -drive file=$PBTEST/vm/$d.qemu,if=virtio,media=disk -redir tcp:2200:10.0.2.15:22"
+sudopbtest "sudo qemu-kvm -m 1024 -kernel /pub/mageia/distrib/2/i586/isolinux/alt0/vmlinuz -initrd /pub/mageia/distrib/2/i586/isolinux/alt0/all.rdz -append "ramdisk_size=128000 root=/dev/ram3 kickstart=http://192.168.8.55/pub/ks/guerrero/ks.pl automatic=method:http,server:192.168.8.55,directory:/pub/mageia/distrib/2/i586,network:dhcp" -drive file=$PBTEST/vm/$d.qemu,if=virtio,media=disk -boot once=n -redir tcp:2200:10.0.2.15:22"
 sudopbtest "pb -p pb -r devel -m $d sbx2setupvm"
 sudopbtest "pb -p pb -m $d snapvm"