Index: build_requires_tree
===================================================================
--- build_requires_tree (revision 16)
+++ build_requires_tree (revision 17)
@@ -22,6 +22,7 @@
#
# where:
# 'topdir' - is a absolute path to the top directory of checked out branch
+# 'pkgarch' - is a ARCHITECTURE name
# 'toolchain' - is a TOOLCHAIN name
# 'hardware' - is a HARDWARE variant
#
@@ -28,7 +29,7 @@
# global variables
my ($build_system);
-my ($topdir, $toolchain, $hardware, $flavour);
+my ($topdir, $pkgarch, $toolchain, $hardware, $flavour);
my ($target_build_dir, $requires_file);
my ($html_tree_file, $js_tree_file, $js_min_tree_file, $js_pkgs_file, $js_min_pkgs_file);
my ($system_version, $distro_name, $distro_version, $url);
@@ -45,6 +46,7 @@
Usage: $0 topdir toolchain hardware
Where:
topdir - is a absolute path to the top of checked out branch;
+ pkgarch - is a ARCHITECTURE name;
toolchain - is a TOOLCHAIN name;
hardware - is a HARDWARE variant.
@@ -441,7 +443,7 @@
# version => $(PKG_VERSION) from Makefile
# group => $(PKG_GROUP) from Makefile {app,base,dev,libs,net,...}
#
-# arch => $toolchain from comandline args
+# arch => $pkgarch from comandline args
# hardware => $hardware from comandline args
# flavour => $flavour from comandline args for ROOT pkg, from REQUIRES for dependencies
# tarball => "$name-$version-$arch-$distro_name-$distro_version.$tarball_suffix"
@@ -478,7 +480,7 @@
}
$pkg{'version'} = pkg_version( $makefile );
- $pkg{'arch'} = $toolchain;
+ $pkg{'arch'} = $pkgarch;
$pkg{'hardware'} = $hardware;
$pkg{'flavour'} = $flavour;
$pkg{'group'} = pkg_group( $makefile );
@@ -629,6 +631,7 @@
# Get the rest arguments of the command line
$topdir = shift;
+$pkgarch = shift;
$toolchain = shift;
$hardware = shift;
$flavour = shift;
@@ -636,6 +639,7 @@
my $makefile = "Makefile";
if( ! defined $topdir or $topdir eq "" ) { usage; }
+if( ! defined $pkgarch or $pkgarch eq "" ) { usage; }
if( ! defined $toolchain or $toolchain eq "" ) { usage; }
if( ! defined $hardware or $hardware eq "" ) { usage; }
if( ! defined $flavour or $flavour eq "" ) { $flavour = ""; }
@@ -926,12 +930,12 @@
"sed 's/\@TARBALL_SUFFIX\@/%s/g' | " .
"sed 's/\@BUG_URL\@/%s/g' | " .
"sed 's/\@COPYING\@/%s/g' | " .
- "sed 's/\@YEAR\@/%s/g' | " .
- "sed 's/\@MONTH\@/%s/g' | " .
- "sed 's/\@DAY\@/%s/g' | " .
- "sed 's/\@HOUR\@/%s/g' | " .
- "sed 's/\@MINUTE\@/%s/g' | " .
- "sed 's/\@SECOND\@/%s/g' | " .
+ "sed 's/\@YEAR\@/%.4d/g' | " .
+ "sed 's/\@MONTH\@/%.2d/g' | " .
+ "sed 's/\@DAY\@/%.2d/g' | " .
+ "sed 's/\@HOUR\@/%.2d/g' | " .
+ "sed 's/\@MINUTE\@/%.2d/g' | " .
+ "sed 's/\@SECOND\@/%.2d/g' | " .
"sed 's/\@SVG_WIDTH\@/%d/g' | " .
"sed 's/\@SVG_HEIGHT\@/%d/g' | " .
"sed 's/\@JSON_PKGS_FILE\@/%s/g' | " .