Changeset 1603 in ProjectBuilder for devel/pb

Timestamp:

May 27, 2012, 1:49:49 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pbtest now uses debian-6.0 has the correct distro name and points to mandriva 2011.0
• pbtest now first umounts potential remaining /proc FS left from previous run and has a build dep fo deb on gcc
• pb: removes a useless chown in it which was always failing
• Fix errors in mageia deps
• Fix typo in Base.pm
• rpmbootstrap needs aaa_base for VE seyup with zypper, in order to add passwd file e.g.

Location:

devel/pb

Files:

• bin/pb (modified) (4 diffs)
• t/pbtest (modified) (6 diffs)

devel/pb/bin/pb

@@ -2332 +2332 @@
     pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $src $cptarget 2> /dev/null","$cmt delivery in $cptarget");
 
+    my $chowncommand = pb_check_req("chown",0);
     # For VE we need to change the owner manually
     if ($cmt =~ /^VE/) {
         pb_system("$shcmdroot sed -i '/requiretty/d' /etc/sudoers","Removing potential requiretty in sudoers");
-        pb_system("$shcmd \"sudo chown -R $mac $tdir\"","Adapt owner in $tdir to $mac");
+        pb_system("$shcmd \"sudo $chowncommand -R $mac $tdir\"","Adapt owner in $tdir to $mac");
     }
 
@@ -2359 +2360 @@
         # Get back info on pkg produced, compute their name and get them from the VM/RM
         pb_system("$cpcmd $cp2target/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$ 2> /dev/null","Get package names in $cp2target");
-        # For VE we need to change the owner manually
-        if ($cmt eq "VEbuild") {
-            my $command = pb_check_req("chown",0);
-            pb_system("sudo $command $UID $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$","Adapt owner in $tdir to $UID");
-        }
         if (not -f "$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") {
-            pb_log(0,"Problem with VM/RM $v on $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$");
+            pb_log(0,"ERROR with VM/RM $v on getting $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$");
         } else {
             open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$";
@@ -3323 +3319 @@
         # Sync date
         # do it after sudoers is setup
-        print SCRIPT "pb_system(\"$ntpline\");\n";
+        print SCRIPT "pb_system(\"$ntpline\",\"Updating time with $ntpline\",\"mayfail\");\n";
     }
     # We may need a proxy configuration. Get it from the local env
@@ -3429 +3425 @@
 # For VE we need to umount some FS at the end
 
-pb_system("umount /proc","Unmounting /proc,"mayfail");
+pb_system("umount /proc","Unmounting /proc","mayfail");
 
 # Create a basic network file if not already there

devel/pb/t/pbtest

@@ -12 +12 @@
 
 # You may have multiple distros here
-TESTVEDIST="debian-6-x86_64 ubuntu-12.04-i386 fedora-16-x86_64 opensuse-12.1-x86_64 mageia-2-i386 mandriva-2010.0-i386"
+TESTVEDIST="debian-6.0-x86_64 ubuntu-12.04-i386 fedora-16-x86_64 opensuse-12.1-x86_64 mageia-2-i386 mandriva-2011.0-i386"
 # Only one VM is tested for now.
 TESTVMDIST="fedora-16-i386"
@@ -27 +27 @@
 msg=$2
 
+echo " "
 if [ _"$cmd" == _"/tmp/pbtestcmd" ]; then
     echo "INFO (as $PBUSER): Now running `head -1 $cmd` [$msg]"
@@ -39 +40 @@
     echo "================================"
 fi
-echo " "
 }
 
@@ -45 +45 @@
 cmd=$1
 
+echo " "
 echo "INFO (as root): Now running $cmd"
 sudo -n $cmd
@@ -53 +54 @@
     echo "================================"
 fi
-echo " "
 }
 
 
+for d in $TESTVEDIST; do
+    # umount /proc in VE in case
+    dd=`echo $d | cut -d'-' -f1`
+    vv=`echo $d | cut -d'-' -f2`
+    aa=`echo $d | cut -d'-' -f3`
+    if [ -f "$PBTEST/ve/$dd/$vv/$aa/proc/cpuinfo" ]; then
+        sudocmd "umount $PBTEST/ve/$dd/$vv/$aa/proc"
+    fi
+done
 sudocmd "rm -rf $PBTEST/* $PBTEST/.??*"
+sudocmd "rmdir $PBTEST"
 sudocmd "killall -u $PBUSER"
 sudocmd "userdel $PBUSER"
@@ -230 +240 @@
 filter PBGRP = utils
 filter PBLIC = Afio
+filter PBBDEP = gcc
 EOF
 sudocmd "mv /tmp/deb.pbf $PBTEST/pb/afio/pbconf/2.5/pbfilter/deb.pbf"