Changeset 1080


Ignore:
Timestamp:
Aug 6, 2010, 5:33:51 PM (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r1078 r1080  
    11841184    my $src = "";
    11851185    my ($odir,$over,$oarch) = (undef, undef, undef);
    1186     my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf);
     1186    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $darch);
    11871187
    11881188    if ($cmt ne "Announce") {
     
    11951195            ($odir,$over,$oarch) = split(/-/,$v);
    11961196        }
    1197         ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($odir,$over,$oarch);
    1198         pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
     1197        ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $darch) = pb_distro_init($odir,$over,$oarch);
     1198        pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $darch))."\n");
    11991199
    12001200        # Get list of packages to build
     
    12891289        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}";
    12901290    } elsif ($cmt eq "Packages") {
    1291         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$ddir/$dver";
     1291        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch";
    12921292
    12931293        my $repodir = $tdir;
     
    13051305cat > $ENV{'PBPROJ'}.repo << EOT
    13061306[$ENV{'PBPROJ'}]
    1307 name=$ddir $dver - $ENV{'PBPROJ'} Vanilla Packages
     1307name=$ddir $dver $darch - $ENV{'PBPROJ'} Vanilla Packages
    13081308baseurl=$pbrepo->{$ENV{'PBPROJ'}}/$repodir
    13091309enabled=1
     
    13621362
    13631363# Prepare a script to create apt info file
    1364 (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)
     1364(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)
    13651365#(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)
    13661366EOF
     
    15261526        }
    15271527        my $hoption = "-p";
    1528         # Solaris doesn't support -h
     1528        # Solaris doesn't support -p
    15291529        $hoption = "" if ($dtype eq "pkg");
    15301530        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)");
Note: See TracChangeset for help on using the changeset viewer.