Changeset 169

Timestamp:

10/02/07 00:14:05 (6 years ago)

Author:

bruno

Message:

Support global filter gfiles (taken before package specific ones)

Location:

devel/pb

Files:

• bin/pb (modified) (5 diffs)
• contrib/pbsetupqemu (modified) (2 diffs)
• lib/ProjectBuilder/Base.pm (modified) (2 diffs)

devel/pb/bin/pb

@@ -568 +568 @@
         # and launch the build thourgh pbscript
         pb_send2ssh("Script","$v",$vmexist,"vmhost","vmlogin","pbrc","vmport");
+
     }
 }
@@ -749 +750 @@
     print "pb (aka project-builder) Version $projectbuilderver-$projectbuilderrev\n";
     print "\n";
-    print "Syntax: pb [-vhqt][-r pbroot][-p project][[-s script -a account] -m \"mach-1[,...]\"] <action> [<pkg1>...]\n";
+    print "Syntax: pb [-vhqt][-r pbroot][-p project][[-s script -a account -P port] -m \"mach-1[,...]\"] <action> [<pkg1>...]\n";
     print "\n";
     print "-h : This help file\n";
@@ -781 +782 @@
     print "\tbuild2pkg: Create packages for your running distribution  \n";
     print "\n";
+    print "\tcms2pkg:   cms2build + build2pkg\n";
+    print "\n";
     print "\tbuild2ssh: Send the tar files to a SSH host               \n";
     print "\n";
     print "\tpkg2ssh:   Send the packages built to a SSH host          \n";
-    print "\n";
-    print "\tcms2pkg:   cms2build + build2pkg\n";
     print "\n";
     print "\tbuild2vm:  Create packages in VMs, launching them if needed\n";
@@ -791 +792 @@
     print "\t           VM type supported are QEMU            \n";
     print "\n";
+    print "\tcms2vm:    cms2build + build2vm\n";
+    print "\n";
     print "\tlaunchvm:  Launch one virtual machine\n";
     print "\n";
@@ -796 +799 @@
     print "\t           and executes a script on it                 \n";
     print "\n";
-    print "\tcms2vm:    cms2build + build2vm\n";
-    print "\n";
-}
+}

devel/pb/contrib/pbsetupqemu

@@ -63 +63 @@
 }
 close(PBFILE);
-print PBFILE "pb   ALL=(ALL) NOPASSWD:ALL\n" if ( $found == 0 );
+print PBOUT "pb   ALL=(ALL) NOPASSWD:ALL\n" if ( $found == 0 );
 close(PBOUT);
 rename("$file.new",$file);
@@ -76 +76 @@
 if ( $ddir eq "fedora" ) {
     system "yum clean all";
+    system "yum update -y";
+    my $arch=`uname -m`;
+    my $opt = "";
+    chomp($arch);
+    if ($arch eq "x86_64") {
+        $opt="--exclude=*.i?86";
+    }
     if ( $dver <= 4 ) {
         # FC4
-        system "yum -y 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 ; 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 ; 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
-        system "yum -y install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs ntp perl-AppConfig perl-DateManip";
+        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 ntp perl-AppConfig perl-DateManip";
     }
 } elsif ( $dfam eq "md" ) {

devel/pb/lib/ProjectBuilder/Base.pm

@@ -367 +367 @@
 my @ffiles;
 my ($ffile0, $ffile1, $ffile2, $ffile3);
+my ($mfile0, $mfile1, $mfile2, $mfile3);
 my $pbpkg = shift || die "No package specified";
 my $dtype = shift || die "No dtype specified";
@@ -374 +375 @@
 my $ptr; # returned value pointer on the hash of filters
 my %ptr;
+
+# Global filter files first, then package specificities
+if (-d "$ENV{'PBCONF'}/pbfilter") {
+    $mfile0 = "$ENV{'PBCONF'}/pbfilter/$dtype.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$dtype.pbf");
+    $mfile1 = "$ENV{'PBCONF'}/pbfilter/$dfam.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$dfam.pbf");
+    $mfile2 = "$ENV{'PBCONF'}/pbfilter/$ddir.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$ddir.pbf");
+    $mfile3 = "$ENV{'PBCONF'}/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$ddir-$dver.pbf");
+
+    push @ffiles,$mfile0 if (defined $mfile0);
+    push @ffiles,$mfile1 if (defined $mfile1);
+    push @ffiles,$mfile2 if (defined $mfile2);
+    push @ffiles,$mfile3 if (defined $mfile3);
+}
 
 if (-d "$ENV{'PBCONF'}/$pbpkg/pbfilter") {