Changeset 1111 in ProjectBuilder for devel/pb-modules

Timestamp:

Nov 18, 2010, 2:06:01 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Rename previous option osupd into the more correct osins, and add a real osupd param to support distribution update commands
• Adds 2 new commands to update distributions in VM|VE with updatevm|ve (Fix #70)

Location:

devel/pb-modules

Files:

• bin/pbdistrocheck (modified) (2 diffs)
• etc/pb.conf (modified) (1 diff)
• etc/pb.conf.pod (modified) (2 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (6 diffs)

devel/pb-modules/bin/pbdistrocheck

@@ -121 +121 @@
 @param = split(/-/,$dist) if (defined $dist);
 
-my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init(@param);
+my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init(@param);
 my $sep = "\n";
 if (defined $opts{'l'}) {
@@ -144 +144 @@
         $pbsuf = "Suffix:\t$pbsuf";
         $pbupd = "Update:\t$pbupd";
+        $pbins = "Install:\t$pbupd";
         $arch = "Arch:\t$arch";
         print "Project-Builder tuple:\n";
     }
-    print join($sep,($dos, $ddir, $dver, $arch, $dtype, $dfam, $pbsuf, $pbupd))."\n";
+    print join($sep,($dos, $ddir, $dver, $arch, $dtype, $dfam, $pbsuf, $pbupd, $pbins))."\n";
 }

devel/pb-modules/etc/pb.conf

@@ -194 +194 @@
 # key depends on granularity, value is install command
 
+# Command to update the distribution to latest state
+osupd du = sudo apt-get update
+osupd gen = sudo emerge 
+osupd rpm = sudo yum clean all; sudo yum -y update
+osupd md = sudo urpmi.update -a ; sudo urpmi --autoa--auto-select
+osupd opensuse = sudo zypper -n update
+osupd sol = /bin/true
+osupd lsb = /bin/true
+
 # Chaining the commands allow to only test for what is able to be installed, 
 # not the update of the repo which may well be unaccessible if too old
-osupd du = sudo apt-get update ; sudo apt-get -y install 
-osupd gen = sudo emerge 
-osupd rpm = sudo yum clean all; sudo yum -y update ; sudo yum -y install 
-osupd rhel-2.1 = sudo up2date -y 
-osupd rhel-3 = sudo up2date -y 
-osupd rhel-4 = sudo up2date -y 
-osupd md = sudo urpmi.update -a ; sudo urpmi --auto 
-osupd novell = export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo yast2 -i 
-osupd opensuse-10.2 = sudo yes | zypper install
-osupd opensuse = sudo zypper -n install
-osupd sol = sudo pkgadd -d
-osupd lsb = /bin/true
+osins du = sudo apt-get update ; sudo apt-get -y install 
+osins gen = sudo emerge 
+osins rpm = sudo yum clean all; sudo yum -y update ; sudo yum -y install 
+osins rhel-2.1 = sudo up2date -y 
+osins rhel-3 = sudo up2date -y 
+osins rhel-4 = sudo up2date -y 
+osins md = sudo urpmi.update -a ; sudo urpmi --auto 
+osins novell = export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo yast2 -i 
+osins opensuse-10.2 = sudo yes | zypper install
+osins opensuse = sudo zypper -n install
+osins sol = sudo pkgadd -d
+osins lsb = /bin/true
 
 # From the most generic to the most specialized, in term of granularity,

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

@@ -102 +102 @@
  Conffile: pb
  Example: osfamily debian = du
+
+=item B<osins>
+
+ Nature: Optional
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
+ Value: OS command to lauch in order to automatically install packages on it.
+ Conffile: pb
+ Example: osins fedora = sudo yum -y install
 
 =item B<osmindep>
@@ -196 +204 @@
  Nature: Optional
  Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
- Value: OS command to lauch in order to automatically install packages on it.
- Conffile: pb
- Example: ostype rh = rpm, ostype md = rpm, ostype novell = rpm
+ Value: OS command to lauch in order to automatically update th VM|VE
+ Conffile: pb
+ Example: osupd fedora = sudo yum -y update
 
 =item B<pbconfurl>

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

@@ -42 +42 @@
   # Return information on the running distro
   #
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $dos, $pbupd, $arch) = pb_distro_init();
-  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
+  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";
   # 
   # Return information on the requested distro
   #
-  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";
+  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";
   # 
   # Return information on the running distro
   #
   my ($ddir,$dver) = pb_distro_get();
-  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";
+  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
@@ -74 +74 @@
 =item B<pb_distro_init>
 
-This function returns a list of 7 parameters indicating the distribution name, version, family, type of build system, suffix of packages, update command line and architecture of the underlying Linux distribution. The value of the 7 fields may be "unknown" in case the function was unable to recognize on which distribution it is running.
+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.
 
 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.
@@ -98 +98 @@
 my $dsuf = "unknown";
 my $dupd = "unknown";
+my $dins = "unknown";
 my $darch = shift || undef;
 my $dnover = "false";
@@ -113 +114 @@
 $darch=pb_get_arch() if (not defined $darch);
 
-my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver,$os) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver","os");
+my ($osfamily,$ostype,$osupd,$osins,$ossuffix,$osnover,$osremovedotinver,$os) = pb_conf_get("osfamily","ostype","osupd","osins","ossuffix","osnover","osremovedotinver","os");
 
 # Dig into the tuple to find the best answer
@@ -120 +121 @@
 $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);
@@ -141 +143 @@
 #   $opt="--exclude=*.i?86";
 #   }
-pb_log(2,"DEBUG: pb_distro_init: $ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch\n");
-
-return($ddir, $dver, $dfam, $dtype, $dos, $dsuf, $dupd, $darch);
+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);
 }