Changeset 1953 in ProjectBuilder

Timestamp:

Mar 5, 2015, 3:08:50 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix typos in conf file doc
• Fix VM package build by using again the correct script to setup repo and initializing it correctly later in pb
• Fix an error where vetype was used without check that a VE was in operation

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -3 +3 @@
 # Main configuration file for project-builder.org
 #
-# (c) B. Cornec 2007-2012
+# (c) B. Cornec 2007-2015
 # Eric Anderson's changes are (c) Copyright 2012 Hewlett Packard
 # Provided under the Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) Creative Common License

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

@@ -189 +189 @@
  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 mageia = --all
+ Example: logopt mageia = --all
 
 =item B<mkbmbootcmds>
@@ -613 +613 @@
  Nature: Optional
  Key: project (as defined in the -p option or PBPROJ environment variable)
- Value: B<pb URL> giving access to where the project is stored. Normaly provided by the project, but could be overloaded for specific authentication information in the home configuration file or when using a DVCS
+ Value: B<pburl> giving access to where the project is stored. Normaly provided by the project, but could be overloaded for specific authentication information in the home configuration file or when using a DVCS
  Conffile: home|project
  Example: pburl linuxcoe = cvs+ssh://:ext:user@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe, pburl pb = svk:////local/pb
@@ -1027 +1027 @@
  Value: qemu|kvm. For the moment, only QEMU or KVM are supported as virtualization technologies.
  Conffile: vm
- Example: vmrtype default = kvm
+ Example: vmtype default = kvm
 
 =item B<webdir>
@@ -1085 +1085 @@
 =head1 COPYRIGHT
 
-(c) B. Cornec 2007-2012
-Eric Anderson's changes are (c) Copyright 2012 Hewlett Packard
-Provided under the Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) Creative Common License
+ (c) B. Cornec 2007-2015
+ Eric Anderson's changes are (c) Copyright 2012 Hewlett Packard
+ Provided under the Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) Creative Common License
 
 =cut

devel/pb/bin/pb

@@ -2099 +2099 @@
         chomp($src);
         close(KEEP);
-        $src = "$src $pbscript{$v}";
     }
     if (($cmt eq "Sources") || ($cmt eq "Packages") || ($cmt eq "CPAN")) {
@@ -2117 +2116 @@
     }
 
-    pb_log(0,"Sources handled ($cmt): $src\n");
     pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$path,$conf))."\n");
     my ($sshhost,$sshdir) = pb_conf_get($host,$dir);
@@ -2188 +2186 @@
         my ($pbrepo) = pb_conf_get("pbrepo");
 
-        # Repository management
+        # Script for Repository management
         $pbscript{$v} = "$ENV{'PBBUILDDIR'}/pbscript.$$";
+        
+        # That script should be part of the delivery
+        $src = "$src $pbscript{$v}";
         open(PBS,"> $pbscript{$v}") || die "Unable to create $pbscript{$v}";
         if ($pbos->{'type'} eq "rpm") {
@@ -2391 +2392 @@
         }
         close(PBS);
-        chmod 0755,"$ENV{'PBBUILDDIR'}/pbscript.$$";
+        chmod 0755,$pbscript{$v};
     } else {
         return;
@@ -2597 +2598 @@
     }
             
+    pb_log(0,"Sources handled ($cmt): $src\n");
     # For docker everything is done in the Dockerfile
     if (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep < 3)) {
@@ -2625 +2627 @@
     my $pbscript1;
     if (($cmt =~ /^(V[EM]|RM)/) || ($cmt =~ /Packages/)){
-        $pbscript1 = "$pbscript{$v}";
+        $pbscript1 = $pbscript{$v};
     } else {
         $pbscript1 = "pbscript";
@@ -2645 +2647 @@
         } elsif (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) {
             $dkcmd = "/bin/bash $homedir/$tdir-2/".basename($pbscript1);
-            #$dkcmd .= "/bin/bash $homedir/$tdir-2/".basename($pbscript1)." ;  if [ '$pbkeep' == '0' ]; then rm -f $pbscript1; fi ; ";
         } else {
             my $s = basename($pbscript1);
@@ -2725 +2726 @@
             print KEEP "$made\n";
             close(KEEP);
-            if (($vetype eq "docker") && ($pbstep >= 3)) {
+            if (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) {
                 pb_rm_rf("$cp2target");
                 pb_system("$cmd1 rm $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-$cmt","","quiet");