powpowd@gmail.com has uploaded this change for review.
meson.build: Don't depend on getrevision.sh
`getrevision.sh` isn't included in exported source code (including
GitHub's auto-generated tarballs and ZIPs). Per issue #95, the build
shouldn't depend on getrevision.sh for this reason. Previously,
however, Flashrom would not build from exported source using Meson
due to it requiring `getrevision.sh`. This patch has Meson use the
intended getversion.sh instead.
Worth mentioning is that Flashrom still does not build on my system
for unrelated reasons (see issue #243), so I haven't been able to
confirm that this commit completes building - but the changes don't
affect the rest of the build process, so it's nigh-certainly fine.
Signed-off-by: Samuel R. Messner <powpowd@gmail.com>
Change-Id: Id8601155b35f0299200c27d0278606127410ff16
---
M meson.build
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/61/62061/1
diff --git a/meson.build b/meson.build
index cd9f9fb..367c48a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('flashromutils', 'c',
- version : run_command('util/getversion.sh', '-v').stdout().strip(),
+ version : run_command('util/getversion.sh', '--version').stdout().strip(),
license : 'GPL-2.0',
meson_version : '>=0.50.0',
default_options : ['warning_level=2', 'c_std=c99'],
@@ -469,7 +469,7 @@
)
conf.set('VERSION', version)
-conf.set('MAN_DATE', run_command('util/getrevision.sh', '--date', 'flashrom.8.tmpl').stdout().strip())
+conf.set('MAN_DATE', run_command('util/getversion.sh', '--man-date').stdout().strip())
configure_file(
input : 'flashrom.8.tmpl',
output : 'flashrom.8',
To view, visit change 62061. To unsubscribe, or for help writing mail filters, visit settings.