Changeset 1702 in ProjectBuilder

Timestamp:

Feb 28, 2013, 4:35:24 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix #116 by documenting the cachedir parameter
• remove mkbmpath variable to use cachedir instead (more coherent)

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (3 diffs)
• pb-modules/etc/pb.conf.pod (modified) (3 diffs)
• pb/bin/pb (modified) (1 diff)
• pbmkbm/bin/pbmkbm (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -395 +395 @@
 # Where to store packages downloaded temporarily by rpmbootstrap
 cachedir rpmbootstrap = /var/cache/rpmbootstrap
-cachedir pbmkbm = /var/cache/rpmbootstrap
+cachedir pbmkbm = /var/cache/pbmkbm
 
 # Options to pass to rpmbootstrap command. By default keep downloaded packages
@@ -432 +432 @@
 # pbmkbm configuration parameters
 #
-mkbmpath default = /var/cache/pbmkbm
 vetype pbmkbm = chroot
 verpmtype pbmkbm = rpmbootstrap
@@ -545 +544 @@
 osperldep opensuse = Module-Build,File-MimeInfo,File-BaseDir
 ospkgdep opensuse = wget,make,ntp,patch,perl-Date-Manip,perl-File-HomeDir,diffutils
+ospkgdep opensuse-11.0 = wget,make,ntp,patch,perl-DateManip,perl-File-HomeDir,diffutils
 # Mdv
 osperldep mandrake-10.1 = Date-Manip

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

@@ -26 +26 @@
 
  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.
+ 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: comma separated list of URLs that point to repository files, or packages to install. The values may not include substitutions.
  Conffile: project
  Example: addrepo centos-5-x86_64 = file:///prj/extras.repo,http://mirror.centos.org/centos/5.8/extras/x86_64/RPMS/chrpath-0.13-3.el5.centos.x86_64.rpm
+
+=item B<cachedir>
+
+ Nature: Optional
+ Key: pb project: rpmbootstrap|pbmkbm|pb
+ Value: Directory to cache temporary content for the relevant pb project.
+ Conffile: pb
+ Example: cachedir rpbootstrap = /var/cache/rpmbootstrap
 
 =item B<checkexclude>
@@ -138 +146 @@
 
  Nature: Mandatory
- Key: project (as defined in the -p option or PBPROJ environment variable)
+ 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: internal (the application then handles the logging of what it finds useful) or the name of an application to launch to log context (e.g. sos, cfg2html, ...).
  Conffile: pb
- Example: logcmd pbmkbm = sos
+ Example: logcmd mageia = sos
 
 =item B<logcmds>
 
  Nature: Optional
- Key: project (as defined in the -p option or PBPROJ environment variable)
+ 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: In case the B<logcmd> command is internal, a comma separated list of the commands whose trace execution is to be captured in order to log context.
  Conffile: pb
- Example: logcmds pbmkbm = mount,lsmod,esxcfg-module -l,df -T
+ Example: logcmds mageia = mount,lsmod,esxcfg-module -l,df -T
 
 =item B<logfiles>
 
  Nature: Optional
- Key: project (as defined in the -p option or PBPROJ environment variable)
+ 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: In case the B<logcmd> command is internal, a comma separated list of the files to capture in order to log context.
  Conffile: pb
- Example: logfiles pbmkbm = /etc/raidtab,/proc/cmdline,/proc/swaps
+ Example: logfiles mageia = /etc/raidtab,/proc/cmdline,/proc/swaps
 
 =item B<logopt>
 
  Nature: Optional
- Key: project (as defined in the -p option or PBPROJ environment variable)
+ 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: In case the B<logcmd> command is not internal, the options of the B<logcmd> application to launch to log context
  Conffile: pb
- Example: logcmd pbmkbm = --all
+ Example: logcmd mageia = --all
 
 =item B<mkbmbootcmds>
@@ -214 +222 @@
  Conffile: pb
  Example: mkbmkerneldir linux = ^linu|^vmlinu|^xen
-
-=item B<mkbmpath>
-
- Nature: Mandatory
- 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: path of the temporary directory into which the boot media is created.
- Conffile: pb
- Example: mkbmpath default = /var/cache/pbmkbm
 
 =item B<mkbmtargetdirs>

devel/pb/bin/pb

@@ -2623 +2623 @@
             }
             # Always redirect the network and always try to use a 'pb' snapshot
-            #$cmd = "$vmcmd $ENV{'PBVMOPT'} -net user,hostfwd=tcp:$nport:10.0.2.15:22 -loadvm pb $vmm"
+            #$cmd = "$vmcmd $ENV{'PBVMOPT'} -net nic,model=virtio -net user,hostfwd=tcp::$nport-:22 -loadvm pb $vmm"
             $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
         } elsif ($vmtype eq "xen") {

devel/pbmkbm/bin/pbmkbm

@@ -283 +283 @@
 if (not defined $mkbm{'targetdir'}) {
     $mkbm{'targetdir'} = "/var/cache/pbmkbm";
-    my ($vestdpath) = pb_conf_get("mkbmpath");
-    $mkbm{'targetdir'} = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if (defined $vestdpath->{'default'});
+    my ($vestdpath) = pb_conf_get_if("cachedir");
+    $mkbm{'targetdir'} = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if ((defined $vestdpath) && (defined $vestdpath->{'default'}));
+    $mkbm{'targetdir'} = "$vestdpath->{'pbmkbm'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if ((defined $vestdpath) && (defined $vestdpath->{'pbmkbm'}));
     pb_log(1,"No target-dir specified, using $mkbm{'targetdir'}\n");
 }