Changeset 2190 in ProjectBuilder

Timestamp:

Mar 3, 2017, 4:07:36 AM (7 years ago)

Author:

Bruno Cornec

Message:

Add support for no arch pkg for deb (aka all) in repositories

File:

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

devel/pb/bin/pb

@@ -2452 +2452 @@
 # Up two levels to deal with the dist dir cross versions
 cd ..
-mkdir -p dists/$pbos->{'version'}/$projcomponent/binary-$debarch dists/$pbos->{'version'}/$projcomponent/source
+mkdir -p dists/$pbos->{'version'}/$projcomponent/binary-$debarch dists/$pbos->{'version'}/$projcomponent/source dists/$pbos->{'version'}/$projcomponent/binary-all
 
 # Prepare a script to create apt info file
@@ -2476 +2476 @@
 apt-ftparchive contents $pbos->{'version'} | gzip -c9 > dists/$pbos->{'version'}/Contents.gz
 echo "Creating Release metadata ($pbos->{'arch'} aka $debarch)"
+cat \$TMPD/Release > dists/$pbos->{'version'}/$projcomponent/binary-all/Release
+echo "Architecture: all" >> dists/$pbos->{'version'}/$projcomponent/binary-all/Release
 cat \$TMPD/Release > dists/$pbos->{'version'}/$projcomponent/binary-$debarch/Release
 echo "Architecture: $debarch" >> dists/$pbos->{'version'}/$projcomponent/binary-$debarch/Release
@@ -2821 +2823 @@
         my $debarch = pb_get_debarch($pbos2);
         my $projcomponent = pb_get_debpc($pbos2);
-        for my $f ("dists/$pbos2->{'version'}/$projcomponent/binary-$debarch/Release","dists/$pbos2->{'version'}/$projcomponent/source/Release","dists/$pbos2->{'version'}/Release") {
+        for my $f ("dists/$pbos2->{'version'}/$projcomponent/binary-$debarch/Release","dists/$pbos2->{'version'}/$projcomponent/binary-all/Release","dists/$pbos2->{'version'}/$projcomponent/source/Release","dists/$pbos2->{'version'}/Release") {
             my $debdir = dirname($cptarget);
             pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $debdir/$f . 2> /dev/null","Getting deb $f file from $debdir");