| Message ID | 20180911195802.6847-1-pieterjan.camerlynck@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/1] synergy: fix resolving of Buildroot git revision | expand |
Hello, On Tue, 11 Sep 2018 21:58:02 +0200, Pieterjan Camerlynck wrote: > 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> > --- > Changes v1 -> v2: > - change author email address > --- > package/synergy/synergy.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas
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
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> --- Changes v1 -> v2: - change author email address --- package/synergy/synergy.mk | 4 ++++ 1 file changed, 4 insertions(+)