Changeset 1080

Timestamp:

08/06/10 17:33:51 (3 years ago)

Author:

bruno

Message:

r3978@jbulte: bruno | 2010-08-06 16:57:40 +0200

• Begin modifications to handle archiotecture in the delivery repo, thus having os/version/arch as a tree instead of os/version. Should ease multiarch support.

File:

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

devel/pb/bin/pb

@@ -1184 +1184 @@
     my $src = "";
     my ($odir,$over,$oarch) = (undef, undef, undef);
-    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf);
+    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $darch);
 
     if ($cmt ne "Announce") {
@@ -1195 +1195 @@
             ($odir,$over,$oarch) = split(/-/,$v);
         }
-        ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($odir,$over,$oarch);
-        pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
+        ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $darch) = pb_distro_init($odir,$over,$oarch);
+        pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $darch))."\n");
 
         # Get list of packages to build
@@ -1289 +1289 @@
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}";
     } elsif ($cmt eq "Packages") {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$ddir/$dver";
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch";
 
         my $repodir = $tdir;
@@ -1305 +1305 @@
 cat > $ENV{'PBPROJ'}.repo << EOT
 [$ENV{'PBPROJ'}]
-name=$ddir $dver - $ENV{'PBPROJ'} Vanilla Packages
+name=$ddir $dver $darch - $ENV{'PBPROJ'} Vanilla Packages
 baseurl=$pbrepo->{$ENV{'PBPROJ'}}/$repodir
 enabled=1
@@ -1362 +1362 @@
 
 # Prepare a script to create apt info file
-(cd .. ; for a in i386 amd64 ia64; do mkdir -p dists/$dver/contrib/binary-\$a; dpkg-scanpackages -a\$a $dver /dev/null | gzip -c9 > dists/$dver/contrib/binary-\$a/Packages.gz; done; mkdir -p dists/$dver/contrib/source; dpkg-scansources $dver /dev/null | gzip -c9 > dists/$dver/contrib/source/Sources.gz)
+(cd .. ; for a in i386 amd64 ia64; do mkdir -p dists/$dver/contrib/binary-\$a; dpkg-scanpackages -a\$a $dver/$darch /dev/null | gzip -c9 > dists/$dver/contrib/binary-\$a/Packages.gz; done; mkdir -p dists/$dver/contrib/source; dpkg-scansources $dver/$darch /dev/null | gzip -c9 > dists/$dver/contrib/source/Sources.gz)
 #(cd .. ; rm -f dists/$dver/Release ; apt-ftparchive release dists/$dver > dists/$dver/Release; gpg --sign -ba -o dists/$dver/Release.gpg dists/$dver/Release)
 EOF
@@ -1526 +1526 @@
         }
         my $hoption = "-p";
-        # Solaris doesn't support -h
+        # Solaris doesn't support -p
         $hoption = "" if ($dtype eq "pkg");
         pb_system("$shcmd \"sudo /sbin/halt $hoption \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");