Changeset 1275 in ProjectBuilder

Timestamp:

Mar 22, 2011, 12:53:23 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug in debian/ubuntu repo creation for amd64 (used x86_64 instead)

File:

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

devel/pb/bin/pb

@@ -1788 +1788 @@
             # Cf: http://www.debian.org/doc/manuals/repository-howto/repository-howto.fr.html
             # This dirname removes ver
+            my $debarch = "amd64" if ($pbos->{'arch'} eq "x86_64");
             my $rpd = dirname("$pbrepo->{$ENV{'PBPROJ'}}/$repodir");
             print PBS << "EOF";
@@ -1800 +1801 @@
 # Up two levels to deal with the dist dir cross versions
 cd ..
-mkdir -p dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'} dists/$pbos->{'version'}/contrib/source
+mkdir -p dists/$pbos->{'version'}/contrib/binary-$debarch dists/$pbos->{'version'}/contrib/source
 
 # Prepare a script to create apt info file
@@ -1813 +1814 @@
 EOT
 
-echo "Creating Packages metadata ($pbos->{'arch'})"
-dpkg-scanpackages -a$pbos->{'arch'} $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Packages.gz
-dpkg-scanpackages -a$pbos->{'arch'} $pbos->{'version'} /dev/null | bzip2 -c9 > dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Packages.bz2
+echo "Creating Packages metadata ($pbos->{'arch'} aka $debarch)"
+dpkg-scanpackages -a$debarch $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/binary-$debarch/Packages.gz
+dpkg-scanpackages -a$debarch $pbos->{'version'} /dev/null | bzip2 -c9 > dists/$pbos->{'version'}/contrib/binary-$debarch/Packages.bz2
 echo "Creating Contents metadata"
 apt-ftparchive contents $pbos->{'version'} | gzip -c9 > dists/$pbos->{'version'}/Contents.gz
-echo "Creating Release metadata ($pbos->{'arch'})"
-cat \$TMPD/Release > dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Release
-echo "Architecture: $pbos->{'arch'}" >> dists/$pbos->{'version'}/contrib/binary-$pbos->{'arch'}/Release
+echo "Creating Release metadata ($pbos->{'arch'} aka $debarch)"
+cat \$TMPD/Release > dists/$pbos->{'version'}/contrib/binary-$debarch/Release
+echo "Architecture: $debarch >> dists/$pbos->{'version'}/contrib/binary-$debarch/Release
 echo "Creating Source metadata"
 dpkg-scansources $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/contrib/source/Sources.gz