diff options
| author | Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com> | 2018-09-11 21:58:02 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-10-10 15:26:28 +0200 |
| commit | 8ebe67a96f0d0c79b35b640fb18b37e0045438c4 (patch) | |
| tree | 2c4a6bf7a4589fbf93486b046bb8d4ff4d746d63 | |
| parent | b14ad0bd697038e4cf48ecf48830fb3369f1f25e (diff) | |
| download | buildroot-8ebe67a96f0d0c79b35b640fb18b37e0045438c4.tar.gz buildroot-8ebe67a96f0d0c79b35b640fb18b37e0045438c4.zip | |
synergy: fix resolving of Buildroot git revision
Starting version v1.10.0-stable, Synergy tries to resolve the git revision in
the build directory. This causes CMake to either detect the Buildroot commit
or fail when no git repo is found.
By manually setting SYNERGY_VERSION_STAGE to another value then snapshot, this
behavior is skipped.
Fixes:
http://autobuild.buildroot.net/results/5bab942322357bd71901cfc13ed3cff0c17edcce
Signed-off-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
| -rw-r--r-- | package/synergy/synergy.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk index 7f1dc79874..46c4fbb1ef 100644 --- a/package/synergy/synergy.mk +++ b/package/synergy/synergy.mk @@ -10,6 +10,10 @@ SYNERGY_LICENSE = GPL-2.0 SYNERGY_LICENSE_FILES = LICENSE SYNERGY_DEPENDENCIES = xlib_libX11 xlib_libXtst +# Avoid using buildroot commit hash inside cmake/Version.cmake +# by setting SYNERGY_VERSION_STAGE != snapshot +SYNERGY_CONF_ENV += SYNERGY_VERSION_STAGE="beta" + ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT),y) SYNERGY_DEPENDENCIES += xlib_libXext endif |
