Changeset 1177 in ProjectBuilder

Timestamp:

Feb 7, 2011, 2:24:17 PM (14 years ago)

Author:

Bruno Cornec

Message:

r4161@eelzbach2: bruno | 2011-02-06 21:07:30 +0100

• Introduction of a new hash $pbos to manage all os related info through a single data structure. All functions reviewed accordingly. Externally transparent, hopefully, but much cleaner code as a consequence. VM/VE/RM remains to be tested.

Location:

devel

Files:

• pb-modules/bin/pbdistrocheck (modified) (2 diffs)
• pb-modules/etc/pb.conf (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (21 diffs)
• pb/bin/pb (modified) (73 diffs)
• pb/lib/ProjectBuilder/Filter.pm (modified) (4 diffs)
• rpmbootstrap/bin/rpmbootstrap (modified) (22 diffs)

devel/pb-modules/bin/pbdistrocheck

@@ -118 +118 @@
 
 my $dist = shift @ARGV || undef ;
-my @param = undef;
-@param = split(/-/,$dist) if (defined $dist);
-
-my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init(@param);
+my $pbos = pb_distro_get_context($dist);
 my $sep = "\n";
 if (defined $opts{'l'}) {
@@ -137 +134 @@
     $sep = "," if (defined $opts{'s'});
     if (not defined $opts{'s'}) {
-        $dos = "OS:\t$dos";
-        $ddir = "Name:\t$ddir";
-        $dver = "Ver:\t$dver";
-        $dfam = "Family:\t$dfam";
-        $dtype = "Type:\t$dtype";
-        $pbsuf = "Suffix:\t$pbsuf";
-        $pbupd = "Update:\t$pbupd";
-        $pbins = "Install:\t$pbins";
-        $arch = "Arch:\t$arch";
+        $pbos->{'os'} = "OS:\t$pbos->{'os'}";
+        $pbos->{'name'} = "Name:\t$pbos->{'name'}";
+        $pbos->{'version'} = "Ver:\t$pbos->{'version'}";
+        $pbos->{'family'} = "Family:\t$pbos->{'family'}";
+        $pbos->{'type'} = "Type:\t$pbos->{'type'}";
+        $pbos->{'suffix'} = "Suffix:\t$pbos->{'suffix'}";
+        $pbos->{'update'} = "Update:\t$pbos->{'update'}";
+        $pbos->{'install'} = "Install:\t$pbos->{'install'}";
+        $pbos->{'arch'} = "Arch:\t$pbos->{'arch'}";
         print "Project-Builder tuple:\n";
     }
-    print join($sep,($dos, $ddir, $dver, $arch, $dtype, $dfam, $pbsuf, $pbupd, $pbins))."\n";
+    print join($sep,($pbos->{'os'}, $pbos->{'name'}, $pbos->{'version'}, $pbos->{'arch'}, $pbos->{'type'}, $pbos->{'family'}, $pbos->{'suffix'}, $pbos->{'update'}, $pbos->{'install'}))."\n";
 }

devel/pb-modules/etc/pb.conf

@@ -146 +146 @@
 # Ganularity is the following:
 #
-#osname
-# ostype
-#   osfamily
-#     os
-#       os-ver
-#         os-ver-arch
+#os (linux)
+# ostype (rpm)
+#   osfamily (md)
+#     osname (mandriva)
+#       osname-ver
+#         osname-ver-arch
 
 # Group OS by family to handle common actions more easily (filtering, install command, ...)
@@ -176 +176 @@
 
 # Group family by build types
-# Key is osfamily, Value is build type
+# Key is osfamily, Value is ostype
 ostype du = deb
 ostype slack = tgz

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

@@ -26 +26 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_conffile pb_distro_init pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param);
+our @EXPORT = qw(pb_distro_conffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -46 +46 @@
   # Return information on the running distro
   #
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $dos, $pbupd, $pbins, $arch) = pb_distro_init();
-  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $arch)."\n";
+  my $pbos = pb_distro_get_context();
+  print "distro tuple: ".Dumper($pbos->name, $pbos->ver, $pbos->fam, $pbos->type, $pbos->pbsuf, $pbos->pbupd, $pbos->pbins, $pbos->arch)."\n";
   # 
   # Return information on the requested distro
   #
-  my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init("ubuntu","7.10","x86_64");
-  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $arch)."\n";
+  my $pbos = pb_distro_get_context("ubuntu-7.10-x86_64");
+  print "distro tuple: ".Dumper($pbos->name, $pbos->ver, $pbos->fam, $pbos->type, $pbos->pbsuf, $pbos->pbupd, $pbos->pbins, $pbos->arch)."\n";
   # 
   # Return information on the running distro
   #
   my ($ddir,$dver) = pb_distro_get();
-  my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init($ddir,$dver);
-  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $arch)."\n";
 
 =head1 USAGE
@@ -78 +76 @@
 =item B<pb_distro_init>
 
-This function returns a list of 8 parameters indicating the distribution name, version, family, type of build system, suffix of packages, update command line, installation command line and architecture of the underlying Linux distribution. The value of the 8 fields may be "unknown" in case the function was unable to recognize on which distribution it is running.
+This function returns a hash of parameters indicating the distribution name, version, family, type of build system, suffix of packages, update command line, installation command line and architecture of the underlying Linux distribution. The value of the fields may be "unknown" in case the function was unable to recognize on which distribution it is running.
 
 As an example, Ubuntu and Debian are in the same "du" family. As well as RedHat, RHEL, CentOS, fedora are on the same "rh" family.
-Mandriva, Open SuSE and Fedora have all the same "rpm" type of build system. Ubuntu ad Debian have the same "deb" type of build system. 
+Mandriva, Open SuSE and Fedora have all the same "rpm" type of build system. Ubuntu and Debian have the same "deb" type of build system. 
 And "fc" is the extension generated for all Fedora packages (Version will be added by pb).
-All these information are stored in an external configuration file typically at /etc/pb/pb.conf
+All this information is stored in an external configuration file typically at /etc/pb/pb.conf
 
 When passing the distribution name and version as parameters, the B<pb_distro_init> function returns the parameter of that distribution instead of the underlying one.
@@ -95 +93 @@
 sub pb_distro_init {
 
-my $ddir = shift || undef;
-my $dver = shift || undef;
-my $dfam = "unknown";
-my $dtype = "unknown";
-my $dos = "unknown";
-my $dsuf = "unknown";
-my $dupd = "unknown";
-my $dins = "unknown";
-my $darch = shift || undef;
-my $dnover = "false";
-my $drmdot = "false";
+my $pbos = {
+    'name' => undef,
+    'version' => undef,
+    'arch' => undef,
+    'family' => "unknown",
+    'suffix' => "unknown",
+    'update' => "unknown",
+    'install' => "unknown",
+    'type' => "unknown",
+    'os' => "unknown",
+    'nover' => "false",
+    'rmdot' => "false",
+    };
+$pbos->{'name'} = shift;
+$pbos->{'version'} = shift;
+$pbos->{'arch'} = shift;
 
 # Adds conf file for distribution description
@@ -113 +116 @@
 
 # If we don't know which distribution we're on, then guess it
-($ddir,$dver) = pb_distro_get() if ((not defined $ddir) || (not defined $dver));
+($pbos->{'name'},$pbos->{'version'}) = pb_distro_get() if ((not defined $pbos->{'name'}) || (not defined $pbos->{'version'}));
 
 # For some rare cases, typically nover ones
-$ddir = "unknown" if (not defined $ddir);
-$dver = "unknown" if (not defined $dver);
+$pbos->{'name'} = "unknown" if (not defined $pbos->{'name'});
+$pbos->{'version'} = "unknown" if (not defined $pbos->{'version'});
 
 # Initialize arch
-$darch=pb_get_arch() if (not defined $darch);
-
-my ($osfamily,$ostype,$osupd,$osins,$ossuffix,$osnover,$osremovedotinver,$os) = pb_conf_get("osfamily","ostype","osupd","osins","ossuffix","osnover","osremovedotinver","os");
+$pbos->{'arch'} = pb_get_arch() if (not defined $pbos->{'arch'});
 
 # Dig into the tuple to find the best answer
-$dfam = pb_distro_get_param($ddir,$dver,$darch,$osfamily);
-$dtype = pb_distro_get_param($ddir,$dver,$darch,$ostype,$dfam);
-$dos = pb_distro_get_param($ddir,$dver,$darch,$os,$dfam,$dtype);
-$dupd = pb_distro_get_param($ddir,$dver,$darch,$osupd,$dfam,$dtype,$dos);
-$dins = pb_distro_get_param($ddir,$dver,$darch,$osins,$dfam,$dtype,$dos);
-$dsuf = pb_distro_get_param($ddir,$dver,$darch,$ossuffix,$dfam,$dtype,$dos);
-$dnover = pb_distro_get_param($ddir,$dver,$darch,$osnover,$dfam,$dtype,$dos);
-$drmdot = pb_distro_get_param($ddir,$dver,$darch,$osremovedotinver,$dfam,$dtype,$dos);
+# Do NOT factorize here, as it won't work as of now for hash creation
+$pbos->{'family'} = pb_distro_get_param($pbos,pb_conf_get("osfamily"));
+$pbos->{'type'} = pb_distro_get_param($pbos,pb_conf_get("ostype"));
+($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd"));
+#($pbos->{'family'},$pbos->{'type'},$pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("osfamily","ostype","os","osins","ossuffix","osnover","osremovedotinver","osupd"));
 
 # Some OS have no interesting version
-$dver = "nover" if ($dnover eq "true");
+$pbos->{'version'} = "nover" if ((defined $pbos->{'nover'}) && ($pbos->{'nover'} eq "true"));
 
 # For some OS remove the . in version name for extension
-my $dver2 = $dver;
-$dver2 =~ s/\.//g if ($drmdot eq "true");
-
-if ((not defined $dsuf) || ($dsuf eq "")) {
-    # By default suffix is a concatenation of .ddir and dver
-    $dsuf = ".$ddir$dver2" 
+my $dver2 = $pbos->{'version'};
+$dver2 =~ s/\.//g if ((defined $pbos->{'rmdot'}) && ($pbos->{'rmdot'} eq "true"));
+
+if ((not defined $pbos->{'suffix'}) || ($pbos->{'suffix'} eq "")) {
+    # By default suffix is a concatenation of name and version
+    $pbos->{'suffix'} = ".$pbos->{'name'}$dver2" 
 } else {
     # concat just the version to what has been found
-    $dsuf = ".$dsuf$dver2";
+    $pbos->{'suffix'} = ".$pbos->{'suffix'}$dver2";
 }
 
@@ -152 +150 @@
 #   $opt="--exclude=*.i?86";
 #   }
-pb_log(2,"DEBUG: pb_distro_init: $ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $dins, $darch\n");
-
-return($ddir, $dver, $dfam, $dtype, $dos, $dsuf, $dupd, $dins, $darch);
+pb_log(2,"DEBUG: pb_distro_init: ".Dumper($pbos)."\n");
+
+return($pbos);
 }
 
@@ -276 +274 @@
         $l =~ s/LSB_VERSION=/LSB Version:\t/;
     }
-    $c =~ s/^[A-z ]*:[\t ]*// if (defined $s);
-    $r =~ s/^[A-z ]*:[\t ]*// if (defined $s);
-    $d =~ s/^[A-z ]*:[\t ]*// if (defined $s);
-    $i =~ s/^[A-z ]*:[\t ]*// if (defined $s);
-    $l =~ s/^[A-z ]*:[\t ]*// if (defined $s);
+    my $regexp = "^[A-z ]*:[\t ]*";
+    $c =~ s/$regexp// if (defined $s);
+    $r =~ s/$regexp// if (defined $s);
+    $d =~ s/$regexp// if (defined $s);
+    $i =~ s/$regexp// if (defined $s);
+    $l =~ s/$regexp// if (defined $s);
     return($l, $i, $d, $r, $c);
 } else {
@@ -290 +289 @@
 =item B<pb_distro_installdeps>
 
-This function install the dependencies required to build the package on an RPM based distro
-dependencies can be passed as a parameter in which case they are not computed
+This function install the dependencies required to build the package on a distro.
+Dependencies can be passed as a parameter in which case they are not computed
 
 =cut
@@ -299 +298 @@
 # SPEC file
 my $f = shift || undef;
-my $dtype = shift || undef;
-my $dupd = shift || undef;
+my $pbos = shift;
 my $deps = shift || undef;
 
 # Protection
-return if (not defined $dupd);
-
-# Get dependecies in the build file if not forced
-$deps = pb_distro_getdeps($f, $dtype) if (not defined $deps);
+return if (not defined $pbos->{'update'});
+
+# Get dependencies in the build file if not forced
+$deps = pb_distro_getdeps($f, $pbos) if (not defined $deps);
 pb_log(2,"deps: $deps\n");
 return if ((not defined $deps) || ($deps =~ /^\s*$/));
 if ($deps !~ /^[    ]*$/) {
     # This may not be // proof. We should test for availability of repo and sleep if not
-    pb_system("$dupd $deps","Installing dependencies ($deps)");
+    pb_system("$pbos->{'update'} $deps","Installing dependencies ($deps)");
     }
 }
@@ -325 +323 @@
 
 my $f = shift || undef;
-my $dtype = shift || undef;
+my $pbos = shift;
 
 my $regexp = "";
@@ -332 +330 @@
 
 # Protection
-return("") if (not defined $dtype);
+return("") if (not defined $pbos->{'type'});
 return("") if (not defined $f);
 
-pb_log(3,"entering pb_distro_getdeps: $dtype - $f\n");
-if ($dtype eq  "rpm") {
+pb_log(3,"entering pb_distro_getdeps: $pbos->{'type'} - $f\n");
+if ($pbos->{'type'} eq  "rpm") {
     # In RPM this could include files, but we do not handle them atm.
     $regexp = '^BuildRequires:(.*)$';
-} elsif ($dtype eq "deb") {
+} elsif ($pbos->{'type'} eq "deb") {
     $regexp = '^Build-Depends:(.*)$';
-} elsif ($dtype eq "ebuild") {
+} elsif ($pbos->{'type'} eq "ebuild") {
     $sep = '"'.$/;
     $regexp = '^DEPEND="(.*)"\n'
@@ -377 +375 @@
 $/ = $oldsep;
 pb_log(2,"now deps: $deps\n");
-my $deps2 = pb_distro_only_deps_needed($dtype,$deps);
+my $deps2 = pb_distro_only_deps_needed($pbos,$deps);
 return($deps2);
 }
@@ -390 +388 @@
 sub pb_distro_only_deps_needed {
 
-my $dtype = shift || undef;
+my $pbos = shift;
 my $deps = shift || undef;
 
@@ -397 +395 @@
 # Avoid to install what is already there
 foreach my $p (split(/ /,$deps)) {
-    if ($dtype eq  "rpm") {
+    if ($pbos->{'type'} eq  "rpm") {
         my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet");
         next if ($res eq 0);
-    } elsif ($dtype eq "deb") {
+    } elsif ($pbos->{'type'} eq "deb") {
         my $res = pb_system("dpkg -L $p","","quiet");
         next if ($res eq 0);
-    } elsif ($dtype eq "ebuild") {
+    } elsif ($pbos->{'type'} eq "ebuild") {
     } else {
         # Not reached
@@ -424 +422 @@
 sub pb_distro_setuposrepo {
 
-my $ddir = shift || undef;
-my $dver = shift;
-my $darch = shift;
-my $dtype = shift || undef;
-my $dfam = shift || undef;
-my $dos = shift || undef;
-
-pb_distro_setuprepo_gen($ddir,$dver,$darch,$dtype,$dfam,$dos,pb_distro_conffile(),"osrepo");
+my $pbos = shift;
+
+pb_distro_setuprepo_gen($pbos,pb_distro_conffile(),"osrepo");
 }
 
@@ -442 +435 @@
 sub pb_distro_setuprepo {
 
-my $ddir = shift || undef;
-my $dver = shift;
-my $darch = shift;
-my $dtype = shift || undef;
-my $dfam = shift || undef;
-my $dos = shift || undef;
-
-pb_distro_setuprepo_gen($ddir,$dver,$darch,$dtype,$dfam,$dos,"$ENV{'PBDESTDIR'}/pbrc","addrepo");
+my $pbos = shift;
+
+pb_distro_setuprepo_gen($pbos,"$ENV{'PBDESTDIR'}/pbrc","addrepo");
 }
 
@@ -460 +448 @@
 sub pb_distro_setuprepo_gen {
 
-my $ddir = shift || undef;
-my $dver = shift;
-my $darch = shift;
-my $dtype = shift || undef;
-my $dfam = shift || undef;
-my $dos = shift || undef;
+my $pbos = shift;
 my $pbconf = shift || undef;
 my $pbkey = shift || undef;
@@ -474 +457 @@
 return if (not defined $addrepo);
 
-my $param = pb_distro_get_param($ddir,$dver,$darch,$addrepo,$dfam,$dtype,$dos);
+my $param = pb_distro_get_param($pbos,$addrepo);
 return if ($param eq "");
 
@@ -491 +474 @@
 
     # The repo file can be a real file or a package
-    if ($dtype eq "rpm") {
+    if ($pbos->{'type'} eq "rpm") {
         if ($bn =~ /\.rpm$/) {
             my $pn = $bn;
@@ -508 +491 @@
             pb_log(0,"Unable to deal with repository file $i on rpm distro ! Please report to dev team\n");
         }
-    } elsif ($dtype eq "deb") {
+    } elsif ($pbos->{'type'} eq "deb") {
         if (($bn =~ /\.sources.list$/) && (not -f "/etc/apt/sources.list.d/$bn")) {
             pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/apt/sources.list.d","Adding apt repository");
@@ -530 +513 @@
 sub pb_distro_get_param {
 
-my $param = "";
-my $ddir = shift;
-my $dver = shift;
-my $darch = shift;
-my $opt = shift;
-my $dfam = shift || "unknown";
-my $dtype = shift || "unknown";
-my $dos = shift || "unknown";
-
-pb_log(2,"DEBUG: pb_distro_get_param on $ddir-$dver-$darch for ".Dumper($opt)."\n");
-if (defined $opt->{"$ddir-$dver-$darch"}) {
-    $param = $opt->{"$ddir-$dver-$darch"};
-} elsif (defined $opt->{"$ddir-$dver"}) {
-    $param = $opt->{"$ddir-$dver"};
-} elsif (defined $opt->{"$ddir"}) {
-    $param = $opt->{"$ddir"};
-} elsif (defined $opt->{$dfam}) {
-    $param = $opt->{$dfam};
-} elsif (defined $opt->{$dtype}) {
-    $param = $opt->{$dtype};
-} elsif (defined $opt->{$dos}) {
-    $param = $opt->{$dos};
-} elsif (defined $opt->{"default"}) {
-    $param = $opt->{"default"};
+my @param;
+my $param;
+my $pbos = shift;
+
+pb_log(2,"DEBUG: pb_distro_get_param on $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} for ".Dumper(@_)."\n");
+foreach my $opt (@_) {
+    if (defined $opt->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) {
+        $param = $opt->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"};
+    } elsif (defined $opt->{"$pbos->{'name'}-$pbos->{'version'}"}) {
+        $param = $opt->{"$pbos->{'name'}-$pbos->{'version'}"};
+    } elsif (defined $opt->{"$pbos->{'name'}"}) {
+        $param = $opt->{"$pbos->{'name'}"};
+    } elsif (defined $opt->{$pbos->{'family'}}) {
+        $param = $opt->{$pbos->{'family'}};
+    } elsif (defined $opt->{$pbos->{'type'}}) {
+        $param = $opt->{$pbos->{'type'}};
+    } elsif (defined $opt->{$pbos->{'os'}}) {
+        $param = $opt->{$pbos->{'os'}};
+    } elsif (defined $opt->{"default"}) {
+        $param = $opt->{"default"};
+    } else {
+        $param = "";
+    }
+
+    # Allow replacement of variables inside the parameter such as name, version, arch for rpmbootstrap 
+    # but not shell variable which are backslashed
+    if ($param =~ /[^\\]\$/) {
+        pb_log(3,"Expanding variable on $param\n");
+        eval { $param =~ s/(\$\w+)/$1/eeg };
+    }
+    push @param,$param;
+}
+
+pb_log(2,"DEBUG: pb_distro_get_param on $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} returns ==".Dumper(@param)."==\n");
+
+# Return one param in scalar context, an array if not.
+my $nb = @param;
+if ($nb eq 1) {
+    return($param);
 } else {
-    $param = "";
-}
-
-# Allow replacement of variables inside the parameter such as ddir, dver, darch for rpmbootstrap 
-# but not shell variable which are backslashed
-if ($param =~ /[^\\]\$/) {
-    pb_log(3,"Expanding variable on $param\n");
-    eval { $param =~ s/(\$\w+)/$1/eeg };
-}
-
-pb_log(2,"DEBUG: pb_distro_get_param on $ddir-$dver-$darch returns ==$param==\n");
-return($param);
-
-}
-
+    return(@param);
+}
+}
+
+=item B<pb_distro_get_context>
+
+This function gets the OS context passed as parameter and return the corresponding distribution hash
+
+=cut
+
+
+sub pb_distro_get_context {
+
+my $os = shift;
+my $pbos;
+
+if (defined $os) {
+    my ($name,$ver,$darch) = split(/-/,$os);
+    pb_log(0,"Bad format for $os") if ((not defined $name) || (not defined $ver) || (not defined $darch)) ;
+    chomp($darch);
+    $pbos = pb_distro_init($name,$ver,$darch);
+} else {
+    $pbos = pb_distro_init();
+}
+return($pbos);
+}
 
 =back 

devel/pb/bin/pb

@@ -842 +842 @@
         # We want to at least build for the underlying distro
         # except if a target was given, in which case we only build for it
-        my ($tdir,$tver,$tarch);
-        ($tdir,$tver,$tarch) = split(/-/,$pbtarget) if (defined ($pbtarget));
-
-        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init($tdir,$tver,$tarch);
-        my $tmpl = "$ddir-$dver-$arch,";
+        my $pbos = pb_distro_get_context($pbtarget);
+        my $tmpl = "$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'},";
 
         # Get list of distributions for which we need to generate build files if no target
@@ -869 +866 @@
         $pb{'pkg'} = $pbpkg;
         $pb{'realpkg'} = $pbpkg;
+        $pb{'suf'} = $pbos->{'suffix'};
         $pb{'date'} = $pbdate;
         $pb{'defpkgdir'} = $defpkgdir;
@@ -895 +893 @@
             $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
 
-            foreach my $d (keys %virt) {
+            foreach my $v (keys %virt) {
                 $pm->start and next if (defined $pbparallel);
-                my ($name,$ver,$arch) = split(/-/,$d);
-                pb_log(0,"Bad format for $d") if ((not defined $name) || (not defined $ver) || (not defined $arch)) ;
-                chomp($arch);
-                my ($ddir, $dver, $dfam);
-                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'os'}, $pb{'suf'}, $pb{'upd'}, $pb{'arch'}) = pb_distro_init($name,$ver,$arch);
-                pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'})."\n");
+
+                # Distro context
+                my $pbos = pb_distro_get_context($v);
                 pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
     
                 # We need to compute the real name of the package
-                my $pbrealpkg = pb_cms_get_real_pkg($pbpkg,$pb{'dtype'});
+                my $pbrealpkg = pb_cms_get_real_pkg($pbpkg,$pbos->{'type'});
                 $pb{'realpkg'} = $pbrealpkg;
-                pb_log(1,"Virtual package $pbpkg has a real package name of $pbrealpkg on $ddir-$dver\n") if ($pbrealpkg ne $pbpkg);
+                pb_log(1,"Virtual package $pbpkg has a real package name of $pbrealpkg on $pbos->{'name'}-$pbos->{'version'}\n") if ($pbrealpkg ne $pbpkg);
     
                 # Filter build files from the less precise up to the most with overloading
@@ -917 +912 @@
                 my %bfiles = ();
                 my %pkgfiles = ();
-                $build{"$ddir-$dver-$arch"} = "yes";
+                $build{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} = "yes";
     
-                if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pb{'dtype'}") {
-                    pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pb{'dtype'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$dfam") {
-                    pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$dfam",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$ddir") {
-                    pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$ddir",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$ddir-$dver") {
-                    pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$ddir-$dver",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$ddir-$dver-$arch") {
-                    pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$ddir-$dver-$arch",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+                if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'type'}") {
+                    pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'type'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'family'}") {
+                    pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'family'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}") {
+                    pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}-$pbos->{'version'}") {
+                    pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}-$pbos->{'version'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}") {
+                    pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
                 } else {
-                    $build{"$ddir-$dver-$arch"} = "no";
+                    $build{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} = "no";
                     next;
                 }
@@ -936 +931 @@
     
                 # Get all filters to apply
-                my $ptr = pb_get_filters($pbpkg, $pb{'dtype'}, $dfam, $ddir, $dver);
+                my $ptr = pb_get_filters($pbpkg,$pbos);
     
                 # Apply now all the filters on all the files concerned
@@ -942 +937 @@
                 if (defined $ptr) {
                     # For patch support
-                    $pb{'tuple'} = "$ddir-$dver-$arch";
+                    $pb{'tuple'} = "$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
                     foreach my $f (values %bfiles,values %pkgfiles) {
-                        pb_filter_file("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver-$arch/".basename($f),\%pb);
+                        pb_filter_file("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/".basename($f),\%pb);
                     }
                 }
-                pb_list_sfiles("$ENV{'PBROOTDIR'}/$pbpkg/pbpatch", \%patches, $pb{'dtype'}, $dfam, $ddir, $dver, $arch, "$ENV{'PBROOTDIR'}/$pbpkg/pbextpatch");
-                pb_list_sfiles("$ENV{'PBROOTDIR'}/$pbpkg/pbsrc", \%sources, $pb{'dtype'}, $dfam, $ddir, $dver, $arch, "$ENV{'PBROOTDIR'}/$pbpkg/pbextsrc");
+                pb_list_sfiles("$ENV{'PBROOTDIR'}/$pbpkg/pbpatch", \%patches, $pbos, "$ENV{'PBROOTDIR'}/$pbpkg/pbextpatch");
+                pb_list_sfiles("$ENV{'PBROOTDIR'}/$pbpkg/pbsrc", \%sources, $pbos, "$ENV{'PBROOTDIR'}/$pbpkg/pbextsrc");
 
                 $pm->finish if (defined $pbparallel);
@@ -1102 +1097 @@
 sub pb_test2pkg {
     # Get the running distro to test on
-    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init();
-    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $arch))."\n");
+    my $pbos = pb_distro_get_context();
 
     # Get list of packages to test
@@ -1111 +1105 @@
 
     # Additional potential repo
-    pb_distro_setuprepo($ddir,$dver,$arch,$dtype,$dfam,$dos);
+    pb_distro_setuprepo($pbos);
     foreach my $pbpkg (@pkgs) {
         # We need to install the package to test, and deps brought with it
-        pb_distro_installdeps(undef,$dtype,$pbins,$pbpkg);
+        pb_distro_installdeps(undef,$pbos,$pbpkg);
         pb_system("$ENV{'PBDESTDIR'}/pbtest","Launching test for $pbpkg","verbose");
     }
@@ -1122 +1116 @@
 
     # Get the running distro to build on
-    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init();
-    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $arch))."\n");
+    my $pbos = pb_distro_get_context();
 
     # If needed we may add repository to the build env
-    pb_distro_setuprepo($ddir,$dver,$arch,$dtype,$dfam,$dos);
+    pb_distro_setuprepo($pbos);
 
     # Get list of packages to build
@@ -1158 +1151 @@
 
         pb_log(2,"Working directory: $ENV{'PBBUILDDIR'}\n");
-        if ($dtype eq "rpm") {
+        if ($pbos->{'type'} eq "rpm") {
             foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
                 if (! -d "$ENV{'PBBUILDDIR'}/$d") {
@@ -1169 +1162 @@
             symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
             # We need to first extract the spec file
-            my @specfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver-$arch/","$ENV{'PBBUILDDIR'}/SPECS","spec");
+            my @specfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBBUILDDIR'}/SPECS","spec");
 
             # We need to handle potential patches to upstream sources
-            pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver-$arch/pbpatch/","$ENV{'PBBUILDDIR'}/SOURCES","patch");
+            pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbpatch/","$ENV{'PBBUILDDIR'}/SOURCES","patch");
 
             pb_log(2,"specfile: ".Dumper(\@specfile)."\n");
@@ -1179 +1172 @@
             # Older Redhat use _target_platform in %configure incorrectly
             my $specialdef = "";
-            if (($ddir eq "redhat") || (($ddir eq "rhel") && ($dver eq "2.1"))) {
+            if (($pbos->{'name'} eq "redhat") || (($pbos->{'name'} eq "rhel") && ($pbos->{'version'} eq "2.1"))) {
                 $specialdef = "--define \'_target_platform \"\"\'";
             }
@@ -1186 +1179 @@
                 if ($f =~ /\.spec$/) {
                     # This could cause an issue in // mode
-                    pb_distro_installdeps($f,$dtype,$pbins);
+                    pb_distro_installdeps($f,$pbos);
                     pb_system("rpmbuild $specialdef --define \"packager $ENV{'PBPACKAGER'}\" --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}","verbose");
                     last;
@@ -1201 +1194 @@
             close(LOG);
 
-        } elsif ($dtype eq "deb") {
+        } elsif ($pbos->{'type'} eq "deb") {
             chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
             pb_system("tar xfz $src","Extracting sources");
@@ -1208 +1201 @@
             chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
             pb_rm_rf("debian");
-            symlink "pbconf/$ddir-$dver-$arch","debian" || die "Unable to symlink to pbconf/$ddir-$dver-$arch";
+            symlink "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}","debian" || die "Unable to symlink to pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
             chmod 0755,"debian/rules";
 
-            pb_distro_installdeps("debian/control",$dtype,$pbins);
+            pb_distro_installdeps("debian/control",$pbos);
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
             # Get the name of the generated packages
@@ -1223 +1216 @@
             }
             close(LOG);
-        } elsif ($dtype eq "ebuild") {
+        } elsif ($pbos->{'type'} eq "ebuild") {
             my @ebuildfile;
             # For gentoo we need to take pb as subsystem name
@@ -1233 +1226 @@
 
             # We need to first extract the ebuild file 
-            @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver-$arch/","$tmpd","ebuild");
+            @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$tmpd","ebuild");
 
             # Prepare the build env for gentoo
@@ -1264 +1257 @@
             foreach my $f (@ebuildfile) {
                 if ($f =~ /\.ebuild$/) {
-                    pb_distro_installdeps($f,$dtype,$pbins);
+                    pb_distro_installdeps($f,$pbos);
                     move($f,"$tmpd/$pbpkg-$pbver.ebuild");
                     pb_system("cd $tmpd ; ebuild $pbpkg-$pbver.ebuild clean ; ebuild $pbpkg-$pbver.ebuild digest ; ebuild $pbpkg-$pbver.ebuild package","verbose");
@@ -1282 +1275 @@
             }
 
-        } elsif ($dtype eq "tgz") {
+        } elsif ($pbos->{'type'} eq "tgz") {
             # Slackware family
             $made="$made $pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";
@@ -1290 +1283 @@
             pb_system("tar xfz $src2","Extracting pbconf");
             chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
-            symlink "pbconf/$ddir-$dver-$arch","install" || die "Unable to symlink to pbconf/$ddir-$dver-$arch";
+            symlink "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}","install" || die "Unable to symlink to pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
             if (-x "install/pbslack") {
-                pb_distro_installdeps("./install/pbslack",$dtype,$pbins);
+                pb_distro_installdeps("./install/pbslack",$pbos);
                 pb_system("./install/pbslack","Building software");
                 pb_system("sudo /sbin/makepkg -p -l y -c y $pbpkg","Packaging $pbpkg","verbose");
             }
-        } elsif ($dtype eq "pkg") {
+        } elsif ($pbos->{'type'} eq "pkg") {
             # Solaris
             $made="$made $pbpkg-$pbver-$pbtag.pkg.gz";
@@ -1303 +1296 @@
             chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
             # Will host resulting packages
-            pb_mkdir_p("$dtype");
+            pb_mkdir_p("$pbos->{'type'}");
             pb_mkdir_p("$pkgdestdir/delivery");
             pb_system("tar xfz $src","Extracting sources under $ENV{'PBBUILDDIR'}");
             pb_system("tar xfz $src2","Extracting pbconf under $ENV{'PBBUILDDIR'}");
             chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
-            if (-f "pbconf/$ddir-$dver-$arch/pbbuild") {
-                chmod 0755,"pbconf/$ddir-$dver-$arch/pbbuild";
+            if (-f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbbuild") {
+                chmod 0755,"pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbbuild";
                 # pkginfo file is mandatory
-                die "Unable to find pkginfo file in pbconf/$ddir-$dver-$arch" if (! -f "pbconf/$ddir-$dver-$arch/pkginfo");
+                die "Unable to find pkginfo file in pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}" if (! -f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pkginfo");
                 # Build
-                pb_system("pbconf/$ddir-$dver-$arch/pbbuild $pkgdestdir/delivery","Building software and installing under $pkgdestdir/delivery");
+                pb_system("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbbuild $pkgdestdir/delivery","Building software and installing under $pkgdestdir/delivery");
                 # Copy complementary files
-                if (-f "pbconf/$ddir-$dver-$arch/prototype") {
-                    copy("pbconf/$ddir-$dver-$arch/prototype", $pkgdestdir) 
+                if (-f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/prototype") {
+                    copy("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/prototype", $pkgdestdir) 
                 } else {
                     # No prototype provided, calculating it
                     open(PROTO,"> $pkgdestdir/prototype") || die "Unable to create prototype file";
                     print PROTO "i pkginfo\n";
-                    print PROTO "i depend\n" if (-f "pbconf/$ddir-$dver-$arch/depend");
+                    print PROTO "i depend\n" if (-f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/depend");
                     $ENV{'PBSOLDESTDIR'} = "$pkgdestdir/delivery";
                     find(\&create_solaris_prototype, "$pkgdestdir/delivery");
                 }
-                copy("pbconf/$ddir-$dver-$arch/depend", $pkgdestdir) if (-f "pbconf/$ddir-$dver-$arch/depend");
-                copy("pbconf/$ddir-$dver-$arch/pkginfo", $pkgdestdir);
-                pb_system("cd $pkgdestdir/delivery ; pkgmk -o -f ../prototype -r $pkgdestdir/delivery -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
-                pb_system("cd $ENV{'PBBUILDDIR'}/$dtype ;  echo \"\" | pkgtrans -o -n -s $ENV{'PBBUILDDIR'}/$dtype $ENV{'PBBUILDDIR'}/$pbpkg-$pbver-$pbtag.pkg all","Transforming $pbpkg","verbose");
+                copy("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/depend", $pkgdestdir) if (-f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/depend");
+                copy("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pkginfo", $pkgdestdir);
+                pb_system("cd $pkgdestdir/delivery ; pkgmk -o -f ../prototype -r $pkgdestdir/delivery -d $ENV{'PBBUILDDIR'}/$pbos->{'type'}","Packaging $pbpkg","verbose");
+                pb_system("cd $ENV{'PBBUILDDIR'}/$pbos->{'type'} ;  echo \"\" | pkgtrans -o -n -s $ENV{'PBBUILDDIR'}/$pbos->{'type'} $ENV{'PBBUILDDIR'}/$pbpkg-$pbver-$pbtag.pkg all","Transforming $pbpkg","verbose");
                 pb_system("cd $ENV{'PBBUILDDIR'} ;  gzip -9f $pbpkg-$pbver-$pbtag.pkg","Compressing $pbpkg-$pbver-$pbtag.pkg","verbose");
             } else {
-                pb_log(0,"No pbconf/$ddir-$dver-$arch/pbbuild file found for $pbpkg-$pbver in \n");
+                pb_log(0,"No pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbbuild file found for $pbpkg-$pbver in \n");
             }
             chdir ".." || die "Unable to chdir to parent dir";
-            pb_system("rm -rf $pbpkg-$pbver $ENV{'PBBUILDDIR'}/$dtype $pkgdestdir", "Cleanup");
-        } elsif ($dtype eq "hpux") {
+            pb_system("rm -rf $pbpkg-$pbver $ENV{'PBBUILDDIR'}/$pbos->{'type'} $pkgdestdir", "Cleanup");
+        } elsif ($pbos->{'type'} eq "hpux") {
             # HP-UX
             chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
@@ -1357 +1350 @@
             pb_system("rm -rf $pbpkg-$pbver", "Cleanup");
         } else {
-            die "Unknown dtype format $dtype";
+            die "Unknown OS type format $pbos->{'type'}";
         }
         if (defined $pbparallel) {
@@ -1375 +1368 @@
 
     # Find the appropriate check cmd/opts
-    my ($oschkcmd,$oschkopt) = pb_conf_get_if("oschkcmd","oschkopt");
-    my $chkcmd .= pb_distro_get_param($ddir,$dver,$arch,$oschkcmd,$dtype,$dfam,$dos);
-    my $chkopt .= pb_distro_get_param($ddir,$dver,$arch,$oschkopt,$dtype,$dfam,$dos);
+    my ($chkcmd,$chkopt) = pb_distro_get_param($pbos,pb_conf_get_if("oschkcmd","oschkopt"));
 
     # Packages check if needed
-    if ($dtype eq "rpm") {
-        if (-x $chkcmd) {
-            pb_system("$chkcmd $chkopt $made","Checking validity of rpms with $chkcmd","verbose");
+    if ($pbos->{'type'} eq "rpm") {
+        if ((defined  $chkcmd) && (-x $chkcmd)) {
+            my $cmd = "$chkcmd";
+            $cmd .= " $chkopt" if (defined $chkopt);
+            $cmd .= " $made";
+            pb_system("$cmd","Checking validity of rpms with $chkcmd","verbose");
         }
         my $rpms ="";
@@ -1392 +1386 @@
         pb_log(0,"SRPM packages generated: $srpms\n");
         pb_log(0,"RPM packages generated: $rpms\n");
-    } elsif ($dtype eq "deb") {
+    } elsif ($pbos->{'type'} eq "deb") {
         my $made2 = "";
         foreach my $f (split(/ /,$made)) {
@@ -1403 +1397 @@
         }
     } else {
-        pb_log(0,"No check done for $dtype yet\n");
+        pb_log(0,"No check done for $pbos->{'type'} yet\n");
         pb_log(0,"Packages generated: $made\n");
     }
@@ -1490 +1484 @@
     my $cmd = "";
     my $src = "";
-    my ($odir,$over,$oarch) = (undef, undef, undef);
-    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $darch);
+    my $pbos;
 
     if ($cmt ne "Announce") {
@@ -1499 +1492 @@
 
         # Get the running distro to consider
-        if (defined $v) {
-            ($odir,$over,$oarch) = split(/-/,$v);
-        }
-        ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $darch) = pb_distro_init($odir,$over,$oarch);
-        pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $darch))."\n");
+        $pbos = pb_distro_get_context($v);
 
         # Get list of packages to build
@@ -1571 +1560 @@
     if ($cmt =~ /^RM/) {
         # In that case our real host is in the rmhost with the OS as key, not project as above
-        $sshmachine = pb_distro_get_param($ddir,$dver,$darch,$sshhost,$dfam,$dtype,$dos);
+        $sshmachine = pb_distro_get_param($pbos,$sshhost);
     }
     pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vepath,$rbsconf))."\n");
@@ -1602 +1591 @@
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}";
     } elsif ($cmt eq "Packages") {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch";
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
 
         my $repodir = $tdir;
@@ -1611 +1600 @@
         # Repository management
         open(PBS,"> $ENV{'PBBUILDDIR'}/pbscript") || die "Unable to create $ENV{'PBBUILDDIR'}/pbscript";
-        if ($dtype eq "rpm") {
+        if ($pbos->{'type'} eq "rpm") {
             # Also make a pbscript to generate yum/urpmi bases
             print PBS << "EOF";
@@ -1618 +1607 @@
 cat > $ENV{'PBPROJ'}.repo << EOT
 [$ENV{'PBPROJ'}]
-name=$ddir $dver $darch - $ENV{'PBPROJ'} Vanilla Packages
+name=$pbos->{'name'} $pbos->{'version'} $pbos->{'arch'} - $ENV{'PBPROJ'} Vanilla Packages
 baseurl=$pbrepo->{$ENV{'PBPROJ'}}/$repodir
 enabled=1
@@ -1634 +1623 @@
 createrepo .
 EOF
-            if ($dfam eq "md") {
+            if ($pbos->{'family'} eq "md") {
                 # For Mandriva add urpmi management
                 print PBS << "EOF";
@@ -1652 +1641 @@
 EOF
             }
-            if ($ddir eq "fedora") {
+            if ($pbos->{'name'} eq "fedora") {
                 # Extract the spec file to please Fedora maintainers :-(
                 print PBS << "EOF";
@@ -1663 +1652 @@
 EOF
             }
-            if ($dfam eq "novell") {
+            if ($pbos->{'family'} eq "novell") {
                 # Add ymp scripts for one-click install on SuSE
                 print PBS << "EOF";
@@ -1712 +1701 @@
 EOF
             }
-        } elsif ($dtype eq "deb") {
+        } elsif ($pbos->{'type'} eq "deb") {
             # Also make a pbscript to generate apt bases
             # Cf: http://www.debian.org/doc/manuals/repository-howto/repository-howto.fr.html
@@ -1723 +1712 @@
 # Prepare a script to ease apt setup
 cat > $ENV{'PBPROJ'}.sources.list << EOT
-deb $rpd $dver contrib
-deb-src $rpd $dver contrib
+deb $rpd $pbos->{'version'} contrib
+deb-src $rpd $pbos->{'version'} contrib
 EOT
 chmod 644 $ENV{'PBPROJ'}.sources.list
@@ -1730 +1719 @@
 # Up two levels to deal with the dist dir cross versions
 cd ../..
-mkdir -p dists/$dver/contrib/binary-$darch dists/$dver/contrib/source
+mkdir -p dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'} dists/$pbos->{'version'}/contrib/source
 
 # Prepare a script to create apt info file
@@ -1742 +1731 @@
 EOT
 
-echo "Creating Packages metadata ($darch)"
-dpkg-scanpackages -a$darch $dver/$darch /dev/null | gzip -c9 > dists/$dver/contrib/binary-$darch/Packages.gz
-dpkg-scanpackages -a$darch $dver/$darch /dev/null | bzip2 -c9 > dists/$dver/contrib/binary-$darch/Packages.bz2
-echo "Creating Contents metadata ($darch)"
-apt-ftparchive contents $dver | gzip -c9 > dists/$dver/Contents-$darch.gz
-echo "Creating Release metadata ($darch)"
-cat \$TMPD/Release > dists/$dver/contrib/binary-$darch/Release
-echo "Architecture: $darch" >> dists/$dver/contrib/binary-$darch/Release
+echo "Creating Packages metadata ($pbos->{'arch'})"
+dpkg-scanpackages -a$pbos->{'arch'} $pbos->{'version'}/$pbos->{'arch'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Packages.gz
+dpkg-scanpackages -a$pbos->{'arch'} $pbos->{'version'}/$pbos->{'arch'} /dev/null | bzip2 -c9 > dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Packages.bz2
+echo "Creating Contents metadata ($pbos->{'arch'})"
+apt-ftparchive contents $pbos->{'version'} | gzip -c9 > dists/$pbos->{'version'}/Contents-$pbos->{'arch'}.gz
+echo "Creating Release metadata ($pbos->{'arch'})"
+cat \$TMPD/Release > dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Release
+echo "Architecture: $pbos->{'arch'}" >> dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Release
 echo "Creating Source metadata"
-dpkg-scansources $dver/$darch /dev/null | gzip -c9 > dists/$dver/contrib/source/Sources.gz
-cat \$TMPD/Release > dists/$dver/contrib/source/Release
-echo "Architecture: Source" >> dists/$dver/contrib/source/Release
+dpkg-scansources $pbos->{'version'}/$pbos->{'arch'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/source/Sources.gz
+cat \$TMPD/Release > dists/$pbos->{'version'}/contrib/source/Release
+echo "Architecture: Source" >> dists/$pbos->{'version'}/contrib/source/Release
 echo "Creating Release metadata"
-apt-ftparchive release dists/$dver > dists/$dver/Release
+apt-ftparchive release dists/$pbos->{'version'} > dists/$pbos->{'version'}/Release
 rm -rf \$TMPD
 EOF
-        } elsif ($dtype eq "ebuild") {
+        } elsif ($pbos->{'type'} eq "ebuild") {
             # make a pbscript to generate links to latest version
             print PBS << "EOF";
@@ -1793 +1782 @@
     # should use a hash instead...
     my ($shcmd,$cpcmd,$cptarget,$cp2target);
+    my ($odir,$over,$oarch);
     if ($cmt !~ /^VE/) {
         my $keyfile = pb_ssh_get(0);
@@ -1884 +1874 @@
                 my $j = basename($p);
                 pb_system("$cpcmd $cp2target/$delim$p$delim $ENV{'PBBUILDDIR'}/$odir/$over/$oarch 2> /dev/null","Recovery of package $j in $ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
-                $made="$made $odir/$over/$oarch/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
+                $made="$made $odir/$over/$oarch/$j"; # if (($pbos->{'type'} ne "rpm") || ($j !~ /.src.rpm$/));
             }
             print KEEP "$made\n";
@@ -1891 +1881 @@
 
             # Sign packages locally
-            if ($dtype eq "rpm") {
+            if ($pbos->{'type'} eq "rpm") {
                 #pb_system("rpm --addsign --define \"_signature gpg\" --define \"_gpg_name $ENV{'PBPACKAGER'}\" --define \"__gpg_sign_cmd /usr/bin/gpg --batch --no-verbose --no-armor --no-tty --no-secmem-warning -sbo %{__signature_filename} %{__plaintext_filename} --use-agent\" $made","Signing RPM packages packages");
-            } elsif ($dtype eq "deb") {
+            } elsif ($pbos->{'type'} eq "deb") {
                 #pb_system("debsign $made","Signing DEB packages");
             } else {
-                pb_log(0,"I don't know yet how to sign packages for type $dtype.\nPlease give feedback to dev team\n");
+                pb_log(0,"I don't know yet how to sign packages for type $pbos->{'type'}.\nPlease give feedback to dev team\n");
             }
 
@@ -1939 +1929 @@
         my $hpath = "/sbin";
         # Solaris doesn't support -h and has halt elsewhere
-        if ($dtype eq "pkg") {
+        if ($pbos->{'type'} eq "pkg") {
             $hoption = "" ;
             $hpath = "/usr/sbin";
@@ -2150 +2140 @@
         # VE here
         # Get distro context
-        my ($name,$ver,$darch) = split(/-/,$v);
-        chomp($darch);
-        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($name,$ver,$darch);
+        my $pbos = pb_distro_get_context($v);
 
         # Get VE context
@@ -2166 +2154 @@
         if (($vetype eq "chroot") || ($vetype eq "schroot")) {
             # Architecture consistency
-            if ($arch ne $darch) {
-                die "Unable to launch a VE of architecture $darch on a $arch platform" if (($darch eq "x86_64") && ($arch =~ /i?86/));
+            if ($arch ne $pbos->{'arch'}) {
+                die "Unable to launch a VE of architecture $pbos->{'arch'} on a $arch platform" if (($pbos->{'arch'} eq "x86_64") && ($arch =~ /i?86/));
             }
 
@@ -2175 +2163 @@
 
                 # We have to rebuild the chroot
-                if ($dtype eq "rpm") {
+                if ($pbos->{'type'} eq "rpm") {
 
                     # Which tool is used
@@ -2192 +2180 @@
                     }
 
-                    my $postinstall = pb_get_postinstall($ddir,$dver,$darch,$rbspi,$verpmstyle);
+                    my $postinstall = pb_get_postinstall($pbos,$rbspi,$verpmstyle);
                     if ($verpmstyle eq "rinse") {
                         # Need to reshape the mirrors generated with local before-post-install script
                         my $b4post = "--before-post-install ";
-                        my $postparam = pb_distro_get_param($ddir,$dver,$darch,$rbsb4pi);
+                        my $postparam = pb_distro_get_param($pbos,$rbsb4pi);
                         if ($postparam eq "") {
                             $b4post = "";
@@ -2206 +2194 @@
                         my $addpkgs;
                         $postparam = "";
-                        $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep);
+                        $postparam .= pb_distro_get_param($pbos,$osmindep);
                         if ($postparam eq "") {
                             $addpkgs = "";
@@ -2224 +2212 @@
 
                         my $command = pb_check_req("rinse",0);
-                        pb_system("sudo $command --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$rbsconf->{$ENV{'PBPROJ'}}\" $b4post $postinstall $rbsopt $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
+                        pb_system("sudo $command --directory \"$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}\" --arch \"$pbos->{'arch'}\" --distribution \"$pbos->{'name'}-$pbos->{'version'}\" --config \"$rbsconf->{$ENV{'PBPROJ'}}\" $b4post $postinstall $rbsopt $addpkgs $rinseverb","Creating the rinse VE for $pbos->{'name'}-$pbos->{'version'} ($pbos->{'arch'})", "verbose");
                     } elsif ($verpmstyle eq "rpmbootstrap") {
                         my $rbsverb = "";
@@ -2232 +2220 @@
                         my $addpkgs = "";
                         my $postparam = "";
-                        $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep);
+                        $postparam .= pb_distro_get_param($pbos,$osmindep);
                         if ($postparam eq "") {
                             $addpkgs = "";
@@ -2239 +2227 @@
                         }
                         my $command = pb_check_req("rpmbootstrap",0);
-                        pb_system("sudo $command $rbsopt $postinstall $addpkgs $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
+                        pb_system("sudo $command $rbsopt $postinstall $addpkgs $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} $rbsverb","Creating the rpmbootstrap VE for $pbos->{'name'}-$pbos->{'version'} ($pbos->{'arch'})", "verbose");
                     } elsif ($verpmstyle eq "mock") {
                         my ($rbsconf) = pb_conf_get("rbsconf");
                         my $command = pb_check_req("mock",0);
-                        pb_system("sudo $command --init --resultdir=\"/tmp\" --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v $rbsopt","Creating the mock VE for $ddir-$dver ($darch)");
+                        pb_system("sudo $command --init --resultdir=\"/tmp\" --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v $rbsopt","Creating the mock VE for $pbos->{'name'}-$pbos->{'version'} ($pbos->{'arch'})");
                         # Once setup we need to install some packages, the pb account, ...
                         pb_system("sudo $command --install --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
@@ -2249 +2237 @@
                         die "Unknown verpmtype type $verpmstyle. Report to dev team";
                     }
-                } elsif ($dtype eq "deb") {
+                } elsif ($pbos->{'type'} eq "deb") {
                     my $vedebstyle = $vedebtype->{$ENV{'PBPROJ'}};
 
-                    my $codename = pb_distro_get_param($ddir,$dver,$darch,$oscodename);
+                    my $codename = pb_distro_get_param($pbos,$oscodename);
                     my $postparam = "";
                     my $addpkgs;
-                    $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep);
+                    $postparam .= pb_distro_get_param($pbos,$osmindep);
                     if ($postparam eq "") {
                         $addpkgs = "";
@@ -2262 +2250 @@
                     }
                     my $debmir = "";
-                    $debmir .= pb_distro_get_param($ddir,$dver,$darch,$rbsmirrorsrv);
+                    $debmir .= pb_distro_get_param($pbos,$rbsmirrorsrv);
 
                     # Get potential rbs option
@@ -2277 +2265 @@
     
                     # debootstrap works with amd64 not x86_64
-                    my $debarch = $darch;
-                    $debarch = "amd64" if ($darch eq "x86_64");
+                    my $debarch = $pbos->{'arch'};
+                    $debarch = "amd64" if ($pbos->{'arch'} eq "x86_64");
                     if ($vedebstyle eq "debootstrap") {
                         my $dbsverb = "";
@@ -2284 +2272 @@
 
                         # Some perl modules are in Universe on Ubuntu
-                        $rbsopt .= " --components=main,universe" if ($ddir eq "ubuntu");
-
-                        pb_system("sudo /usr/sbin/debootstrap $dbsverb $rbsopt --arch=$debarch $addpkgs $codename \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" $debmir","Creating the debootstrap VE for $ddir-$dver ($darch)", "verbose");
+                        $rbsopt .= " --components=main,universe" if ($pbos->{'name'} eq "ubuntu");
+
+                        pb_system("sudo /usr/sbin/debootstrap $dbsverb $rbsopt --arch=$debarch $addpkgs $codename \"$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}\" $debmir","Creating the debootstrap VE for $pbos->{'name'}-$pbos->{'version'} ($pbos->{'arch'})", "verbose");
                         # debootstrap doesn't create an /etc/hosts file
-                        if (! -f "$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/etc/hosts" ) {
-                            pb_system("sudo cp /etc/hosts $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/etc/hosts");
+                        if (! -f "$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/etc/hosts" ) {
+                            pb_system("sudo cp /etc/hosts $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/etc/hosts");
                         }
                     } else {
                         die "Unknown vedebtype type $vedebstyle. Report to dev team";
                     }
-                } elsif ($dtype eq "ebuild") {
+                } elsif ($pbos->{'type'} eq "ebuild") {
                     die "Please teach the dev team how to build gentoo chroot";
                 } else {
-                    die "Unknown distribution type $dtype. Report to dev team";
+                    die "Unknown distribution type $pbos->{'type'}. Report to dev team";
                 }
             }
             # Fix modes to allow access to the VE for pb user
-            pb_system("sudo chmod 755 $vepath->{$ENV{'PBPROJ'}}/$ddir $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch","Fixing permissions");
+            pb_system("sudo chmod 755 $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'} $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'} $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}","Fixing permissions");
 
             # Test if an existing snapshot exists and use it if appropriate
             # And also use it of no local extracted VE is present
-            if ((-f "$vepath->{$ENV{'PBPROJ'}}/$ddir-$dver-$darch.tar.gz") &&
+            if ((-f "$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz") &&
                 (((defined $vesnap->{$v}) && ($vesnap->{$v} =~ /true/i)) ||
                     ((defined $vesnap->{$ENV{'PBPROJ'}}) && ($vesnap->{$ENV{'PBPROJ'}} =~ /true/i)) ||
                     ($pbsnap eq 1) ||
-                    (! -d "$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch"))) {
-                        pb_system("sudo rm -rf $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch ; sudo mkdir -p $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch ; sudo tar xz  -C $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch -f $vepath->{$ENV{'PBPROJ'}}/$ddir-$dver-$darch.tar.gz","Extracting snapshot of $ddir-$dver-$darch.tar.gz under $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch");
+                    (! -d "$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}"))) {
+                        pb_system("sudo rm -rf $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} ; sudo mkdir -p $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} ; sudo tar xz  -C $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} -f $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz","Extracting snapshot of $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz under $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}");
             }
             # Nothing more to do for VE. No real launch
@@ -2319 +2307 @@
         # RM here
         # Get distro context
-        my ($name,$ver,$darch) = split(/-/,$v);
-        chomp($darch);
-        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($name,$ver,$darch);
+        my $pbos = pb_distro_get_context($v);
 
         # Get RM context
@@ -2679 +2665 @@
 
     # Get distro context
-    my ($name,$ver,$darch) = split(/-/,$v);
-    chomp($darch);
-    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins) = pb_distro_init($name,$ver,$darch);
+    my $pbos = pb_distro_get_context($v);
     
     # Name of the account to deal with for VM/VE/RM
@@ -2800 +2784 @@
 my $home = "/home";
 # Solaris doesn't like that we use /home
-$home = "/export/home" if ($dtype eq "pkg");
+$home = "/export/home" if ($pbos->{'type'} eq "pkg");
 
     print SCRIPT << "EOF";
@@ -2883 +2867 @@
 # pb has to be added to portage group on gentoo
 
-# We need to have that pb_distro_init function
+# We need to have that pb_distro_get_context function
 # Get it from Project-Builder::Distribution
 # And we now need the conf file required for this to work created above
 
-my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $darch) = pb_distro_init(); 
-print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $darch))."\n";
+my $pbos = pb_distro_get_context(); 
+print "distro tuple: ".Dumper($pbos)."\n";
 
 # Adapt sudoers
 # sudo is not default on Solaris and needs to be installed first
 # from http://www.sunfreeware.com/programlistsparc10.html#sudo
-if ($dtype eq "pkg") {
+if ($pbos->{'type'} eq "pkg") {
     $file="/usr/local/etc/sudoers";
 } else {
@@ -2940 +2924 @@
     
 # Suse wants sudoers as 640
-if ((($ddir eq "sles") && (($dver =~ /10/) || ($dver =~ /9/))) || (($ddir eq "opensuse") && ($dver =~ /10.[012]/))) {
+if ((($pbos->{'name'} eq "sles") && (($pbos->{'version'} =~ /10/) || ($pbos->{'version'} =~ /9/))) || (($pbos->{'name'} eq "opensuse") && ($pbos->{'version'} =~ /10.[012]/))) {
     chmod 0640,$file;
 }
 
 # First install all required packages
-pb_system("yum clean all","Cleaning yum env") if (($ddir eq "fedora") || ($ddir eq "asianux") || ($ddir eq "rhel"));
+pb_system("yum clean all","Cleaning yum env") if (($pbos->{'name'} eq "fedora") || ($pbos->{'name'} eq "asianux") || ($pbos->{'name'} eq "rhel"));
 my ($ospkgdep) = pb_conf_get_if("ospkgdep");
     
-my $pkgdep = pb_distro_get_param($ddir,$dver,$darch,$ospkgdep,$dfam,$dtype,$dos);
-pb_distro_installdeps(undef,$dtype,$pbins,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgdep))));
-
-EOF
-    my ($instype) = pb_conf_get("pbinstalltype");
-    my $itype = pb_distro_get_param($ddir,$dver,$darch,$instype,$dfam,$dtype,$dos);
+my $pkgdep = pb_distro_get_param($pbos,$ospkgdep);
+pb_distro_installdeps(undef,$pbos,pb_distro_only_deps_needed($pbos,join(' ',split(/,/,$pkgdep))));
+
+EOF
+    my $itype = pb_distro_get_param($pbos,pb_conf_get("pbinstalltype"));
     # Install from sandbox mean a file base install
     $itype = "file" if (defined $sbx);
@@ -2973 +2956 @@
             if ($vtype eq "ve") {
                 my ($vepath) = pb_conf_get("vepath");
-                copy("$ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/tmp");
-                copy("$ENV{'PBDESTDIR'}/project-builder-$pbver2.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/tmp");
+                copy("$ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/tmp");
+                copy("$ENV{'PBDESTDIR'}/project-builder-$pbver2.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/tmp");
             } else {
                 pb_system("scp -i $keyfile -p -o UserKnownHostsFile=/dev/null -P $nport $ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1.tar.gz $ENV{'PBDESTDIR'}/project-builder-$pbver2.tar.gz root\@$vmhost->{$ENV{'PBPROJ'}}:/tmp","Copying local project files to $vtype.");
@@ -2986 +2969 @@
 my ($osperldep,$osperlver) = pb_conf_get_if("osperldep","osperlver");
     
-my $perldep = pb_distro_get_param($ddir,$dver,$darch,$osperldep,$dfam,$dtype,$dos);
+my $perldep = pb_distro_get_param($pbos,$osperldep);
 foreach my $m (split(/,/,$perldep)) {
     # Skip empty deps
@@ -3002 +2985 @@
         # pkg based install. We need to point to the project-builder.org repository
         print SCRIPT << 'EOF';
-my ($ospkg) = pb_conf_get_if("ospkg");
-
-my $pkgforpb = pb_distro_get_param($ddir,$dver,$darch,$ospkg,$dfam,$dtype,$dos);
-pb_distro_setuposrepo($ddir,$dver,$darch,$dtype,$dfam,$dos);
-pb_distro_installdeps(undef,$dtype,$pbins,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgforpb))));
+my $pkgforpb = pb_distro_get_param($pbos,pb_conf_get_if("ospkg"));
+pb_distro_setuposrepo($pbos);
+pb_distro_installdeps(undef,$pbos,pb_distro_only_deps_needed($pbos,join(' ',split(/,/,$pkgforpb))));
 EOF
     } else {
@@ -3024 +3005 @@
 
 my $nf="/etc/sysconfig/network";
-if ((! -f $nf) && ($dtype eq "rpm")) {
+if ((! -f $nf) && ($pbos->{'type'} eq "rpm")) {
     open(NF,"> $nf") || die "Unable to create $nf";
     print NF "NETWORKING=yes\n";
@@ -3034 +3015 @@
     }
 
-    # Adds pb_distro_init and all functions needed from ProjectBuilder::Distribution, Conf and Base
+    # Adds pb_distro_get_context and all functions needed from ProjectBuilder::Distribution, Conf and Base
     foreach my $d (@INC) {
         my @f = ("$d/ProjectBuilder/Base.pm","$d/ProjectBuilder/Distribution.pm","$d/ProjectBuilder/Conf.pm");
@@ -3093 +3074 @@
     if ($vtype eq "ve") {
         # Get distro context
-        my ($name,$ver,$darch) = split(/-/,$v);
-        chomp($darch);
-        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($name,$ver,$darch);
+        my $pbos = pb_distro_get_context($v);
         my ($vepath) = pb_conf_get("vepath");
 
         # Test if an existing snapshot exists and remove it if there is a VE
-        if ((-f "$vepath->{$ENV{'PBPROJ'}}/$ddir-$dver-$darch.tar.gz") &&
-            (! -d "$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch")) {
-                pb_system("sudo rm -f $vepath->{$ENV{'PBPROJ'}}/$ddir-$dver-$darch.tar.gz","Removing previous snapshot $ddir-$dver-$darch.tar.gz");
+        if ((-f "$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz") &&
+            (! -d "$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}")) {
+                pb_system("sudo rm -f $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz","Removing previous snapshot $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz");
         }
     }
@@ -3135 +3114 @@
 foreach my $v (@$vm) {
     # Get distro context
-    my ($name,$ver,$darch) = split(/-/,$v);
-    chomp($darch);
-    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins) = pb_distro_init($name,$ver,$darch);
+    my $pbos = pb_distro_get_context($v);
 
     # Prepare the script to be executed on the VM/VE/RM
@@ -3151 +3128 @@
         print SCRIPT "sudo mount -t proc /proc /proc\n";
     }
-    print SCRIPT "$pbupd\n";
+    print SCRIPT "$pbos->{'update'}\n";
     if ($vtype eq "ve") {
         print SCRIPT "sudo umount /proc\n";
@@ -3208 +3185 @@
         open(OUT,"> $ENV{'PBTMP'}/$pbpkg.ann") || die "Unable to create $ENV{'PBTMP'}/$pbpkg.ann: $!";
         my %pb;
-        $pb{'dtype'} = "announce";
         $pb{'realpkg'} = $pbpkg;
         $pb{'ver'} = $pbver;
         $pb{'tag'} = $pbtag;
-        $pb{'suf'} = "N/A";     # Should not be empty even if unused
         $pb{'date'} = $pbdate;
         $pb{'chglog'} = $chglog;
@@ -3538 +3513 @@
 my $sdir = shift;
 my $sources = shift;
-my $dtype = shift;
-my $dfam = shift;
-my $ddir = shift;
-my $dver = shift;
-my $arch = shift;
+my $pbos = shift;
 my $extdir = shift;
 
@@ -3548 +3519 @@
 # This function works for both patches and additional sources
 foreach my $p (sort(<$sdir/*>)) {
-    $sources->{"$ddir-$dver-$arch"} .= "," if ((defined $sources->{"$ddir-$dver-$arch"}) and ($p =~ /\.all$/));
-    $sources->{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.all$/);
-    $sources->{"$ddir-$dver-$arch"} .= "," if ((defined $sources->{"$ddir-$dver-$arch"}) and ($p =~ /\.$dtype$/));
-    $sources->{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.$dtype$/);
-    $sources->{"$ddir-$dver-$arch"} .= "," if ((defined $sources->{"$ddir-$dver-$arch"}) and ($p =~ /\.$dfam$/));
-    $sources->{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.$dfam$/);
-    $sources->{"$ddir-$dver-$arch"} .= "," if ((defined $sources->{"$ddir-$dver-$arch"}) and ($p =~ /\.$ddir$/));
-    $sources->{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.$ddir$/);
-    $sources->{"$ddir-$dver-$arch"} .= "," if ((defined $sources->{"$ddir-$dver-$arch"}) and ($p =~ /\.$ddir-$dver$/));
-    $sources->{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.$ddir-$dver$/);
-    $sources->{"$ddir-$dver-$arch"} .= "," if ((defined $sources->{"$ddir-$dver-$arch"}) and ($p =~ /\.$ddir-$dver-$arch$/));
-    $sources->{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.$ddir-$dver-$arch$/);
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.all$/));
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.all$/);
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.$pbos->{'type'}$/));
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.$pbos->{'type'}$/);
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.$pbos->{'family'}$/));
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.$pbos->{'family'}$/);
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.$pbos->{'name'}$/));
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.$pbos->{'name'}$/);
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.$pbos->{'name'}-$pbos->{'version'}$/));
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.$pbos->{'name'}-$pbos->{'version'}$/);
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}$/));
+    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}$/);
 }
 
 # Prepare also remote sources to be included - Applied after the local ones
-foreach my $p ("all","$dtype","$dfam","$ddir","$ddir-$dver","$ddir-$dver-$arch") {
+foreach my $p ("all","$pbos->{'type'}","$pbos->{'family'}","$pbos->{'name'}","$pbos->{'name'}-$pbos->{'version'}","$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}") {
     my $f = "$extdir.".".$p";
     next if (not -f $f);
@@ -3572 +3543 @@
     while (<PATCH>) {
         chomp();
-        $sources->{"$ddir-$dver-$arch"} .= "," if (defined $sources->{"$ddir-$dver-$arch"});
-        $sources->{"$ddir-$dver-$arch"} .= "$_";
+        $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if (defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"});
+        $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "$_";
     }
     close(PATCH);
@@ -3600 +3571 @@
 sub pb_get_postinstall {
 
-my $ddir = shift;
-my $dver = shift;
-my $darch = shift;
+my $pbos = shift;
 my $rbspi = shift;
 my $vestyle = shift;
@@ -3614 +3583 @@
 }
 
-my $postparam = pb_distro_get_param($ddir,$dver,$darch,$rbspi);
+my $postparam = pb_distro_get_param($pbos,$rbspi);
 if ($postparam eq "") {
     $post = "";

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -53 +53 @@
 
 The first parameter is the package name.
-The second parameter is the distribution type.
-The third parameter is the distribution family.
-The fourth parameter is the distribution name.
-The fifth parameter is the distribution version.
+The second parameter is OS hash
 
 The function returns a pointer on a hash of filters.
@@ -68 +65 @@
 my ($mfile00, $mfile0, $mfile1, $mfile2, $mfile3);
 my $pbpkg = shift || die "No package specified";
-my $dtype = shift || "";
-my $dfam = shift || "";
-my $ddir = shift || "";
-my $dver = shift || "";
+my $pbos = shift;
 my $ptr = undef; # returned value pointer on the hash of filters
 my %h;
@@ -78 +72 @@
 if (-d "$ENV{'PBROOTDIR'}/pbfilter") {
     $mfile00 = "$ENV{'PBROOTDIR'}/pbfilter/all.pbf" if (-f "$ENV{'PBROOTDIR'}/pbfilter/all.pbf");
-    $mfile0 = "$ENV{'PBROOTDIR'}/pbfilter/$dtype.pbf" if (-f "$ENV{'PBROOTDIR'}/pbfilter/$dtype.pbf");
-    $mfile1 = "$ENV{'PBROOTDIR'}/pbfilter/$dfam.pbf" if (-f "$ENV{'PBROOTDIR'}/pbfilter/$dfam.pbf");
-    $mfile2 = "$ENV{'PBROOTDIR'}/pbfilter/$ddir.pbf" if (-f "$ENV{'PBROOTDIR'}/pbfilter/$ddir.pbf");
-    $mfile3 = "$ENV{'PBROOTDIR'}/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBROOTDIR'}/pbfilter/$ddir-$dver.pbf");
+    if (defined $pbos) {
+        $mfile0 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'type'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'type'}.pbf"));
+        $mfile1 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'family'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'family'}.pbf"));
+        $mfile2 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}.pbf"));
+        $mfile3 = "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf"));
+    }
 
     push @ffiles,$mfile00 if (defined $mfile00);
@@ -92 +88 @@
 if (-d "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter") {
     $ffile00 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/all.pbf" if (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/all.pbf");
-    $ffile0 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$dtype.pbf" if (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$dtype.pbf");
-    $ffile1 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$dfam.pbf" if (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$dfam.pbf");
-    $ffile2 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$ddir.pbf" if (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$ddir.pbf");
-    $ffile3 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$ddir-$dver.pbf");
-
+    if (defined $pbos) {
+        $ffile0 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'type'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'type'}.pbf"));
+        $ffile1 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'family'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'family'}.pbf"));
+        $ffile2 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}.pbf"));
+        $ffile3 = "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf" if ((defined $pbos->{'type'}) && (-f "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter/$pbos->{'name'}-$pbos->{'version'}.pbf"));
+    }
     push @ffiles,$ffile00 if (defined $ffile00);
     push @ffiles,$ffile0 if (defined $ffile0);

devel/rpmbootstrap/bin/rpmbootstrap

@@ -164 +164 @@
 
 GetOptions("help|?|h" => \$opts{'h'}, 
-        "man|m" => \$opts{'man'},
-        "verbose|v+" => \$opts{'v'},
-        "quiet|q" => \$opts{'q'},
-        "log-files|l=s" => \$opts{'l'},
-        "script|s=s" => \$opts{'s'},
-        "print-rpms|p" => \$opts{'p'},
-        "download-only|d" => \$opts{'d'},
-        "keep|k" => \$opts{'k'},
-        "iso|i=s" => \$opts{'i'},
-        "add|a=s" => \$opts{'a'},
-        "version|V=s" => \$opts{'V'},
+    "man|m" => \$opts{'man'},
+    "verbose|v+" => \$opts{'v'},
+    "quiet|q" => \$opts{'q'},
+    "log-files|l=s" => \$opts{'l'},
+    "script|s=s" => \$opts{'s'},
+    "print-rpms|p" => \$opts{'p'},
+    "download-only|d" => \$opts{'d'},
+    "keep|k" => \$opts{'k'},
+    "iso|i=s" => \$opts{'i'},
+    "add|a=s" => \$opts{'a'},
+    "version|V=s" => \$opts{'V'},
 ) || pb_syntax(-1,0);
 
@@ -193 +193 @@
     $pbLOG = \*pbLOG;
     $pbdebug = 0  if ($pbdebug == -1);
-    }
+}
 pb_log_init($pbdebug, $pbLOG);
 #pb_display_init("text","");
@@ -214 +214 @@
 #
 pb_log(0,"Starting VE build for $ENV{'PBV'}\n");
-my ($name,$ver,$darch) = split(/-/,$ENV{'PBV'});
-chomp($darch);
-my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins) = pb_distro_init($name,$ver,$darch);
+my $pbos = pb_distro_get_context($ENV{'PBV'});
 
 #
@@ -233 +231 @@
 if (not defined $vepath) {
     my ($vestdpath) = pb_conf_get_if("vepath");
-    $vepath = "$vestdpath->{'default'}/$ddir/$dver/$darch";
+    $vepath = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
 }
 
@@ -243 +241 @@
 # Get the package list to download, store them in a cache directory
 #
-my ($rbsmindep,$rbsmirrorsrv) = pb_conf_get("rbsmindep","rbsmirrorsrv");
 my ($rbscachedir) = pb_conf_get_if("rbscachedir");
-my $pkgs = pb_distro_get_param($ddir,$dver,$darch,$rbsmindep);
-my $mirror = pb_distro_get_param($ddir,$dver,$darch,$rbsmirrorsrv);
+my ($pkgs,$mirror) = pb_distro_get_param($pbos->{'name'},$pbos->{'version'},$pbos->{'arch'},pb_conf_get("rbsmindep","rbsmirrorsrv"));
 
 my $cachedir = "/var/cache/rpmbootstrap";
@@ -252 +248 @@
 
 # Point to the right subdir and create it if needed
-$cachedir .= "/$ddir-$dver-$darch";
+$cachedir .= "/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
 pb_mkdir_p($cachedir) if (! -d $cachedir);
 
@@ -266 +262 @@
     if ($mirror =~ /i386/) {
         # Some distro have an i586 or i686 mirror dir instead for i386
-        warn "Unable to download packages from $mirror for $ddir-$dver-$darch.";
+        warn "Unable to download packages from $mirror for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.";
         $mirror =~ s|/i386/|/i586/|;
         $response = $ua->get($mirror);
         if (! $response->is_success) {
-            die "Unable to download packages from $mirror for $ddir-$dver-$darch";
+            die "Unable to download packages from $mirror for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
         }
     }
@@ -279 +275 @@
 my $repo = $mirror;
 my $found = 0;
-if ($pbins =~ /yum/) {
+if ($pbos->{'install'} =~ /yum/) {
     my $response1;
     while ($found == 0) {
@@ -290 +286 @@
             my ($scheme, $account, $host, $port, $path) = pb_get_uri($repo);
             die "Unable to find the repodata structure of the mirror $mirror\nPlease check the URL or warn the dev team.\n" if ($path =~ /^[\/]+$/);
-            
+        
             # / not reached, so looping
             next;
@@ -302 +298 @@
 
 # Manages architectures specificities
-my $parch = $darch;
-$parch = "i[3456]86" if ($darch eq "i386");
+my $parch = $pbos->{'arch'};
+$parch = "i[3456]86" if ($pbos->{'arch'} eq "i386");
 
 # Get the list of packages and their URL in this hash
@@ -331 +327 @@
 my $osupdname = "";
 
-if ($pbins =~ /yum/) {
+if ($pbos->{'install'} =~ /yum/) {
     $oscachedir = "$vepath/var/cache/yum/core/packages/";
     $osupdcachedir = "$vepath/var/cache/yum/updates-released/packages/";
     $osupdname = "YUM";
     # Recent Fedora release use a new yum cache dir
-    if (($ddir eq "fedora") && ($dver > 8)) {
-        $oscachedir = "$vepath/var/cache/yum/$darch/$dver/fedora/packages";
-        $osupdcachedir = "$vepath/var/cache/yum/$darch/$dver/updates/packages";
+    if (($pbos->{'name'} eq "fedora") && ($pbos->{'version'} > 8)) {
+        $oscachedir = "$vepath/var/cache/yum/$pbos->{'arch'}/$pbos->{'version'}/fedora/packages";
+        $osupdcachedir = "$vepath/var/cache/yum/$pbos->{'arch'}/$pbos->{'version'}/updates/packages";
         $osupdcachedir = "$vepath/var/cache/yum/updates-released/packages/";
     }
-} elsif ($pbins =~ /zypper/) {
-    $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$darch";
+} elsif ($pbos->{'install'} =~ /zypper/) {
+    $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$pbos->{'arch'}";
     $osupdname = "Zypper";
-} elsif ($pbins =~ /urpmi/) {
+} elsif ($pbos->{'install'} =~ /urpmi/) {
     $oscachedir = "$vepath/var/cache/urpmi/rpms";
     $osupdname = "URPMI";
@@ -373 +369 @@
                 pb_log(1,"Package $p1 already in cache\n");
             }
-            
+        
             # End if download only
             if ($opts{'d'}) {
                 next;
             }
-
+    
             #
             # Copy the cached .RPM files into the oscachedir directory, so that os doesn't need to download them again.
             #
             pb_log(1,"Link package into $oscachedir\n");
-            copy("$cachedir/$p1",$oscachedir) if (defined $oscachedir);
-            symlink("$oscachedir/$p1","$osupdcachedir/p1") if (defined $osupdcachedir);
+            copy("$cachedir/$p1",$oscachedir) if (defined $oscachedir);
+            symlink("$oscachedir/$p1","$osupdcachedir/p1") if (defined $osupdcachedir);
 
             # And extract it to the finale dir
             pb_system("cd $vepath ; rpm2cpio $cachedir/$p1 | cpio -ivdum","Extracting package $p1 into $vepath");
-
+        
             # Remove cached package if not asked to keep
             if (! $opts{'k'}) {
                 unlink("$cachedir/$p1");
             }
-
+    
         }
     } else {
@@ -403 +399 @@
 
 if ($warning ge 1) {
-    pb_log(0,"$warning WARNINGS found.\nMaybe you should review your package list for $ddir-$dver-$darch\nand remove$lwpkg\n");
+pb_log(0,"$warning WARNINGS found.\nMaybe you should review your package list for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}\nand remove$lwpkg\n");
 }
 
@@ -415 +411 @@
 
 # yum needs that distro-release package be installed, so force it
-if ($pbins =~ /yum/) {
+if ($pbos->{'install'} =~ /yum/) {
+    my $ddir = $pbos->{'name'};
     foreach my $p1 (<$cachedir/($ddir|redhat)-release-*.rpm>) {
         copy("$cachedir/$p1","$vepath/tmp");
@@ -432 +429 @@
 # BUGFIX:
 #
-if ((($ddir eq "centos") || ($ddir eq "rhel")) && ($dver eq "5")) {
+if ((($pbos->{'name'} eq "centos") || ($pbos->{'name'} eq "rhel")) && ($pbos->{'version'} eq "5")) {
     pb_log(1,"BUGFIX for centos-5\n");
     pb_mkdir_p("$vepath/usr/lib/python2.4/site-packages/urlgrabber.skx");
@@ -458 +455 @@
 
 pb_log(1,"Adapting $osupdname repository entries\n");
-if ($pbins =~ /yum/) {
+if ($pbos->{'install'} =~ /yum/) {
     #
     # Force the architecture for yum
@@ -468 +465 @@
     # yum.conf as well
     foreach my $i (<$vepath/etc/yum.repos.d/*>,"$vepath/etc/yum.conf") {
-        pb_system("sed -i -e 's/\$basearch/$darch/g' $i","","quiet");
-        pb_system("sed -i -e 's/\$releasever/$dver/g' $i","","quiet");
+        pb_system("sed -i -e 's/\$basearch/$pbos->{'arch'}/g' $i","","quiet");
+        pb_system("sed -i -e 's/\$releasever/$pbos->{'version'}/g' $i","","quiet");
         pb_system("sed -i -e 's/^mirrorlist/#mirrorlist/' $i","","quiet");
         # rather use neutral separators here
@@ -475 +472 @@
     }
     $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";
-} elsif ($pbins =~ /zypper/) {
+} elsif ($pbos->{'install'} =~ /zypper/) {
     pb_mkdir_p("$vepath/etc/zypp/repos.d");
-    open(REPO,"> $vepath/etc/zypp/repos.d/$ddir-$dver") || die "Unable to create repo file";
+    open(REPO,"> $vepath/etc/zypp/repos.d/$pbos->{'name'}-$pbos->{'version'}") || die "Unable to create repo file";
     my $baseurl = dirname(dirname($mirror));
     # Setup the repo
     print REPO << 'EOF';
 [opensuse]
-name=$ddir-$dver
+name=$pbos->{'name'}-$pbos->{'version'}
 baseurl=$baseurl
 enabled=1
@@ -491 +488 @@
     $minipkglist = "zypper vim-minimal dhclient";
     # Bootstraping zypper
-    if ($dver eq "10.2") {
-        pb_system("chroot $vepath /bin/bash -c \"yes | /usr/bin/zypper sa $baseurl $ddir-$dver\"","Bootstrapping Zypper");
-    }
-} elsif ($pbins =~ /urpmi/) {
+    if ($pbos->{'version'} eq "10.2") {
+        pb_system("chroot $vepath /bin/bash -c \"yes | /usr/bin/zypper sa $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper");
+    }
+} elsif ($pbos->{'install'} =~ /urpmi/) {
     # Setup the repo
     my $baseurl = dirname(dirname(dirname($mirror)));
@@ -505 +502 @@
 # No need for sudo here
 #
-$pbins =~ s/sudo//g;
-pb_system("chroot $vepath /bin/bash -c \"$pbins $minipkglist \"","Bootstrapping OS by running $pbins $minipkglist");
+$pbos->{'install'} =~ s/sudo//g;
+pb_system("chroot $vepath /bin/bash -c \"$pbos->{'install'} $minipkglist \"","Bootstrapping OS by running $pbos->{'install'} $minipkglist");
 
 #
@@ -517 +514 @@
 if (defined $opts{'a'}) {
     $opts{'a'} =~ s/,/ /g;
-    pb_system("chroot $vepath /bin/bash -c \"$pbins $opts{'a'} \"","Adding packages to OS by running $pbins $opts{'a'}");
+    pb_system("chroot $vepath /bin/bash -c \"$pbos->{'install'} $opts{'a'} \"","Adding packages to OS by running $pbos->{'install'} $opts{'a'}");
 }
 
@@ -524 +521 @@
 #
 pb_log(1,"Cleaning up\n");
-if ($pbins =~ /yum/) {
+if ($pbos->{'install'} =~ /yum/) {
     pb_system("chroot $vepath /usr/bin/yum clean all","Cleaning yum");
 }