Changeset 429 for devel/pb/bin/pb

Timestamp:

05/08/08 02:04:20 (5 years ago)

Author:

bruno

Message:

• Change filtering interface to add pbrepo keyword support and PBREPO macro
• Add repository generation support + conf files to pb for rpm
• Adapt pb and mondorecue spec files to new interfaces

File:

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

devel/pb/bin/pb

@@ -446 +446 @@
     my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
 
-    # declare packager for filtering
-    my ($tmp) = pb_conf_get("pbpackager");
-    $ENV{'PBPACKAGER'} = $tmp->{$ENV{'PBPROJ'}};
+    # declare packager and repo for filtering
+    my ($tmp1, $tmp2) = pb_conf_get("pbpackager","pbrepo");
+    $ENV{'PBPACKAGER'} = $tmp1->{$ENV{'PBPROJ'}};
+    $ENV{'PBREPO'} = $tmp2->{$ENV{'PBPROJ'}};
 
     foreach my $pbpkg (@pkgs) {
@@ -551 +552 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles,values %pkgfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$ENV{'PBPACKAGER'},$chglog,$ENV{'PBPROJ'});
+                    pb_filter_file_pb("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$ENV{'PBPACKAGER'},$chglog,$ENV{'PBPROJ'},$ENV{'PBREPO'});
                 }
             }
@@ -573 +574 @@
         if (defined $filteredfiles->{$pbpkg}) {
             foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
-                pb_filter_file_inplace($ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'},$ENV{'PBPROJ'});
+                pb_filter_file_inplace($ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'},$ENV{'PBPROJ'},$ENV{'PBREPO'});
                 $liste = "$f $liste";
             }
@@ -581 +582 @@
         # Prepare the dest directory for archive
         if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
-            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'},$ENV{'PBPROJ'});
+            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'},$ENV{'PBPROJ'},$ENV{'PBREPO'});
             chmod 0755,"$ENV{'PBTMP'}/pbinit";
             pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit");
@@ -823 +824 @@
         }
     }
-    # Adds conf file for availanility of conf elements
+    # Adds conf file for availability of conf elements
     pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
 
     if (($cmt eq "vm") || ($cmt eq "ve")) {
-        $src="$src $ENV{'PBDESTDIR'}/pbscript $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc";
+        $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc";
     } elsif ($cmt eq "Script") {
-        $src="$src $ENV{'PBDESTDIR'}/pbscript";
+        # Nothing special to do
     } elsif ($cmt eq "Packages") {
         # Get package list from file made during build2pkg
@@ -836 +837 @@
         chomp($src);
         close(KEEP);
-        if ($dtype eq "rpm") {
-            # Also make a pbscript to generate yum/urpmi bases
-            # $src = "$src $ENV{'PBDESTDIR'}/pbscript"
-        } elsif ($dtype eq "deb") {
-            # Also make a pbscript to generate apt bases
-            # $src = "$src $ENV{'PBDESTDIR'}/pbscript"
-        }
-    }
+
+    }
+    # Systematically adds the pbscript
+    $src="$src $ENV{'PBDESTDIR'}/pbscript";
     # Remove potential leading spaces (cause problem with basename)
     $src =~ s/^ *//;
@@ -879 +876 @@
     } elsif ($cmt eq "Packages") {
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
+
         if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
             # This is a test pkg => target dir is under test
             $tdir = "$sshdir->{$ENV{'PBPROJ'}}/test/$ddir/$dver";
         }
+
+        my $repodir = $tdir;
+        $repodir =~ s|^$sshdir->{$ENV{'PBPROJ'}}/||;
+
+        my ($pbrepo) = pb_conf_get("pbrepo");
+
+        # Repository management
+        open(PBS,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
+        if ($dtype eq "rpm") {
+            # Also make a pbscript to generate yum/urpmi bases
+            print PBS << "EOF";
+# Prepare a script to ease yum setup
+cat > $ENV{'PBPROJ'}.repo << EOT
+[$ENV{'PBPROJ'}]
+name=$ddir $dver - $ENV{'PBPROJ'} Vanilla Packages
+baseurl=$pbrepo->{'PBPROJ'}/$repodir
+enabled=1
+gpgcheck=0
+EOT
+chmod 644 $ENV{'PBPROJ'}.repo
+
+# Clean up old repo content
+rm -rf headers/ repodata/
+# Create yum repo
+yum-arch .
+# Create repodata
+createrepo .
+EOF
+            if ($dfam eq "md") {
+                # For Mandriva add urpmi management
+                print PBS << "EOF";
+# Prepare a script to ease urpmi setup
+cat > $ENV{'PBPROJ'}.addmedia << EOT
+urpmi.addmedia $ENV{'PBPROJ'} $pbrepo->{'PBPROJ'}/$repodir with hdlist.cz
+EOT
+chmod 755 $ENV{'PBPROJ'}.addmedia
+
+# Clean up old repo content
+rm -f hdlist.cz
+# Create urpmi repo
+genhdlist .
+EOF
+            }
+        } elsif ($dtype eq "deb") {
+            # Also make a pbscript to generate apt bases
+        }
+        close(PBS);
+
     } else {
         return;