Changeset 1621

Timestamp:

06/02/12 19:06:12 (13 months ago)

Author:

bruno

Message:

• Try to allow usage of script without previous launch. Improved, but still incomplete
• Repository files generated now contains in their name a tag corresponding to the delivery dir. This allows to have easily both a test and non-test version in the same yum repo e.g. Tested for yum. Used by the MondoRescue? regression suite.

File:

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

devel/pb/bin/pb

@@ -1892 +1892 @@
         # Get list of packages to build
         my $ptr = pb_get_pkg();
-        @pkgs = @$ptr;
+        my @pkgs = ();
+        @pkgs = @$ptr if (defined $ptr);
 
         # Get the running distro to consider
         $pbos = pb_distro_get_context($v);
 
+        my $pkg = { };
         # Get content saved in cms2build
-        my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
-        $pkg = { } if (not defined $pkg);
+        if ((defined $ENV{'PBDESTDIR'}) && (defined $ENV{'PBPROJVER'}) && (defined $ENV{'PBPROJTAG'}) && (-f "$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb")) {
+            ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
+            $pkg = { } if (not defined $pkg);
+        }
 
         pb_mkdir_p("$ENV{'PBBUILDDIR'}") if (! -d "$ENV{'PBBUILDDIR'}");
@@ -1928 +1932 @@
         }
         # Adds conf file for availability of conf elements
-        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
+        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") if ((defined $ENV{'PBROOTDIR'}) && (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb"));
     }
     my ($rbsconf,$testver,$delivery) = pb_conf_get_if($conf,"testver","delivery");
@@ -2037 +2041 @@
         my $repodir = $tdir;
         $repodir =~ s|^$remdir/||;
+        my $repotag = "";
+        $repotag = "-$delivery->{$ENV{'PBPROJ'}}" if ($delivery->{$ENV{'PBPROJ'}} ne "");
 
         my ($pbrepo) = pb_conf_get("pbrepo");
@@ -2056 +2062 @@
             print PBS "set -x\n" if ($pbdebug gt 1);
             print PBS << "EOF";
-cat > $ENV{'PBPROJ'}.repo << EOT
-[$ENV{'PBPROJ'}]
+cat > $ENV{'PBPROJ'}$repotag.repo << EOT
+[$ENV{'PBPROJ'}$repotag]
 name=$pbos->{'name'} $pbos->{'version'} $pbos->{'arch'} - $ENV{'PBPROJ'} Vanilla Packages
 baseurl=$pbrepo->{$ENV{'PBPROJ'}}/$repodir
@@ -2087 +2093 @@
                 print PBS << "EOF";
 # Prepare a script to ease urpmi setup
-cat > $ENV{'PBPROJ'}.addmedia << EOT
-urpmi.addmedia $ENV{'PBPROJ'} $pbrepo->{$ENV{'PBPROJ'}}/$repodir with media_info/hdlist.cz
+cat > $ENV{'PBPROJ'}$repotag.addmedia << EOT
+urpmi.addmedia $ENV{'PBPROJ'}$repotag $pbrepo->{$ENV{'PBPROJ'}}/$repodir with media_info/hdlist.cz
 EOT
 chmod 755 $ENV{'PBPROJ'}.addmedia
@@ -2118 +2124 @@
 # Cf: http://de.opensuse.org/1-Klick-Installation/ISV
 #
-cat > $ENV{'PBPROJ'}.ymp << EOT
+cat > $ENV{'PBPROJ'}$repotag.ymp << EOT
 <?xml version="1.0" encoding="utf-8"?>
 <!-- vim: set sw=2 ts=2 ai et: -->
@@ -2124 +2130 @@
     <group><!-- The group of software, typically one for project-builder.org -->
         <name>$ENV{'PBPROJ'} Bundle</name> <!-- Name of the software group -->
-        <summary>Software bundle for the $ENV{'PBPROJ'} project</summary> <!--This message is shown to the user and should describe the whole bundle -->
-        <description>This is the summary of the $ENV{'PBPROJ'} Project
+        <summary>Software bundle for the $ENV{'PBPROJ'}$repotag project</summary> <!--This message is shown to the user and should describe the whole bundle -->
+        <description>This is the summary of the $ENV{'PBPROJ'}$repotag Project
               
             Details are available on a per package basis below
@@ -2133 +2139 @@
         <repositories><!-- List of needed repositories -->
             <repository>
-                <name>$ENV{'PBPROJ'} Repository</name> <!-- Name of the repository  -->
-                <summary>This repository contains the $ENV{'PBPROJ'} project packages.</summary> <!-- Summary of the repository -->
-                <description>This repository contains the $ENV{'PBPROJ'} project packages.</description><!-- This description is shown to the user -->
+                <name>$ENV{'PBPROJ'}$repotag Repository</name> <!-- Name of the repository  -->
+                <summary>This repository contains the $ENV{'PBPROJ'}$repotag project packages.</summary> <!-- Summary of the repository -->
+                <description>This repository contains the $ENV{'PBPROJ'}$repotag project packages.</description><!-- This description is shown to the user -->
                 <url>$pbrepo->{$ENV{'PBPROJ'}}/$repodir</url><!--URL of repository, which is added -->
             </repository>
@@ -2145 +2151 @@
     name=`rpm -q --qf '%{NAME}' \$p`
     desc=`rpm -q --qf '%{description}' \$p`
-    cat >> $ENV{'PBPROJ'}.ymp << EOT
+    cat >> $ENV{'PBPROJ'}$repotag.ymp << EOT
             <item>
                 <name>\$name</name><!-- Name of the package, is shown to the user and used to identify the package at the repository -->
@@ -2153 +2159 @@
 EOT
 done
-cat >> $ENV{'PBPROJ'}.ymp << EOT
+cat >> $ENV{'PBPROJ'}$repotag.ymp << EOT
         </software>
     </group>
 </metapackage>
 EOT
-chmod 644 $ENV{'PBPROJ'}.ymp
+chmod 644 $ENV{'PBPROJ'}$repotag.ymp
 EOF
             }
@@ -2177 +2183 @@
 #!/bin/bash
 # Prepare a script to ease apt setup
-cat > $ENV{'PBPROJ'}.sources.list << EOT
+cat > $ENV{'PBPROJ'}$repotag.sources.list << EOT
 deb $rpd $pbos->{'version'} $projcomponent
 deb-src $rpd $pbos->{'version'} $projcomponent
 EOT
-chmod 644 $ENV{'PBPROJ'}.sources.list
+chmod 644 $ENV{'PBPROJ'}$repotag.sources.list
 
 # Up two levels to deal with the dist dir cross versions
@@ -2194 +2200 @@
 Archive: unstable
 Component: $projcomponent
-Origin: $ENV{'PBPROJ'}
-Label: $ENV{'PBPROJ'} dev repository $pbrepo->{$ENV{'PBPROJ'}}
+Origin: $ENV{'PBPROJ'}$repotag
+Label: $ENV{'PBPROJ'}$repotag dev repository $pbrepo->{$ENV{'PBPROJ'}}
 EOT
 
@@ -4207 +4213 @@
 my @pkgs = ();
 
+# In script actions that file may not exist.
+return(\@pkgs) if ((not defined $ENV{'PBDESTDIR'}) || (not defined $ENV{'PBPROJVER'}) || (not defined $ENV{'PBPROJTAG'}) || (! -f "$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb"));
+
 my ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
-@pkgs = keys %$var;
-
-pb_log(0,"Packages: ".join(',',@pkgs)."\n");
+@pkgs = keys %$var if (defined $var);
+
+pb_log(0,"Packages: ".join(',',@pkgs)."\n") if (@pkgs);
 return(\@pkgs);
 }