Changeset 169


Ignore:
Timestamp:
Oct 2, 2007, 12:14:05 AM (12 years ago)
Author:
bruno
Message:

Support global filter gfiles (taken before package specific ones)

Location:
devel/pb
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r168 r169  
    568568        # and launch the build thourgh pbscript
    569569        pb_send2ssh("Script","$v",$vmexist,"vmhost","vmlogin","pbrc","vmport");
     570
    570571    }
    571572}
     
    749750    print "pb (aka project-builder) Version $projectbuilderver-$projectbuilderrev\n";
    750751    print "\n";
    751     print "Syntax: pb [-vhqt][-r pbroot][-p project][[-s script -a account] -m \"mach-1[,...]\"] <action> [<pkg1>...]\n";
     752    print "Syntax: pb [-vhqt][-r pbroot][-p project][[-s script -a account -P port] -m \"mach-1[,...]\"] <action> [<pkg1>...]\n";
    752753    print "\n";
    753754    print "-h : This help file\n";
     
    781782    print "\tbuild2pkg: Create packages for your running distribution  \n";
    782783    print "\n";
     784    print "\tcms2pkg:   cms2build + build2pkg\n";
     785    print "\n";
    783786    print "\tbuild2ssh: Send the tar files to a SSH host               \n";
    784787    print "\n";
    785788    print "\tpkg2ssh:   Send the packages built to a SSH host          \n";
    786     print "\n";
    787     print "\tcms2pkg:   cms2build + build2pkg\n";
    788789    print "\n";
    789790    print "\tbuild2vm:  Create packages in VMs, launching them if needed\n";
     
    791792    print "\t           VM type supported are QEMU            \n";
    792793    print "\n";
     794    print "\tcms2vm:    cms2build + build2vm\n";
     795    print "\n";
    793796    print "\tlaunchvm:  Launch one virtual machine\n";
    794797    print "\n";
     
    796799    print "\t           and executes a script on it                 \n";
    797800    print "\n";
    798     print "\tcms2vm:    cms2build + build2vm\n";
    799     print "\n";
    800 }
     801}
  • devel/pb/contrib/pbsetupqemu

    r168 r169  
    6363}
    6464close(PBFILE);
    65 print PBFILE "pb   ALL=(ALL) NOPASSWD:ALL\n" if ( $found == 0 );
     65print PBOUT "pb   ALL=(ALL) NOPASSWD:ALL\n" if ( $found == 0 );
    6666close(PBOUT);
    6767rename("$file.new",$file);
     
    7676if ( $ddir eq "fedora" ) {
    7777    system "yum clean all";
     78    system "yum update -y";
     79    my $arch=`uname -m`;
     80    my $opt = "";
     81    chomp($arch);
     82    if ($arch eq "x86_64") {
     83        $opt="--exclude=*.i?86";
     84    }
    7885    if ( $dver <= 4 ) {
    7986        # FC4
    80         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 ..";
     87        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 ..";
    8188    } else {
    8289        # FC5/6/7
    83         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";
     90        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";
    8491    }
    8592} elsif ( $dfam eq "md" ) {
  • devel/pb/lib/ProjectBuilder/Base.pm

    r156 r169  
    367367my @ffiles;
    368368my ($ffile0, $ffile1, $ffile2, $ffile3);
     369my ($mfile0, $mfile1, $mfile2, $mfile3);
    369370my $pbpkg = shift || die "No package specified";
    370371my $dtype = shift || die "No dtype specified";
     
    374375my $ptr; # returned value pointer on the hash of filters
    375376my %ptr;
     377
     378# Global filter files first, then package specificities
     379if (-d "$ENV{'PBCONF'}/pbfilter") {
     380    $mfile0 = "$ENV{'PBCONF'}/pbfilter/$dtype.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$dtype.pbf");
     381    $mfile1 = "$ENV{'PBCONF'}/pbfilter/$dfam.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$dfam.pbf");
     382    $mfile2 = "$ENV{'PBCONF'}/pbfilter/$ddir.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$ddir.pbf");
     383    $mfile3 = "$ENV{'PBCONF'}/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$ddir-$dver.pbf");
     384
     385    push @ffiles,$mfile0 if (defined $mfile0);
     386    push @ffiles,$mfile1 if (defined $mfile1);
     387    push @ffiles,$mfile2 if (defined $mfile2);
     388    push @ffiles,$mfile3 if (defined $mfile3);
     389}
    376390
    377391if (-d "$ENV{'PBCONF'}/$pbpkg/pbfilter") {
Note: See TracChangeset for help on using the changeset viewer.