Changeset 1559 in ProjectBuilder

Timestamp:

May 21, 2012, 4:03:18 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb: Fix deb repo so that we will re-generate package information for all existing architectures so that if we generate slightly different _all packages (e.g. from the date being included), all of the architectures will be able to download the package generated by any of the builds. (Eric Anderson)
• pb: Be more verbose when the $ENV{HOME} in the VE case is not found, and split the 2 cases (VE vs non-VE) (Eric Anderson)

File:

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

devel/pb/bin/pb

@@ -2180 +2180 @@
 EOT
 
-echo "Creating Packages metadata ($pbos->{'arch'} aka $debarch)"
-dpkg-scanpackages -a$debarch $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/$projcomponent/binary-$debarch/Packages.gz
-dpkg-scanpackages -a$debarch $pbos->{'version'} /dev/null | bzip2 -c9 > dists/$pbos->{'version'}/$projcomponent/binary-$debarch/Packages.bz2
+echo "Creating Packages metadata"
+for i in dists/$pbos->{version}/$projcomponent/binary-*; do
+    arch=`basename \$i | sed 's/binary-//'`
+    echo "Packages for \$arch:"
+    dpkg-scanpackages -a\$arch $pbos->{'version'} /dev/null | gzip -c9 > dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages.gz
+    dpkg-scanpackages -a\$arch $pbos->{'version'} /dev/null | bzip2 -c9 > dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages.bz2
+done
 echo "Creating Contents metadata"
 apt-ftparchive contents $pbos->{'version'} | gzip -c9 > dists/$pbos->{'version'}/Contents.gz
@@ -2224 +2228 @@
 
     # Remove a potential $ENV{'HOME'} as tdir should be relative to pb's home
-    $tdir =~ s|\$ENV.+\}/||;
+    if ($cmt =~ /^VE/o) {
+        $tdir =~ s|\$ENV.+\}/|| or confess "for $cmt: $tdir must have \$ENV{'HOME'} in it or the remainder of the code won't work since some parts use relative pathing and others will try absolute.  Use a symlink if necessary to place the real files in a different place than under your home directory";
+    } else {
+        # process, ok if not present.
+        $tdir =~ s|\$ENV.+\}/||;
+    }
 
     my $tm = "";