Changeset 226 in ProjectBuilder for devel/pb/contrib

Timestamp:

Oct 17, 2007, 6:38:20 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Improve pbsetupqemu for fc4, sudoers management
• Adds updateqemu script
• Adds support for "flat" type of CMS
• gentoo is nover now
• halt replaces poweroff
• try to fix date issue on the VM
• improve destdir management on spec file

Location:

devel/pb/contrib

Files:

• pbsetupqemu (modified) (3 diffs)
• updateqemu (added)

devel/pb/contrib/pbsetupqemu

@@ -79 +79 @@
     }
 
-    my $topbuilddir=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
-    chomp($topbuilddir);
+    #my $topbuilddir=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
+    #chomp($topbuilddir);
 
     if ( $dver <= 4 ) {
         # FC4 - AppConfig unavailable
-        system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ntp sudo ; rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd ..";
+        system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ntp sudo ; rm -rf AppConfig-* ; rm -rf AppConfig* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd ..";
     } else {
         # FC5/6/7
@@ -117 +117 @@
 # Adapt sudoers
 $file="/etc/sudoers";
-$found = 0;
 open(PBFILE,$file) || die "Unable to open $file";
 open(PBOUT,"> $file.new") || die "Unable to open $file.new";
 while (<PBFILE>) {
-    $found = 1 if (/^pb   /);
+    next if (/^pb   /);
     s/Defaults[ \t]+requiretty//;
     print PBOUT $_;
 }
 close(PBFILE);
-print PBOUT "pb   ALL=(ALL) NOPASSWD:ALL\n" if ( $found == 0 );
+print PBOUT "pb   ALL=(ALL) NOPASSWD:ALL\n";
 close(PBOUT);
 rename("$file.new",$file);
@@ -172 +171 @@
 }
 
-system "rm -rf project-builder-* ; wget ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd ..";
+system "rm -rf project-builder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd ..";