Changeset 1666 in ProjectBuilder
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r1661 r1666 203 203 204 204 sbx2build + build2pkg 205 206 =item B<sbx2pkg2ins> 207 208 sbx2pkg + final install of packages 205 209 206 210 =item B<build2ssh> … … 781 785 pb_log(0,"Action: $action\n"); 782 786 787 my $do_install = undef; 788 # Possibility to add a 2ins to some commands to launch automatic installation 789 $do_install = 1 if ($action =~ /2ins$/); 790 783 791 # Act depending on action 784 792 if ($action =~ /^cms2build$/) { … … 786 794 } elsif ($action =~ /^sbx2build$/) { 787 795 pb_cms2build("SandBox"); 788 } elsif ($action =~ /^build2pkg $/) {789 pb_build2pkg( );790 } elsif ($action =~ /^cms2pkg $/) {796 } elsif ($action =~ /^build2pkg/) { 797 pb_build2pkg($do_install); 798 } elsif ($action =~ /^cms2pkg/) { 791 799 pb_cms2build("CMS"); 792 pb_build2pkg( );793 } elsif ($action =~ /^sbx2pkg $/) {800 pb_build2pkg($do_install); 801 } elsif ($action =~ /^sbx2pkg/) { 794 802 pb_cms2build("SandBox"); 795 pb_build2pkg( );803 pb_build2pkg($do_install); 796 804 } elsif ($action =~ /^build2ssh$/) { 797 805 pb_build2ssh(); … … 1406 1414 sub pb_build2pkg { 1407 1415 1416 my $do_install = shift; 1417 1408 1418 pb_log(0,"INFO: ------ Starting to build package ------\n"); 1409 1419 # Get the running distro to build on … … 1767 1777 my ($chkcmd,$chkopt) = pb_distro_get_param($pbos,pb_conf_get_if("oschkcmd","oschkopt")); 1768 1778 1779 my $ret = ""; 1769 1780 # Packages check if needed 1770 1781 if ($pbos->{'type'} eq "rpm") { … … 1784 1795 pb_log(0,"SRPM packages generated: $srpms\n"); 1785 1796 pb_log(0,"RPM packages generated: $rpms\n"); 1797 $ret = $rpms; 1786 1798 } elsif ($pbos->{'type'} eq "deb") { 1787 1799 my $made2 = ""; … … 1794 1806 } 1795 1807 pb_log(0,"deb packages generated: $made2\n"); 1808 $ret = $made2; 1796 1809 } else { 1797 1810 pb_log(0,"No check done for $pbos->{'type'} yet\n"); 1798 1811 pb_log(0,"Packages generated: $made\n"); 1812 $ret = $made; 1799 1813 } 1800 1814 … … 1804 1818 print KEEP "$made\n"; 1805 1819 close(KEEP); 1820 pb_distro_installdeps(undef,$pbos,$ret) if ($do_install); 1806 1821 } 1807 1822 -
devel/pb/t/pbtest
r1619 r1666 354 354 d=mageia-2-i386 355 355 sudopbtest "qemu-img create -f qcow2 $PBTEST/vm/$d.qemu 72G" 356 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"356 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" 357 357 sudopbtest "pb -p pb -r devel -m $d sbx2setupvm" 358 358 sudopbtest "pb -p pb -m $d snapvm"
Note:
See TracChangeset
for help on using the changeset viewer.