Changeset 681 in ProjectBuilder for devel/pb/bin

Timestamp:

Feb 15, 2009, 10:05:00 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Differentiate between Scripts for VE and VM with 2 tags
• Have a working newve, setupve and cms2ve sequence for rinse and centos5 at least (rest to be tested)
• Planned usage of chroot (tested) and schroot (not tested)
• Remove the external locale dependece to use the one provided by perl !
• Fix CentOS support in Distribution module

File:

• devel/pb/bin/pb (modified) (22 diffs)

devel/pb/bin/pb

@@ -1003 +1003 @@
     my $tmout = "vmtmout";
     my $path = "vmpath";
-    if (($cmt eq "vm") || ($cmt eq "Script")) {
+    if (($cmt eq "vm") || ($cmt eq "VMScript")) {
         $login = "vmlogin";
         $dir = "pbdefdir";
@@ -1011 +1011 @@
         $host = "vmhost";
         $port = "vmport";
-    } elsif ($cmt eq "ve") {
+    } elsif (($cmt eq "ve")|| ($cmt eq "VEScript")) {
         $login = "velogin";
         $dir = "pbdefdir";
-        $tmout = "vetmout";
         # Specific VE
         $path = "vepath";
@@ -1069 +1068 @@
     if (($cmt eq "vm") || ($cmt eq "ve")) {
         $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc $ENV{'PBDESTDIR'}/pbscript";
-    } elsif (($cmt eq "Script") || ($cmt eq "Web")) {
+    } elsif (($cmt =~ /V[EM]Script/) || ($cmt eq "Web")) {
         $src="$src $ENV{'PBDESTDIR'}/pbscript";
     } elsif ($cmt eq "Announce") {
@@ -1079 +1078 @@
         chomp($src);
         close(KEEP);
-        $src="$src $ENV{'PBBUILDDIR'}/pbscript" if ($cmt ne "Sources");
+        $src="$src $ENV{'PBBUILDDIR'}/pbscript";
     }
     # Remove potential leading spaces (cause problem with basename)
@@ -1091 +1090 @@
     pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf))."\n");
     my ($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vepath) = pb_conf_get($host,$login,$dir,$port,$tmout,$path);
-    my ($vrebuild,$veconf) = pb_conf_get_if($rebuild,$conf);
+    # Not mandatory
+    my ($vrebuild,$veconf,$testver) = pb_conf_get_if($rebuild,$conf,"testver");
     pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf))."\n");
-    # Not mandatory
-    my ($testver) = pb_conf_get_if("testver");
 
     my $mac;
-    # Useless for VE
-    if ($cmt ne "ve") {
+    if (($cmt ne "ve") && ($cmt ne "VEScript")) {
         $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
         # Overwrite account value if passed as parameter
         $mac = "$pbaccount\@$sshhost->{$ENV{'PBPROJ'}}" if (defined $pbaccount);
         pb_log(2, "DEBUG: pbaccount: $pbaccount => mac: $mac\n") if (defined $pbaccount);
+    } else {
+        # VE
+        # Overwrite account value if passed as parameter (typically for setup_ve)
+        $mac = $sshlogin->{$ENV{'PBPROJ'}};
+        $mac = $pbaccount if (defined $pbaccount);
     }
 
     my $tdir;
     my $bdir;
-    if (($cmt eq "Sources") || ($cmt eq "Script")) {
+    if (($cmt eq "Sources") || ($cmt =~ /V[EM]Script/)) {
         $tdir = $sshdir->{$ENV{'PBPROJ'}}."/src";
         if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
@@ -1232 +1234 @@
     # Useless for VE
     my $nport;
-    if ($cmt ne "ve") {
+    if (($cmt ne "ve") && ($cmt ne "VEScript")) {
         $nport = $sshport->{$ENV{'PBPROJ'}};
         $nport = "$pbport" if (defined $pbport);
@@ -1245 +1247 @@
     # should use a hash instead...
     my ($shcmd,$cpcmd,$cptarget,$cp2target);
-    if ($cmt ne "ve") {
+    if (($cmt ne "ve") && ($cmt ne "VEScript")) {
         my $keyfile = pb_ssh_get(0);
         $shcmd = "ssh -i $keyfile -q -o UserKnownHostsFile=/dev/null -p $nport $mac";
@@ -1255 +1257 @@
     } else {
         my $tp = $vepath->{$ENV{'PBPROJ'}};
-        $shcmd = "sudo chroot $tp/$v /bin/su - $sshlogin->{$ENV{'PBPROJ'}} -c ";
-        $cpcmd = "cp -a ";
-        $cptarget = "$tp/$tdir";
-        $cp2target = "$tp/$bdir";
+        ($odir,$over,$oarch) = split(/-/,$v);
+        my $tpdir = "$tp/$odir/$over/$oarch";
+        my ($ptr) = pb_conf_get("vetype");
+        my $vetype = $ptr->{$ENV{'PBPROJ'}};
+        if ($vetype eq "chroot") {
+            $shcmd = "sudo chroot $tpdir /bin/su - $mac -c ";
+            $cpcmd = "sudo cp -r ";
+        } elsif ($vetype eq "schroot") {
+            $shcmd = "schroot $tp -u $mac -- ";
+            $cpcmd = "sudo cp -r ";
+        }
+        # We need to get the home dir of the target account to deliver in the right place
+        open(PASS,"$tpdir/etc/passwd") || die "Unable to open $tpdir/etc/passwd";
+        my $homedir = "";
+        while (<PASS>) {
+            my ($c1,$c2,$c3,$c4,$c5,$c6,$c7) = split(/:/);
+            $homedir = $c6 if ($c1 =~ /^$mac$/);
+            pb_log(3,"Homedir: $homedir - account: $c6\n");
+        }
+        close(PASS);
+        $cptarget = "$tpdir/$homedir/$tdir";
+        if ($cmt eq "ve") {
+            $cp2target = "$tpdir/$homedir/$bdir";
+        }
+        pb_log(2,"On VE using $cptarget as target dir to copy to\n");
     }
 
@@ -1270 +1293 @@
     pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $src $cptarget 2> /dev/null","$cmt delivery in $cptarget");
 
-    # For VE we need to change the owner manually - To be tested if needed
-    #if ($cmt eq "ve") {
-    #pb_system("cd $cptarget ; sudo chown -R $sshlogin->{$ENV{'PBPROJ'}} .","$cmt chown in $cptarget to $sshlogin->{$ENV{'PBPROJ'}}");
-    #}
+    # For VE we need to change the owner manually
+    if ($cmt eq "ve") {
+        pb_system("$shcmd \"sudo chown -R $mac $tdir\"","Adapt owner in $tdir to $mac");
+    }
+
     pb_system("$shcmd \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | bash\"","Executing pbscript on $cptarget if needed","verbose");
     if (($cmt eq "vm") || ($cmt eq "ve")) {
         # Get back info on pkg produced, compute their name and get them from the VM
         pb_system("$cpcmd $cp2target/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'} $ENV{'PBBUILDDIR'} 2> /dev/null","Get package names in $cp2target");
+        # For VE we need to change the owner manually
+        if ($cmt eq "ve") {
+            pb_system("sudo chown $UID $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}","Adapt owner in $tdir to $UID");
+        }
         open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}";
         my $src = <KEEP>;
@@ -1312 +1340 @@
     }
     pb_log(2,"Before halt, vmexist: $vmexist, vmpid: $vmpid\n");
-    if ((! $vmexist) && (($cmt eq "vm") || ($cmt eq "Script"))) {
+    if ((! $vmexist) && (($cmt eq "vm") || ($cmt eq "VMScript"))) {
         pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
     }
@@ -1363 +1391 @@
         # and launch the build through pbscript
         pb_log(2,"DEBUG: Before send2target, vmexist: $vmexist, vmpid: $vmpid\n");
-        pb_send2target("Script","$v",$vmexist,$vmpid);
+        pb_send2target(uc($vtype)."Script","$v",$vmexist,$vmpid);
 
     }
@@ -1480 +1508 @@
         my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver);
 
-        if ($vetype eq "chroot") {
+        if (($vetype eq "chroot") || ($vetype eq "schroot")) {
             # Architecture consistency
             if ($arch ne $darch) {
@@ -1516 +1544 @@
                             $addpkgs = "--add-pkg-list $pkgfile";
                         }
-                        my $rinseverb = "--verbose" if ($pbdebug gt 0);
+                        my $rinseverb = "";
+                        $rinseverb = "--verbose" if ($pbdebug gt 0);
 
                         pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$veconf->{$ENV{'PBPROJ'}}\" $post $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
@@ -1525 +1554 @@
                     }
                 } elsif ($dtype eq "deb") {
-                    pb_system("","Creating the pbuilder VE");
+                    pb_system("","Creating the pbuilder VE TBD");
                 } elsif ($dtype eq "ebuild") {
                     die "Please teach the dev team how to build gentoo chroot";
@@ -1792 +1821 @@
     my ($vmexist,$vmpid);
 
+    # Prepare the script to be executed on the VM/VE
+    # in $ENV{'PBDESTDIR'}/setupv
+    open(SCRIPT,"> $pbscript") || die "Unable to create $pbscript";
+    
+    print SCRIPT << 'EOF';
+#!/usr/bin/perl -w
+
+use strict;
+use File::Copy;
+
+# We should not need in this script more functions than what is provided 
+# by Base and Distribution to avoid problems at exec time.
+# They are appended at the end.
+
+our $pbdebug;
+our $pbLOG;
+our $pbsynmsg = "pbscript";
+our $pbdisplaytype = "text";
+our $pblocale = "";
+pb_log_init($pbdebug, $pbLOG);
+pb_temp_init();
+
+EOF
+
     if ($vtype eq "vm") {
         # Prepare the key to be used and transfered remotely
@@ -1815 +1868 @@
         pb_system("cat $keyfile.pub | ssh -q -o UserKnownHostsFile=/dev/null -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir -p .ssh ; chmod 700 .ssh ; cat >> .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys\"","Copying local keys to $vtype. This may require the root password");
         # once this is done, we can do what we want on the VM remotely
-    }
+    } elsif ($vtype eq "ve") {
+        # We need to finish the setup of packages needed in the VE if needed
+        # rinse at least needs it
+        my ($vepkglist) = pb_conf_get_if("vepkglist");
+
+        if (defined $vepkglist) {
+            # Get distro context
+            my ($name,$ver,$darch) = split(/-/,$v);
+            chomp($darch);
+            my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver);
     
-    # Prepare the script to be executed on the VM/VE
-    # in $ENV{'PBDESTDIR'}/setupv
-    
-    open(SCRIPT,"> $pbscript") || die "Unable to create $pbscript";
-    print SCRIPT << 'EOF';
-#!/usr/bin/perl -w
-
-use strict;
-use File::Copy;
-
-# We should not need in this script more functions than what is provided 
-# by Base and Distribution to avoid problems at exec time.
-# They are appended at the end.
-
-our $pbdebug;
-our $pbLOG;
-our $pbsynmsg = "pbscript";
-our $pbdisplaytype = "text";
-our $pblocale = "";
-pb_log_init($pbdebug, $pbLOG);
-pb_temp_init();
-
-EOF
+            my $postparam = pb_get_dist_param($ddir,$dver,$darch,$vepkglist);
+            # Change the list of pkg in to a space separated list
+            $postparam =~ s/,/ /g;
+            # remove potential sudo from the update command for this time,
+            # as this will be run as root anyway, and if not we will have
+            # a problem with tty
+            $pbupd =~ s/sudo //g;
+
+            print SCRIPT << "EOF";
+# For VE we first need to mount some FS
+pb_system("mount -t proc /proc /proc");
+
+# For VE we need a good null dev
+pb_system("rm -f /dev/null; mknod /dev/null c 1 3; chmod 777 /dev/null");
+
+
+# For VE we need some additional packages that are not there yet
+pb_system("$pbupd $postparam");
+
+EOF
+        }
+    }
     if ($vtype eq "vm") {
         print SCRIPT << 'EOF';
@@ -1984 +2045 @@
 system "pb 2>&1 | head -5";
 EOF
+    if ($vtype eq "ve") {
+            print SCRIPT << 'EOF';
+# For VE we need to umount some FS at the end
+
+pb_system("umount /proc");
+EOF
+    }
+
     # Adds pb_distro_init from ProjectBuilder::Distribution and Base
     foreach my $d (@INC) {
@@ -2034 +2103 @@
 my $insfb = "rm -rf File-Basedir* ; wget http://search.cpan.org/CPAN/authors/id/P/PA/PARDUS/File-BaseDir-0.03.tar.gz ; tar xvfz File-BaseDir-0.03.tar.gz ; cd File-BaseDir* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf File-BaseDir*";
 my $insms = "rm -rf Mail-Sendmail* ; wget http://search.cpan.org/CPAN/authors/id/M/MI/MIVKOVIC/Mail-Sendmail-0.79.tar.gz ; tar xvfz Mail-Sendmail-0.79.tar.gz ; cd Mail-Sendmail* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf Mail-Sendmail*";
-my $inslg = "rm -rf gettext* ; wget http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz ; tar xvfz gettext-1.05.tar.gz ; cd gettext* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf gettext*";
 my $cmtdm = "Installing Date-Manip perl module";
 my $cmtmb = "Installing Module-Build perl module";
@@ -2040 +2108 @@
 my $cmtfb = "Installing File-Basedir perl module";
 my $cmtms = "Installing Perl-Sendmail perl module";
-my $cmtlg = "Installing Perl-gettext perl module";
 my $cmtall = "Installing required modules";
 
@@ -2051 +2118 @@
         pb_system("$insfb","$cmtfb");
         pb_system("$insms","$cmtms");
-        pb_system("$inslg","$cmtlg");
     } else {
-        my $addp = "";
-        if ($dver > 9) {
-            $addp = "perl-gettext";
-        } else {
-            pb_system("$inslg","$cmtlg");
-        }
-        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker perl-File-MimeInfo perl-Mail-Sendmail $addp"));
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker perl-File-MimeInfo perl-Mail-Sendmail"));
     }
 } elsif (( $dfam eq "rh" ) || ($ddir eq "sles") || (($ddir eq "suse") && (($dver eq "10.1") || ($dver eq "10.0"))) || ($ddir eq "slackware")) {
@@ -2069 +2129 @@
     pb_system("$insfb","$cmtfb");
     pb_system("$insms","$cmtms");
-    pb_system("$inslg","$cmtlg");
 } elsif ($ddir eq "suse") { 
     # New OpenSuSE
@@ -2086 +2145 @@
         if (($ddir eq "mandrake") && ($dver eq "10.1")) {
             pb_system("$insdm","$cmtdm");
-            pb_system("$inslg","$cmtlg");
         } else {
-            $addp ="perl-DateManip perl-Locale-gettext";
-        }
-        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"rpm-build wget sudo patch ntp-client perl-File-MimeInfo perl-Mail-Sendmail perl-Locale-gettext $addp"));
+            $addp ="perl-DateManip";
+        }
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"rpm-build wget sudo patch ntp-client perl-File-MimeInfo perl-Mail-Sendmail $addp"));
 } elsif ( $dfam eq "du" ) {
     if (( $dver eq "3.1" ) && ($ddir eq "debian")) {
         pb_system("$insfb","$cmtfb");
         pb_system("$insfm","$cmtfm");
-        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libmodule-build-perl libdate-manip-perl libmail-sendmail-perl liblocale-gettext-perl"));
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libmodule-build-perl libdate-manip-perl libmail-sendmail-perl"));
     } else  {
-        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libmodule-build-perl libdate-manip-perl libmail-sendmail-perl liblocale-gettext-perl"));
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libmodule-build-perl libdate-manip-perl libmail-sendmail-perl"));
     }
 } elsif ( $dfam eq "gen" ) {
         #system "emerge -u system";
-        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"wget sudo ntp DateManip File-MimeInfo Mail-Sendmail Locale-gettext"));
+        pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,"wget sudo ntp DateManip File-MimeInfo Mail-Sendmail"));
 } else {
     pb_log(0,"No pkg to install\n");