Changeset 987

Timestamp:

02/23/10 08:21:51 (3 years ago)

Author:

bruno

Message:

r3703@localhost: bruno | 2010-02-21 07:08:00 +0100

• verebuild non mandatory, cleanup + doc
• vepkglist => vemindep
• pb.conf doc again continued

Location:

devel

Files:

• pb-doc/pb.conf.pod (modified) (5 diffs)
• pb/bin/pb (modified) (10 diffs)
• rpmbootstrap/etc/.pbrc (modified) (1 diff)

devel/pb-doc/pb.conf.pod

@@ -305 +305 @@
 Example: rbsb4pi centos = /home/rinse/bin/before-post-install.sh
 
+=item B<rbspi>
+
+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: for mock it's not used. For rinse it's the script to call after doing installation for customization. For rpmbootstrap it's the script to call after doing installation for customization.
+Conffile: ve
+Example: pbrpi centos = /home/rinse/bin/post-install.sh
+
 =item B<supfiles>
 
@@ -341 +349 @@
 Example: velogin default = pb
 
+=item B<vemindep>
+
+Nature: Optional
+Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). NB: a default value per OS family is interesting here.
+Value: coma separated list of packages needed before pb can be run in the VE. Installed automatically in setupve phase.
+Conffile: ve
+Example: vemindep rpm = rpm-build,diffutils,ntpdate, vemindep deb = diff
+
 =item B<ventp>
 
@@ -359 +375 @@
 =item B<vepath>
 
-Nature: Optional
+Nature: Mandatory
 Key: project (as defined in the -p option or PBPROJ environment variable)
 Value: path where to find VEs. Ve will be created and used under that path. For each VE os-ver-arch, it will create a subdirectory tree os/ver/arch below that point.
@@ -365 +381 @@
 Example: vepath default = /home/rpmbootstrap
 
-=item B<vepi>
-=item B<vepkglist>
 =item B<verebuild>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: true|false. True means that the VE should be rebuild before usage.
+Conffile: ve
+Example: ventpcmd default = /usr/sbin/ntpdate
+
 =item B<verpmtype>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: rpmbootstrap|rinse|mock (different tools to create a chroot environment for RPM based distributions. rpmbootstrap comes with pb. the 2 others are separate projects).
+Conffile: ve
+Example: verpmtype default = rpmbootstrap
+
 =item B<vesnap>
 =item B<vetmout>
@@ -383 +411 @@
 
 =item B<vmlogin>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: account name to use in the VM to build packages. Communication is done with ssh.
+Conffile: vm
+Example: vmlogin default = pb
+
 =item B<vmmonport>
 =item B<vmntp>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: NTP server to contact for time accuracy with B<vmntpcmd> before building.
+Conffile: vm
+Example: vmntp default = 1.pool.ntp.org
+
 =item B<vmntpcmd>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: NTP command to use to perform time synchronization with the B<vmntp> server.
+Conffile: vm
+Example: vmntpcmd default = /usr/sbin/ntpdate,vmntpcmd opensuse-11.0-i386 = sntp -P no -r
+
 =item B<vmopt>
 =item B<vmpath>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: path where to find VMs. They will be created and used under that path. For each VM os-ver-arch, it will create a os-ver-arch.qemu file below that point.
+Conffile: vm
+Example: vmpath default = /home/qemu
+
 =item B<vmport>
 =item B<vmsize>

devel/pb/bin/pb

@@ -1157 +1157 @@
     my $port = "sshport";
     my $conf = "sshconf";
-    my $rebuild = "sshrebuild";
     my $tmout = undef;
     my $path = undef;
@@ -1163 +1162 @@
         $login = "vmlogin";
         $dir = "pbdefdir";
-        $rebuild = "vmrebuild";
         # Specific VM
         $tmout = "vmtmout";
@@ -1175 +1173 @@
         $path = "vepath";
         $conf = "rbsconf";
-        $rebuild = "verebuild";
     } elsif ($cmt eq "Web") {
         $host = "websshhost";
@@ -1249 +1246 @@
 
     pb_log(0,"Sources handled ($cmt): $src\n");
-    pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf))."\n");
+    pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$path,$conf))."\n");
     my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
     # Not mandatory...
-    my ($vrebuild,$rbsconf,$testver) = pb_conf_get_if($rebuild,$conf,"testver");
+    my ($rbsconf,$testver) = pb_conf_get_if($conf,"testver");
     my ($vtmout,$vepath);
     # ...Except those in virtual context
@@ -1261 +1258 @@
         ($vtmout) = pb_conf_get($tmout);
     }
-    pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$rbsconf))."\n");
+    pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vepath,$rbsconf))."\n");
 
     my $mac;
@@ -1742 +1739 @@
 
         # Get VE context
-        my ($ptr,$vetmout,$vepath,$verebuild,$rbsconf) = pb_conf_get("vetype","vetmout","vepath","verebuild","rbsconf");
+        my ($ptr,$vetmout,$vepath,$rbsconf) = pb_conf_get("vetype","vetmout","vepath","rbsconf");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
         # We can probably only get those params now we have the distro context
-        my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$vepkglist,$osmindep) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","vepkglist","osmindep");
+        my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild");
 
         if (($vetype eq "chroot") || ($vetype eq "schroot")) {
@@ -1755 +1752 @@
 
             my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
-            if (($create != 0) || ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i) || ($pbforce == 1)) {
+            if (($create != 0) || ((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) {
                 # We have to rebuild the chroot
                 if ($dtype eq "rpm") {
@@ -1775 +1772 @@
                         $postparam = "";
                         $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep);
-                        $postparam .= ",";
-                        $postparam .= pb_distro_get_param($ddir,$dver,$darch,$vepkglist);
-                        if ($postparam eq ",") {
+                        if ($postparam eq "") {
                             $addpkgs = "";
                         } else {
@@ -1810 +1805 @@
                     my $addpkgs;
                     $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep);
-                    $postparam .= ",";
-                    $postparam .= pb_distro_get_param($ddir,$dver,$darch,$vepkglist);
-                    if ($postparam eq ",") {
+                    if ($postparam eq "") {
                         $addpkgs = "";
                     } else {
@@ -2225 +2218 @@
         # once this is done, we can do what we want on the VM remotely
     } elsif ($vtype eq "ve") {
-        # We need to finish the setup of packages needed in the VE if needed
+        # We need to finish the setup of packages needed in the VE
         # rinse/debootstrap at least needs it
-        my ($vepkglist,$osmindep) = pb_conf_get_if("vepkglist","osmindep");
+        my ($vemindep) = pb_conf_get_if("vemindep");
 
         my $postparam = "";
-        if (defined $osmindep) {
-            $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep);
-        }
-        if (defined $vepkglist) {
-            $postparam .= " ".pb_distro_get_param($ddir,$dver,$darch,$vepkglist);
+        if (defined $vemindep) {
+            $postparam .= " ".pb_distro_get_param($ddir,$dver,$darch,$vemindep);
         }
         # Change the list of pkg in to a space separated list

devel/rpmbootstrap/etc/.pbrc

@@ -16 +16 @@
 # Special for rinse: script to launch before populating the VE
 rbsb4pi centos = /home/rinse/bin/before-post-install.sh
-# Additional packages to install
-vepkglist centos = rpm-build,diffutils,ntpdate
-vepkglist deb = diff
+# Additional packages to install for pb to build packages in VE
+vemindep rpm = rpm-build,diffutils,ntpdate
+vemindep deb = diff
 
 verebuild default = false