Skip to contentSkip to conversation

synergy: fix resolving of Buildroot git revision

PATCH New Pieterjan Camerlynck 2 participants 2 messages Sep 11, 2018 – Oct 10, 2018

lore
Share & tools
lore

Pieterjan Camerlynck

author
#0 lore raw

PATCH v2 1/1 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 <[email protected]>

---
Changes v1 -> v2:
- change author email address

---
 package/synergy/synergy.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/synergy/synergy.mk +4 -0
index 7f1dc79874..46c4fbb1ef 100644
@@ -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
Signature · 1 line
2.17.1
Applied
#1 lore raw

PATCH v2 1/1 synergy: fix resolving of Buildroot git revision

Hello,

Quoted 10 lines · Pieterjan Camerlynck

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

Quoted 7 lines
Signed-off-by Pieterjan Camerlynck <[email protected]>

---
Changes v1 -> v2:
- change author email address

---
 package/synergy/synergy.mk | 4 ++++
 1 file changed, 4 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com