[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/38] build-sys: fix git version from -version
From: |
Paolo Bonzini |
Subject: |
[PULL 19/38] build-sys: fix git version from -version |
Date: |
Mon, 12 Oct 2020 16:33:24 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Typo introduced with the script.
Fixes: 2c273f32d3 ("meson: generate qemu-version.h")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reported-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20200929143654.518157-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
scripts/qemu-version.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh
index 03128c56a2..3f6e7e6d41 100755
--- a/scripts/qemu-version.sh
+++ b/scripts/qemu-version.sh
@@ -9,7 +9,7 @@ version="$3"
if [ -z "$pkgversion" ]; then
cd "$dir"
if [ -e .git ]; then
- pkgversion=$(git describe --match 'v*' --dirty | echo "")
+ pkgversion=$(git describe --match 'v*' --dirty) || :
fi
fi
--
2.26.2
- [PULL 09/38] qom: Move the creation of the library to the main meson.build, (continued)
- [PULL 09/38] qom: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/12
- [PULL 12/38] exec: split out non-softmmu-specific parts, Paolo Bonzini, 2020/10/12
- [PULL 11/38] softmmu: move more files to softmmu/, Paolo Bonzini, 2020/10/12
- [PULL 17/38] qtest: unify extra_qtest_srcs and extra_qtest_deps, Paolo Bonzini, 2020/10/12
- [PULL 15/38] docs/devel/qtest: Include protocol spec in document, Paolo Bonzini, 2020/10/12
- [PULL 18/38] docs/devel: update instruction on how to add new unit tests, Paolo Bonzini, 2020/10/12
- [PULL 29/38] scsi/scsi_bus: switch search direction in scsi_device_find, Paolo Bonzini, 2020/10/12
- [PULL 26/38] qtest: check that drives are really appearing and disappearing, Paolo Bonzini, 2020/10/12
- [PULL 22/38] qtest: Reintroduce qtest_qmp_receive with QMP event buffering, Paolo Bonzini, 2020/10/12
- [PULL 23/38] qtest: remove qtest_qmp_receive_success, Paolo Bonzini, 2020/10/12
- [PULL 19/38] build-sys: fix git version from -version,
Paolo Bonzini <=
- [PULL 24/38] device-plug-test: use qtest_qmp to send the device_del command, Paolo Bonzini, 2020/10/12
- [PULL 25/38] qtest: switch users back to qtest_qmp_receive, Paolo Bonzini, 2020/10/12
- [PULL 20/38] meson.build: Re-enable KVM support for MIPS, Paolo Bonzini, 2020/10/12
- [PULL 21/38] qtest: rename qtest_qmp_receive to qtest_qmp_receive_dict, Paolo Bonzini, 2020/10/12
- [PULL 14/38] docs: Move QTest documentation to its own document, Paolo Bonzini, 2020/10/12
- [PULL 28/38] qdev: add "check if address free" callback for buses, Paolo Bonzini, 2020/10/12
- [PULL 16/38] docs/devel/qtest: Include libqtest API reference, Paolo Bonzini, 2020/10/12
- [PULL 33/38] device-core: use atomic_set on .realized property, Paolo Bonzini, 2020/10/12
- [PULL 32/38] scsi: switch to bus->check_address, Paolo Bonzini, 2020/10/12
- [PULL 13/38] qom: fix objects with improper parent type, Paolo Bonzini, 2020/10/12