Changeset 1542

Timestamp:

05/14/12 02:53:24 (13 months ago)

Author:

bruno

Message:

• pb: Add documentation for newve and setupve; fix bug in build2pkg documentation (Eric Anderson)

File:

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

devel/pb/bin/pb

@@ -492 +492 @@
 =head2 build2pkg
 
-The build2pkg command takes the tar files created in the cms2build step and attempts to build the binary packages for your current operating system. In order for this step to work, you may need to edit the files in one of the $pbdefdir/$project/pbconf/$version/$project/{deb,rpm,pkg} directories. Those files will be used to try to build your package. Note that if you change those files, you need to re-run the cms2build step.
-
+The build2pkg command takes the tar files created in the cms2build step and attempts to build the binary packages for your current operating system. In order for this step to work, you may need to edit the files in one of the $pbdefdir/$project/pbconf/$version/$project/{deb,rpm,pkg} directories. Those files will be used to try to build your package. Note that if you change those files, you need to re-run the cms2build step. Then you can run a command like:
+
+ % pb -p $project -r $version build2pkg
+
+To create the files in $project/build that comprise your binary package(s).
+
+=head2 newve
+ 
+The newve command creates a new virtual environment, i.e. a chrooted OS for building packages. Using a virtual environment is an efficient way to build packages on a related set of operating systems. The OS's have to be related because the kernel will be shared.  Steps:
+
+=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
+
+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/$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/
+ ftp_proxy default = http://localhost:3128/
+
+=item Run the cms2build command
+
+If you have deleted your $package/delivery directory, re-run the cms2build command as in the earlier step. This step is necessary to generate the I<package>/delivery/pbrc file.
+
+=item Create the new virtual environment
+
+Initialize the new operating system. This step will install the core OS packages for the virtual environment, e.g.:
+
+ % pb -v -p $project -m debian-6.0-i386 newve
+
+=back
+
+=head2 setupve
+
+The setupve command prepares a virtual environment for use by project builder. In particular it installs project-builder from the packages into the virtual environment. For example:
+
+ % pb -v -p $project -m debian-6.0-i386 setupve
+
+If you prefer to install the current SVN version of project builder, you can substitute the setupve option by the sbx2setupv one.
 
 =head1 AUTHORS
@@ -3098 +3142 @@
     my $http_proxy = pb_distro_get_param($pbos, $http_proxy_map);
 
-    $ENV{'ftp_proxy'} = $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne ''));
-    $ENV{'http_proxy'} = $http_proxy if ((defined $http_proxy) && ($http_proxy ne ''));
+    $ENV{'ftp_proxy'} = $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne '') && (not defined $ENV{'ftp_proxy'}));
+    $ENV{'http_proxy'} = $http_proxy if ((defined $http_proxy) && ($http_proxy ne '') && (not defined $ENV{'http_proxy'}));
 
     if (defined $ENV{'http_proxy'}) {