Changeset 1064 in ProjectBuilder


Ignore:
Timestamp:
Jun 27, 2010, 8:23:38 AM (14 years ago)
Author:
Bruno Cornec
Message:

r3931@dhcp184-49-175-19: bruno | 2010-06-26 08:02:59 +0200

  • Adds the notion of os at the top in order to provide an even better tuple management
Location:
devel
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • devel/pb-modules/bin/pbdistrocheck

    r969 r1064  
    9393@param = split(/-/,$dist) if (defined $dist);
    9494
    95 my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init(@param);
     95my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init(@param);
    9696if (defined $opts{'d'}) {
    9797    print "\u$ddir $dver $arch\n";

  • devel/pb-modules/etc/pb.conf

    r1052 r1064  
    138138# Ganularity is the following:
    139139#
     140#osname
    140141# ostype
    141142#   osfamily
    … …  
    177178ostype sol = pkg
    178179
     180# Group ostype by os
     181# Key is ostype, Value is os name
     182os deb = linux
     183os tgz = linux
     184os ebuild = linux
     185os rpm = linux
     186os port = bsd
     187os pkg = solaris
     188
    179189# From the most generic to the most specialized, in term of granularity,
    180190# give the command to use to install on the OS
    … …  
    213223#ossuffix rhel = rhel
    214224#ossuffix centos = el
     225#
    215226
    216227# For that OS no need to keep the version

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

    r1050 r1064  
    4242  # Return information on the running distro
    4343  #
    44   my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
     44  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $dos, $pbupd, $arch) = pb_distro_init();
    4545  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
    4646  #
    4747  # Return information on the requested distro
    4848  #
    49   my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init("ubuntu","7.10","x86_64");
     49  my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init("ubuntu","7.10","x86_64");
    5050  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
    5151  #
    … …  
    5353  #
    5454  my ($ddir,$dver) = pb_distro_get();
    55   my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init($ddir,$dver);
     55  my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init($ddir,$dver);
    5656  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
    5757
    … …  
    9595my $dfam = "unknown";
    9696my $dtype = "unknown";
     97my $dos = "unknown";
    9798my $dsuf = "unknown";
    9899my $dupd = "unknown";
    … …  
    112113$darch=pb_get_arch() if (not defined $darch);
    113114
    114 my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver");
     115my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver,$os) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver","os");
    115116
    116117# Dig into the tuple to find the best answer
    117118$dfam = pb_distro_get_param($ddir,$dver,$darch,$osfamily);
     119$dos = pb_distro_get_param($ddir,$dver,$darch,$os);
    118120$dtype = $ostype->{$dfam} if (defined $ostype->{$dfam});
    119121$dupd = pb_distro_get_param($ddir,$dver,$darch,$osupd,$dfam,$dtype);
    … …  
    141143pb_log(2,"DEBUG: pb_distro_init: $ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch\n");
    142144
    143 return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch);
     145return($ddir, $dver, $dfam, $dtype, $dos, $dsuf, $dupd, $darch);
    144146}
    145147
    … …  
    431433my $dfam = shift || "unknown";
    432434my $dtype = shift || "unknown";
     435my $dos = shift || "unknown";
    433436
    434437if (defined $opt->{"$ddir-$dver-$darch"}) {
    … …  
    442445} elsif (defined $opt->{$dtype}) {
    443446    $param = $opt->{$dtype};
     447} elsif (defined $opt->{$dos}) {
     448    $param = $opt->{$dos};
    444449} elsif (defined $opt->{"default"}) {
    445450    $param = $opt->{"default"};

  • devel/pb/bin/pb

    r1058 r1064  
    612612        my %build;
    613613        # We want to at least build for the underlying distro
    614         my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
     614        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
    615615        my $tmpl = "$ddir-$dver-$arch,";
    616616        my %patches;
    … …  
    659659                chomp($arch);
    660660                my ($ddir, $dver, $dfam);
    661                 ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}, $pb{'arch'}) = pb_distro_init($name,$ver,$arch);
     661                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'os'}, $pb{'suf'}, $pb{'upd'}, $pb{'arch'}) = pb_distro_init($name,$ver,$arch);
    662662                pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'})."\n");
    663663                pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
    … …  
    866866sub pb_test2pkg {
    867867    # Get the running distro to test on
    868     my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
     868    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
    869869    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n");
    870870
    … …  
    886886
    887887    # Get the running distro to build on
    888     my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
     888    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
    889889    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n");
    890890
    … …  
    11941194            ($odir,$over,$oarch) = split(/-/,$v);
    11951195        }
    1196         ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($odir,$over,$oarch);
     1196        ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($odir,$over,$oarch);
    11971197        pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
    11981198
    … …  
    17401740        my ($name,$ver,$darch) = split(/-/,$v);
    17411741        chomp($darch);
    1742         my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver,$darch);
     1742        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($name,$ver,$darch);
    17431743
    17441744        # Get VE context
    … …  
    22182218    my ($name,$ver,$darch) = split(/-/,$v);
    22192219    chomp($darch);
    2220     my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
     2220    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
    22212221   
    22222222    # Name of the account to deal with for VM/VE
    … …  
    24162416# And we now need the conf file required for this to work created above
    24172417
    2418 my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $darch) = pb_distro_init();
     2418my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $darch) = pb_distro_init();
    24192419print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $darch))."\n";
    24202420
    … …  
    25612561    my ($name,$ver,$darch) = split(/-/,$v);
    25622562    chomp($darch);
    2563     my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver,$darch);
     2563    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($name,$ver,$darch);
    25642564    my ($vepath) = pb_conf_get("vepath");
    25652565
    … …  
    28092809
    28102810    # Get all required parameters
    2811     my ($pkgv, $pkgt, $testver) = pb_conf_get_if("pkgver","pkgtag","testver");
     2811    my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
    28122812
    28132813    # DB of announces for external usage (Web pages generation)

  • devel/pb/contrib/installpb

    r311 r1064  
    1010my $pbver= "devel";
    1111
    12 my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init();
     12my ($ddir, $dver, $dfam, $dtype, $dos, $dsuf) = pb_distro_init();
    1313
    1414print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n";

  • devel/rpmbootstrap/bin/rpmbootstrap

    r1044 r1064  
    202202my ($name,$ver,$darch) = split(/-/,$ENV{'PBV'});
    203203chomp($darch);
    204 my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
     204my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
    205205
    206206#
Note: See TracChangeset for help on using the changeset viewer.