diff options
| author | Samuel R. Messner <powpowd@gmail.com> | 2022-02-17 06:17:31 +0100 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2022-02-25 16:23:30 +0000 |
| commit | 9212ee219125597915515f9b27b77accdccf75d4 (patch) | |
| tree | c44aff807b243b351bea6a8cc06ad574fd646cb0 | |
| parent | 634707a42d0a4670e5177638986232c4e992d403 (diff) | |
| download | flashrom-9212ee219125597915515f9b27b77accdccf75d4.tar.gz flashrom-9212ee219125597915515f9b27b77accdccf75d4.tar.bz2 flashrom-9212ee219125597915515f9b27b77accdccf75d4.zip | |
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.
Signed-off-by: Samuel R. Messner <powpowd@gmail.com>
Change-Id: Id8601155b35f0299200c27d0278606127410ff16
Reviewed-on: https://review.coreboot.org/c/flashrom/+/62061
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index cd9f9fb9..367c48ab 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 @@ pkgg.generate( ) 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', |