Changeset 1603

Timestamp:

05/27/12 01:49:49 (13 months ago)

Author:

bruno

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

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Base.pm (modified) (2 diffs)
• pb/bin/pb (modified) (4 diffs)
• pb/t/pbtest (modified) (6 diffs)
• rpmbootstrap/bin/rpmbootstrap (modified) (3 diffs)

devel/pb-modules/etc/pb.conf

@@ -378 +378 @@
 rbsmindep mageia-1-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db4.8,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64ncurses5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm1,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,module-init-tools,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,sysvinit-tools,udev,urpmi,util-linux-ng,vim-minimal
 #
-rbsmindep mageia-2-i386 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb4.8,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma5,libmagic1,libncurses5,libncursesw5,libnspr4,libnss3,libopenssl1.0.0,libpopt0,libreadline6,librpm2,librpmbuild2,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,libzlib1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,udev,urpmi,util-linuxg,vim-minimal
-rbsmindep mageia-2-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db4.8,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64ncurses5,lib64ncursesw5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm2,lib64rpmbuild2,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,udev,urpmi,util-linux,systemd,vim-minimal
+rbsmindep mageia-2-i386 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb4.8,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma5,libmagic1,libncurses5,libncursesw5,libnspr4,libnss3,libopenssl1.0.0,libpopt0,libreadline6,librpm2,librpmbuild2,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,libzlib1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,udev,urpmi,util-linux,vim-minimal
+rbsmindep mageia-2-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db4.8,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64ncurses5,lib64ncursesw5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm2,lib64rpmbuild2,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,udev,urpmi,util-linux,vim-minimal
 
 # Where to store packages downloaded temporarily by rpmbootstrap

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

@@ -166 +166 @@
     pb_log(0,"OK\n") if ($res == 0);
     return($res) 
-    }
+}
 
 my $cwd = getcwd;
@@ -181 +181 @@
     } else {
         pb_log(0,"ERROR running command ($cmd) with cwd=$cwd, pid=$$");
+    }
 } else {
     pb_log(0,"OK\n") if ((! defined $verbose) || ($verbose ne "quiet"));

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"

devel/rpmbootstrap/bin/rpmbootstrap

@@ -504 +504 @@
     }
     $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";
-    # TODO
-    # $minipkglist = join(" ", "ldconfig yum passwd vim-minimal dhclient authconfig", @installed_packages);
 } elsif ($pbos->{'install'} =~ /zypper/) {
     pb_mkdir_p("$vepath/etc/zypp/repos.d");
@@ -514 +512 @@
         pb_system("chroot $vepath /bin/bash -c \"yes | /usr/bin/zypper sa $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper");
     } else {
-        pb_system("chroot $vepath /bin/bash -c \"/usr/bin/zypper rr $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper","mayfail"); # don't care if remove fails if add succeeds.
+        # don't care if remove fails if add succeeds.
+        pb_system("chroot $vepath /bin/bash -c \"/usr/bin/zypper rr $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper","mayfail");
         pb_system("chroot $vepath /bin/bash -c \"/usr/bin/zypper ar $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper");
     }
@@ -526 +525 @@
 #EOF
     close(REPO);
-    $minipkglist = "zypper";
+    $minipkglist = "zypper aaa_base";
     # TODO: Re-installing packages missing and necessary on opensuse 11.4 to get /etc/passwd created.
-    # $minipkglist = join(" ", "zypper", @installed_packages);
 } elsif ($pbos->{'install'} =~ /urpmi/) {
     # Setup the repo