Changeset 2252 in ProjectBuilder for devel/pb

Timestamp:

Aug 30, 2017, 5:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

Use .pbrc.yml now as a YAML file as well instead of .pbrc

File:

• devel/pb/bin/pb (modified) (9 diffs)

devel/pb/bin/pb

@@ -481 +481 @@
 =head1 CONFIGURATION FILES
 
-Each pb user may have a configuration in F<$HOME/.pbrc>. The values in this file may overwrite any other configuration file value. 
+Each pb user may have a configuration in F<$HOME/.pbrc.yml>. The values in this file may overwrite any other configuration file value. 
 
 Here is an example of such a configuration file:
@@ -493 +493 @@
  # svn+ssh, cvs+ssh, ...
  #
- pbconfurl linuxcoe = cvs+ssh://:ext:bcornec@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe/pbconf
+  pbconfurl:
+    linuxcoe : cvs+ssh://:ext:bcornec@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe/pbconf
 
  # This is normaly defined in the project's configuration file
  # Url of the project
  #
- pburl linuxcoe = cvs+ssh://:ext:bcornec@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe
+  pburl:
+    linuxcoe : cvs+ssh://:ext:bcornec@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe
  
  # All these URLs needs to be defined here as the are the entry point 
  # for how to build packages for the project
  #
- pbconfurl pb = svn+ssh://svn.project-builder.org/mondo/svn/pb/pbconf
- pbconfurl mondorescue = svn+ssh://svn.project-builder.org/mondo/svn/project-builder/mondorescue/pbconf
- pbconfurl collectl = svn+ssh://bruno@svn.mondorescue.org/mondo/svn/project-builder/collectl/pbconf
- pbconfurl netperf = svn+ssh://svn.mondorescue.org/mondo/svn/project-builder/netperf/pbconf
+  pbconfurl:
+    pb: svn+ssh://svn.project-builder.org/mondo/svn/pb/pbconf
+  pbconfurl:
+    mondorescue: svn+ssh://svn.project-builder.org/mondo/svn/project-builder/mondorescue/pbconf
+  pbconfurl:
+    collectl: svn+ssh://bruno@svn.mondorescue.org/mondo/svn/project-builder/collectl/pbconf
+  pbconfurl:
+    netperf: svn+ssh://svn.mondorescue.org/mondo/svn/project-builder/netperf/pbconf
  
  # Under that dir will take place everything related to pb
@@ -512 +518 @@
  # to your VMs/chroot/...
  # if not defined then /var/cache
- pbdefdir default = $ENV{'HOME'}/project-builder
- pbdefdir pb = $ENV{'HOME'}
- pbdefdir linuxcoe = $ENV{'HOME'}/LinuxCOE/cvs
- pbdefdir mondorescue = $ENV{'HOME'}/mondo/svn
+  pbdefdir:
+    default: $ENV{'HOME'}/project-builder
+  pbdefdir:
+    pb: $ENV{'HOME'}
+  pbdefdir:
+    linuxcoe: $ENV{'HOME'}/LinuxCOE/cvs
+  pbdefdir:
+    mondorescue: $ENV{'HOME'}/mondo/svn
  
  # pbconfdir points to the directory where the CMS content of the pbconfurl is checked out
  # If not defined, pbconfdir is under pbdefdir/pbproj/pbconf
- pbconfdir linuxcoe = $ENV{'HOME'}/LinuxCOE/cvs/pbconf
- pbconfdir mondorescue = $ENV{'HOME'}/mondo/svn/pbconf
+  pbconfdir:
+    linuxcoe: $ENV{'HOME'}/LinuxCOE/cvs/pbconf
+  pbconfdir:
+    mondorescue: $ENV{'HOME'}/mondo/svn/pbconf
  
  # pbdir points to the directory where the CMS content of the pburl is checked out
  # If not defined, pbdir is under pbdefdir/pbproj
  # Only defined if we have access to the dev of the project
- pbdir linuxcoe = $ENV{'HOME'}/LinuxCOE/cvs
- pbdir mondorescue = $ENV{'HOME'}/mondo/svn
+  pbdir:
+    linuxcoe: $ENV{'HOME'}/LinuxCOE/cvs
+  pbdir:
+    mondorescue: $ENV{'HOME'}/mondo/svn
  
  # -daemonize doesn't work with qemu 0.8.2
- vmopt default = -m 384
+  vmopt:
+    default: -m 384
 
 =head1 COMMAND DETAILS
@@ -535 +550 @@
 =head2 newproj
 
-The newproj command creates a new project-builder project.  To run this command you first need to define two variables in your ~/.pbrc file:
+The newproj command creates a new project-builder project.  To run this command you first need to define two variables in your ~/.pbrc.yml file:
 
  pbconfurl I<project> = file:///home/anderse/.git/project-builder-config/I<project>
@@ -588 +603 @@
 =item Update your filters and build files.
 
-You probably need to edit the files describing the build steps in one of the $pbdefdir/$project/pbconf/$version/$project/{deb,rpm,pkg} directories and the filters in $pbdefdir/$project/pbconf/$version/pbfilter. Note that you can define additional filters and transforms in the *.pbf files. The build files will be filtered by the filters defined in the *.pbf files to generate the inputs to the build step. Therefore, if you change those files, you need to re-run the cms2build step.
+You probably need to edit the files describing the build steps in one of the $pbdefdir/$project/pbconf/$version/$project/{deb,rpm,pkg} directories and the filters in $pbdefdir/$project/pbconf/$version/pbfilter. Note that you can define additional filters and transformations in the filters files. The build files will be filtered by the filters defined in the filters files to generate the inputs to the build step. Therefore, if you change those files, you need to re-run the cms2build step.
 
 =item Build the package.
@@ -606 +621 @@
 =over 4
 
-=item Update ~/.pbrc
-
-Update your ~/.pbrc file to specify the vepath, velist, velogin, and vetype variables, e.g.:
-
- vepath default = $ENV{HOME}/cache-project-builder/chroot
- velist default = debian-6.0-i386
- velogin default = pb
- vetype default = chroot
+=item Update ~/.pbrc.yml
+
+Update your ~/.pbrc.yml file to specify the vepath, velist, velogin, and vetype variables, e.g.:
+
+  vepath:
+    default: $ENV{HOME}/cache-project-builder/chroot
+  velist:
+    default: debian-6.0-i386
+  velogin:
+    default: pb
+  vetype:
+    default: chroot
 
 If you are building for rpm style OS's, update the verpmtype option, and install the appropriate tool.
 
- verpmtype default = rpmbootstrap
+  verpmtype:
+    default: rpmbootstrap
 
 You may also choose to specify a mirror for the OS packages, and optionally http/ftp proxies.  You can specify the proxies either through environment variables ($http_proxy/$https_proxy/$ftp_proxy) or in the configuration file. The configuration file will be used if no corresponding environment variable has been set. For example, for debian and with a local squid proxy:
 
- rbsmirrorsrv debian = http://mirrors1.kernel.org/debian/
- http_proxy default = http://localhost:3128/
- https_proxy default = http://localhost:3128/
- ftp_proxy default = http://localhost:3128/
+  rbsmirrorsrv:
+    debian: http://mirrors1.kernel.org/debian/
+  http_proxy:
+    default: http://localhost:3128/
+  https_proxy:
+    default: http://localhost:3128/
+  ftp_proxy:
+    default: http://localhost:3128/
 
 =item Run the cms2build command
@@ -648 +672 @@
 You need to have a sshhost entry for setupve to work, so add one, even an invalid one, e.g.:
 
- sshhost $project = foo.example.org
+  sshhost:
+    $project: foo.example.org
 
 =item Setup the virtual environment
@@ -670 +695 @@
 You need to have a valid sshdir and sshhost entry for build2ve to work, so add them. Note that you need to be able to ssh from the host you run the command on to the repository host, preferably without needing to type in a password, so using ssh-agent or having a special passwordless project-builder ssh key will make this step easier.
 
- sshhost $project = localhost
- sshdir $project = $home/cache-project-builder/repos
+  sshhost:
+    $project: localhost
+  sshdir:
+    $project: $home/cache-project-builder/repos
 
 You may also need to specify additional repository files to use or rpms to install. Note the URL for repositories is not the URL of the repository, but the URL of a file that can be put in the yum.repos.d or apt.sources.d directory.
 
- addrepo centos-5-i386 = http://localhost/pb/centos-extras.repo,http://mirror.centos.org/centos/5/extras/i386/RPMS/chrpath-0.13-3.el5.centos.i386.rpm
+  addrepo:
+    centos-5-i386: http://localhost/pb/centos-extras.repo,http://mirror.centos.org/centos/5/extras/i386/RPMS/chrpath-0.13-3.el5.centos.i386.rpm
 
 =item Update your filters and build files
 
-You may need to update your filter files (*.pbf) as in the build2pkg step if you are building for a new OS or architecture.
+You may need to update your filter files as in the build2pkg step if you are building for a new OS or architecture.
 
 =item Build the packages and copy them to the repository
@@ -3384 +3412 @@
     if (($action eq "build") || ($action eq "prep")) {
         print SCRIPT "# Preparation for pb\n";
-        print SCRIPT "rm -f \$HOME/.pbrc\n";
-        print SCRIPT "cp .pbrc \$HOME\n";
+        print SCRIPT "rm -f \$HOME/.pbrc.yml\n";
+        print SCRIPT "cp .pbrc.yml \$HOME\n";
         # TODO: Why ?
         print SCRIPT "cd ..\n";