- Fixes issue in which git version number is not displayed on startup when ipxe
is build through rom-o-matic
- Remove spaces from filename generated by rom-o-matic (so that you get
"ipxe-1.0.0+(c3b4)-undionly.kkpxe" instead of "ipxe-1.0.0+
(c3b4)-undionly.kkpxe"
---
contrib/rom-o-matic/build.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/contrib/rom-o-matic/build.php b/contrib/rom-o-matic/build.php
index b9bc595..5789561 100644
--- a/contrib/rom-o-matic/build.php
+++ b/contrib/rom-o-matic/build.php
@@ -179,7 +179,12 @@ if ( $embedded_script != "" ) {
// Make the requested image. $status is set to 0 on success
$make_target = "bin/${nic}.${fmt_extension}";
-$make_cmd = "make -C '$build_dir' '$make_target' $emb_script_cmd 2>&1";
+$gitversion = exec('git describe --always --abbrev=1 --match "" 2>/dev/null');
+if ($gitversion) {
+ $gitversion = "GITVERSION=$gitversion";
+}
+
+$make_cmd = "make -C '$build_dir' '$make_target' $gitversion $emb_script_cmd
2>&1";
exec ( $make_cmd, $maketxt, $status );
@@ -239,7 +244,7 @@ if ( $status == 0 ) {
// Delete build directory as soon as it is not needed
rm_build_dir ();
- $output_filename = "ipxe-${version}-${nic}.${fmt_extension}";
+ $output_filename = str_replace(" ","",
"ipxe-${version}-${nic}.${fmt_extension}");
// Try to force IE to handle downloading right.
Header ( "Cache-control: private");
--
1.7.9.5
_______________________________________________
ipxe-devel mailing list
[email protected]
https://lists.ipxe.org/mailman/listinfo.cgi/ipxe-devel
