Changeset 1064

Timestamp:

06/27/10 08:23:38 (3 years ago)

Author:

bruno

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:

• pb-modules/bin/pbdistrocheck (modified) (1 diff)
• pb-modules/etc/pb.conf (modified) (3 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (7 diffs)
• pb/bin/pb (modified) (10 diffs)
• pb/contrib/installpb (modified) (1 diff)
• rpmbootstrap/bin/rpmbootstrap (modified) (1 diff)

devel/pb-modules/bin/pbdistrocheck

@@ -93 +93 @@
 @param = split(/-/,$dist) if (defined $dist);
 
-my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init(@param);
+my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init(@param);
 if (defined $opts{'d'}) {
     print "\u$ddir $dver $arch\n";

devel/pb-modules/etc/pb.conf

@@ -138 +138 @@
 # Ganularity is the following:
 #
+#osname
 # ostype
 #   osfamily
@@ -177 +178 @@
 ostype sol = pkg
 
+# Group ostype by os
+# Key is ostype, Value is os name
+os deb = linux
+os tgz = linux
+os ebuild = linux
+os rpm = linux
+os port = bsd
+os pkg = solaris
+
 # From the most generic to the most specialized, in term of granularity,
 # give the command to use to install on the OS
@@ -213 +223 @@
 #ossuffix rhel = rhel
 #ossuffix centos = el
+#
 
 # For that OS no need to keep the version

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

@@ -42 +42 @@
   # Return information on the running distro
   #
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $dos, $pbupd, $arch) = pb_distro_init();
   print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
   # 
   # Return information on the requested distro
   #
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init("ubuntu","7.10","x86_64");
+  my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init("ubuntu","7.10","x86_64");
   print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
   # 
@@ -53 +53 @@
   #
   my ($ddir,$dver) = pb_distro_get();
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init($ddir,$dver);
+  my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init($ddir,$dver);
   print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
 
@@ -95 +95 @@
 my $dfam = "unknown";
 my $dtype = "unknown";
+my $dos = "unknown";
 my $dsuf = "unknown";
 my $dupd = "unknown";
@@ -112 +113 @@
 $darch=pb_get_arch() if (not defined $darch);
 
-my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver");
+my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver,$os) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver","os");
 
 # Dig into the tuple to find the best answer
 $dfam = pb_distro_get_param($ddir,$dver,$darch,$osfamily);
+$dos = pb_distro_get_param($ddir,$dver,$darch,$os);
 $dtype = $ostype->{$dfam} if (defined $ostype->{$dfam});
 $dupd = pb_distro_get_param($ddir,$dver,$darch,$osupd,$dfam,$dtype);
@@ -141 +143 @@
 pb_log(2,"DEBUG: pb_distro_init: $ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch\n");
 
-return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch);
+return($ddir, $dver, $dfam, $dtype, $dos, $dsuf, $dupd, $darch);
 }
 
@@ -431 +433 @@
 my $dfam = shift || "unknown";
 my $dtype = shift || "unknown";
+my $dos = shift || "unknown";
 
 if (defined $opt->{"$ddir-$dver-$darch"}) {
@@ -442 +445 @@
 } elsif (defined $opt->{$dtype}) {
     $param = $opt->{$dtype};
+} elsif (defined $opt->{$dos}) {
+    $param = $opt->{$dos};
 } elsif (defined $opt->{"default"}) {
     $param = $opt->{"default"};

devel/pb/bin/pb

@@ -612 +612 @@
         my %build;
         # We want to at least build for the underlying distro
-        my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
         my $tmpl = "$ddir-$dver-$arch,";
         my %patches;
@@ -659 +659 @@
                 chomp($arch);
                 my ($ddir, $dver, $dfam);
-                ($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'}, $pb{'upd'}, $pb{'arch'}) = pb_distro_init($name,$ver,$arch);
+                ($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");
                 pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
@@ -866 +866 @@
 sub pb_test2pkg {
     # Get the running distro to test on
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
     pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n");
 
@@ -886 +886 @@
 
     # Get the running distro to build on
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
     pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n");
 
@@ -1194 +1194 @@
             ($odir,$over,$oarch) = split(/-/,$v);
         }
-        ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($odir,$over,$oarch);
+        ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($odir,$over,$oarch);
         pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
 
@@ -1740 +1740 @@
         my ($name,$ver,$darch) = split(/-/,$v);
         chomp($darch);
-        my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver,$darch);
+        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($name,$ver,$darch);
 
         # Get VE context
@@ -2218 +2218 @@
     my ($name,$ver,$darch) = split(/-/,$v);
     chomp($darch);
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
+    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
     
     # Name of the account to deal with for VM/VE
@@ -2416 +2416 @@
 # And we now need the conf file required for this to work created above
 
-my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $darch) = pb_distro_init(); 
+my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $darch) = pb_distro_init(); 
 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $darch))."\n";
 
@@ -2561 +2561 @@
     my ($name,$ver,$darch) = split(/-/,$v);
     chomp($darch);
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver,$darch);
+    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($name,$ver,$darch);
     my ($vepath) = pb_conf_get("vepath");
 
@@ -2809 +2809 @@
 
     # Get all required parameters
-    my ($pkgv, $pkgt, $testver) = pb_conf_get_if("pkgver","pkgtag","testver");
+    my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
 
     # DB of announces for external usage (Web pages generation)

devel/pb/contrib/installpb

@@ -10 +10 @@
 my $pbver= "devel";
 
-my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init(); 
+my ($ddir, $dver, $dfam, $dtype, $dos, $dsuf) = pb_distro_init(); 
 
 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n";

devel/rpmbootstrap/bin/rpmbootstrap

@@ -202 +202 @@
 my ($name,$ver,$darch) = split(/-/,$ENV{'PBV'});
 chomp($darch);
-my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
+my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
 
 #