Changeset 991 in ProjectBuilder for devel/rpmbootstrap/bin

Timestamp:

Mar 1, 2010, 9:27:20 AM (15 years ago)

Author:

Bruno Cornec

Message:

r3711@localhost: bruno | 2010-03-01 07:29:29 +0100

• veconf => rbsconf
• Adds option -a to rpmbootstrap in order for pb to automatically install the packages it needs
• Check CentOS4 VE OK
• Adds pb.conf man page to spec build

File:

• devel/rpmbootstrap/bin/rpmbootstrap (modified) (6 diffs)

devel/rpmbootstrap/bin/rpmbootstrap

@@ -43 +43 @@
 =head1 SYNOPSIS
 
-rpmbootstrap [-vhmqpdk][-s script][-i iso] distribution-version-arch [target-dir] [mirror [script]]
-
-pb [--verbose][--help][--man][--quiet][--print-rpms][--download-only][--keep][--include pkg1, pkg2, ...][--script script][--iso iso] distribution-version-arch [target-dir] [mirror [script]]
+rpmbootstrap [-vhmqpdk][-s script][-i iso][-a pkg1[,pkg2,...]] distribution-version-arch [target-dir] [mirror [script]]
+
+pb [--verbose][--help][--man][--quiet][--print-rpms][--download-only][--keep][--add pkg1,[pkg2,...]][--script script][--iso iso] distribution-version-arch [target-dir] [mirror [script]]
 
 =head1 OPTIONS
@@ -88 +88 @@
 
 Name of the ISO image of the distribution you want to install on the related VE.
+
+=item B<-a|--add pkg1[,pkg2,...]>
+
+Additional packages to add from the distribution you want to install on the related VE at the end of the chroot build.
 
 =back 
@@ -152 +156 @@
         "keep|k" => \$opts{'k'},
         "iso|i=s" => \$opts{'i'},
+        "add|a=s" => \$opts{'a'},
         "version|V=s" => \$opts{'V'},
 ) || pb_syntax(-1,0);
@@ -279 +284 @@
 my $osupdname = "";
 
-pb_log(1,"Setting up $osupdname cache in VE\n");
 if ($pbupd =~ /yum/) {
     $oscachedir = "$vepath/var/cache/yum/core/packages/";
@@ -291 +295 @@
     }
 } elsif ($pbupd =~ /zypper/) {
-    pb_log(1,"Setting up Zypper cache in VE\n");
     $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$darch";
     $osupdname = "Zypper";
-}
+} elsif ($pbupd =~ /urpmi/) {
+    $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$darch";
+    $osupdname = "Zypper";
+}
+pb_log(1,"Setting up $osupdname cache in VE\n");
 pb_mkdir_p($oscachedir);
 pb_mkdir_p($osupdcachedir) if (defined $osupdcachedir);
@@ -450 +457 @@
 pb_system("chroot $vepath /bin/bash -c \"if [ -x /usr/bin/authconfig ]; then /usr/bin/authconfig --enableshadow --update; fi\"","Calling authconfig");
 
+# Installed additional packages we were asked to
+if (defined $opts{'a'}) {
+    $opts{'a'} =~ s/,/ /g;
+    pb_system("chroot $vepath /bin/bash -c \"$pbupd $opts{'a'} \"","Adding packages to OS by running $pbupd $opts{'a'}");
+}
+
 #
 # Clean up