Changeset 1596 in ProjectBuilder

Timestamp:

May 25, 2012, 12:52:34 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Improve system cmd display in Distribution.pm for deps analysis
• umount /proc in the VE when using rpmbootstrap, if it wasn't unmounted due to error, to allow snapshots to work correctly
• pbtest should now be able to build afio in an rpm VE (The VE is setup correctly again, including fedora 16 having the requiretty constraint))

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/VE.pm (modified) (1 diff)
• pb/t/pbtest (modified) (3 diffs)

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

@@ -446 +446 @@
     next if $p =~ /^\s*$/o;
     if ($pbos->{'type'} eq  "rpm") {
-        my $res = pb_system("rpm -q --whatprovides --quiet $p","","mayfail");
+        my $res = pb_system("rpm -q --whatprovides --quiet $p","Looking for $p","mayfail");
         next if ($res eq 0);
         pb_log(1, "INFO: missing dependency $p\n");

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

@@ -184 +184 @@
                 my $command = pb_check_req("rpmbootstrap",0);
                 pb_system("$sudocmd $command $rbsopt $postinstall $addpkgs $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} $rbsverb","Creating the rpmbootstrap VE for $pbos->{'name'}-$pbos->{'version'} ($pbos->{'arch'})", "verbose");
+                pb_system("$sudocmd /bin/umount $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/proc","Umounting stale /proc","mayfail") if (-f "$root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/proc/cpuinfo");
             } elsif ($verpmstyle eq "mock") {
                 my ($rbsconf) = pb_conf_get("rbsconf");

devel/pb/t/pbtest

@@ -220 +220 @@
 filter PBGRP = Applications/Archiving
 filter PBLIC = Afio
+filter PBDEP = gcc
 EOF
 sudocmd "mv /tmp/rpm.pbf $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.pbf"
@@ -234 +235 @@
 perl -pi -e 's|%doc ChangeLog|%doc HISTORY PORTING README SCRIPTS ANNOUNCE-2.5 perl.artistic.license|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
 perl -pi -e 's|%doc INSTALL COPYING README AUTHORS NEWS|%doc afio.lsm script1 script2 script3 script4\n%{_bindir}/%{name}\n%{_mandir}/man1/%{name}.1*|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
+perl -pi -e 's|^#Requires:|Requires:|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
 EOF
 chmod 755 /tmp/pbtestcmd
@@ -308 +310 @@
     # Cleaning VE to use the snapshot
     dd=`echo $d | cut -d'-' -f1`
-    sudocmd "rm -rf $PBTEST/tmp/$dd"
+    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
+    sudocmd "rm -rf $PBTEST/ve/$dd/$vv/$aa"
     sudopbtest "pb -S -m $d sbx2ve"
 done