Error when updating

[gennapium]

Hi,

I am trying to update my beta version but get this error:

/domoticz$ git pull
Updating fe8d04d..dceedb4
error: Your local changes to the following files would be overwritten by merge:
hardware/1Wire/1WireCommon.h
Please, commit your changes or stash them before you can merge.
Aborting


Can anyone help me with this ?

[Flopp]

How did you update it?

I normally update from Setup menu.

From what version to what version are you trying to update?

[gennapium]

I do the update when logging in with putty, stop the domoticz server and give the "git pul"l command. This has Always worked fine.
But at the moment is is buiding after the "make" command so it is looking good i guess.I found a solotion on the internet that seems to be working.

Not working, i get this error:


domoticz@dmserver:~/domoticz$ make
[ 1%] Built target sqlite
[ 15%] Built target lua
-- Found Git: /usr/bin/git (found version "1.9.1")
[ 15%] Built target revisiontag
[ 23%] Built target mqtt
[ 23%] Built target domoticz_gch
Linking CXX executable domoticz
CMakeFiles/domoticz.dir/main/mainworker.cpp.o: In function `MainWorker::AddHardwareFromParams(int, std::string const&, bool, _eHardwareTypes, std::string const&, unsigned short, std::string const&, std::string const&, std::string const&, std::string const&, int, int, int, int, int, int, int, bool)':
mainworker.cpp:(.text+0x2b3e7): undefined reference to `CDaikin::CDaikin(int, std::string const&, unsigned short, std::string const&, std::string const&)'
collect2: error: ld returned 1 exit status
make[2]: *** [domoticz] Error 1
make[1]: *** [CMakeFiles/domoticz.dir/all] Error 2
make: *** [all] Error 2


Anyone ?

[Flopp]

If Domoticz is still working you can try to update from Domotiz Setup menu.

[gennapium]

Domoticz is not running anymore

[gennapium]

A new installation is giving this error:

-- Found Git: /usr/bin/git (found version "1.9.1")
[ 0%] Built target revisiontag
[ 14%] Built target lua
[ 15%] Built target sqlite
[ 15%] Built target domoticz_gch
[ 23%] Built target mqtt
Linking CXX executable domoticz
CMakeFiles/domoticz.dir/main/mainworker.cpp.o: In function `MainWorker::AddHardwareFromParams(int, std::string const&, bool, _eHardwareTypes, std::string const&, unsigned short, std::string const&, std::string const&, std::string const&, std::string const&, int, int, int, int, int, int, int, bool)':
mainworker.cpp:(.text+0x2b3e7): undefined reference to `CDaikin::CDaikin(int, std::string const&, unsigned short, std::string const&, std::string const&)'
collect2: error: ld returned 1 exit status
make[2]: *** [domoticz] Error 1
make[1]: *** [CMakeFiles/domoticz.dir/all] Error 2
make: *** [all] Error 2

[gennapium]

Anyone ?

[Sneezydevil]

You are not the first one today I heard about not being able to compile.

Maybe you can checkout the last commit before the implementation of Daikin.

git checkout 26e9b48

Then try compiling again.

[gennapium]

Thanks a lot Sneezydevil, that did the trick. Now compiling is working again.

[Sneezydevil]

Nice, remember to go back to the master when updating the next time.

git checkout master

That should do the trick.

[remb0]

already fixed. I see a fix for the daikin.

[thecosmicgate]

same /again an updare issue :

Code: Select all

Updating to server revision...
Fetching origin
HEAD is now at 9d81b24 Removed debug in Daikin module
-- Using builtin Mosquitto library
-- Compiling Revision #5770
-- Boost version: 1.61.0
-- Found the following Boost libraries:
--   thread
--   date_time
--   system
--   chrono
--   atomic
-- Linking against boost static libraries
-- ZLIB libraries found at: /usr/lib/x86_64-linux-gnu/libz.so
-- ZLIB includes found at: /usr/include
-- Curl libraries found at: /usr/lib/x86_64-linux-gnu/libcurl.so
-- Curl includes found at: /usr/include
-- LIBUSB found at: /usr/lib/x86_64-linux-gnu/libusb.so
-- /home/pim/open-zwave-read-only/libopenzwave.a
-- /usr/lib/x86_64-linux-gnu/libudev.so
-- ==== WiringPi include file (wiringPi.h) not found. GPIO support disabled.
-- ==== (Please follow http://wiringpi.com/download-and-install/ if you want to use GPIO.)
-- Not found telldus-core (telldus-core.h), not adding tellstick support
CMake Warning (dev) at CMakeLists.txt:151 (GET_DIRECTORY_PROPERTY):
  Policy CMP0059 is not set: Do no treat DEFINITIONS as a built-in directory
  property.  Run "cmake --help-policy CMP0059" for policy details.  Use the
  cmake_policy command to set the policy and suppress this warning.
Call Stack (most recent call first):
  CMakeLists.txt:608 (ADD_PRECOMPILED_HEADER)
This warning is for project developers.  Use -Wno-dev to suppress it.

/usr/bin/c++  ;-O3;-DNDEBUG;-I/home/pim/domoticz/main;-I/usr/include;-I/usr/include;-I/usr/include;-I/usr/include;-I/home/pim/domoticz/hardware/openzwave;;-DBUILTIN_MQTT;-DHAVE_EXECINFO_H;-DWITH_LIBUSB;-DWWW_ENABLE_SSL;-DWITH_OPENZWAVE -x c++-header -o /home/pim/domoticz/stdafx.h.gch/.c++ /home/pim/domoticz/main/stdafx.h
-- Using static libgcc/libstdc++
-- Configuring done
-- Generating done
-- Build files have been written to: /home/pim/domoticz
[  1%] Built target sqlite
-- Found Git: /usr/bin/git (found version "2.9.3")

...................................


[ 27%] Building CXX object CMakeFiles/domoticz.dir/hardware/ZWaveBase.cpp.o
cc1plus: warning: ./stdafx.h.gch/.c++: created by a different GCC executable
make[2]: *** No rule to make target '/usr/lib/x86_64-linux-gnu/libudev.so', needed by 'domoticz'.  Stop.
CMakeFiles/Makefile2:103: recipe for target 'CMakeFiles/domoticz.dir/all' failed
make[1]: *** [CMakeFiles/domoticz.dir/all] Error 2
Makefile:149: recipe for target 'all' failed

[thecosmicgate]

Still getting this error when try to build 5776 , somebody who can help me to solve this ?

[thecosmicgate]

trying to build version 3.5837, but still :

Code: Select all

Updating to server revision...
Fetching origin
remote: Counting objects: 218, done.
remote: Compressing objects: 100% (110/110), done.
remote: Total 218 (delta 100), reused 68 (delta 68), pack-reused 39
Receiving objects: 100% (218/218), 1.40 MiB | 245.00 KiB/s, done.
Resolving deltas: 100% (110/110), completed with 34 local objects.
From https://github.com/domoticz/domoticz
   ee1170c..591a669  master     -> origin/master
   79e9201..0e830cc  Websockets-refactored -> origin/Websockets-refactored
 * [new tag]         3.5837     -> 3.5837
 * [new tag]         3.5834     -> 3.5834
HEAD is now at 591a669 - Fixed: Blockly/Lua, FOR and RANDOM are now again in minutes (Fixes commit #927)
-- Using builtin Mosquitto library
-- Compiling Revision #5837
-- Boost version: 1.61.0
-- Found the following Boost libraries:
--   thread
--   date_time
--   system
--   chrono
--   atomic
-- Linking against boost static libraries
-- ZLIB libraries found at: /usr/lib/x86_64-linux-gnu/libz.so
-- ZLIB includes found at: /usr/include
-- Curl libraries found at: /usr/lib/x86_64-linux-gnu/libcurl.so
-- Curl includes found at: /usr/include
-- LIBUSB found at: /usr/lib/x86_64-linux-gnu/libusb.so
-- /home/pim/open-zwave-read-only/libopenzwave.a
-- /usr/lib/x86_64-linux-gnu/libudev.so
-- ==== WiringPi include file (wiringPi.h) not found. GPIO support disabled.
-- ==== (Please follow http://wiringpi.com/download-and-install/ if you want to use GPIO.)
-- Not found telldus-core (telldus-core.h), not adding tellstick support
CMake Warning (dev) at CMakeLists.txt:151 (GET_DIRECTORY_PROPERTY):
  Policy CMP0059 is not set: Do no treat DEFINITIONS as a built-in directory
  property.  Run "cmake --help-policy CMP0059" for policy details.  Use the
  cmake_policy command to set the policy and suppress this warning.
Call Stack (most recent call first):
  CMakeLists.txt:609 (ADD_PRECOMPILED_HEADER)
This warning is for project developers.  Use -Wno-dev to suppress it.

/usr/bin/c++  ;-O3;-DNDEBUG;-I/home/pim/domoticz/main;-I/usr/include;-I/usr/include;-I/usr/include;-I/usr/include;-I/home/pim/domoticz/hardware/openzwave;;-DBUILTIN_MQTT;-DHAVE_EXECINFO_H;-DWITH_LIBUSB;-DWWW_ENABLE_SSL;-DWITH_OPENZWAVE -x c++-header -o /home/pim/domoticz/stdafx.h.gch/.c++ /home/pim/domoticz/main/stdafx.h
-- Using static libgcc/libstdc++
-- Configuring done
-- Generating done
-- Build files have been written to: /home/pim/domoticz
[  1%] Built target sqlite
-- Found Git: /usr/bin/git (found version "2.9.3")
[  1%] Built target revisiontag
[  2%] Built target domoticz_gch
[ 16%] Built target lua
[ 24%] Built target mqtt


....

cc1plus: warning: ./stdafx.h.gch/.c++: created by a different GCC executable
[ 69%] Building CXX object CMakeFiles/domoticz.dir/tcpserver/TCPServer.cpp.o
cc1plus: warning: ./stdafx.h.gch/.c++: created by a different GCC executable
[ 69%] Building CXX object CMakeFiles/domoticz.dir/webserver/proxyclient.cpp.o
cc1plus: warning: ./stdafx.h.gch/.c++: created by a different GCC executable
make[2]: *** No rule to make target '/usr/lib/x86_64-linux-gnu/libudev.so', needed by 'domoticz'.  Stop.
CMakeFiles/Makefile2:103: recipe for target 'CMakeFiles/domoticz.dir/all' failed
make[1]: *** [CMakeFiles/domoticz.dir/all] Error 2
Makefile:149: recipe for target 'all' failed
make: *** [all] Error 2
Compile failed!

What can i do to solve this ?

[jumbotroll]

trying to build version 3.5837, but still :

Code: Select all

Updating to server revision...
Fetching origin
remote: Counting objects: 218, done.
remote: Compressing objects: 100% (110/110), done.
remote: Total 218 (delta 100), reused 68 (delta 68), pack-reused 39
Receiving objects: 100% (218/218), 1.40 MiB | 245.00 KiB/s, done.
Resolving deltas: 100% (110/110), completed with 34 local objects.
From https://github.com/domoticz/domoticz
   ee1170c..591a669  master     -> origin/master
   79e9201..0e830cc  Websockets-refactored -> origin/Websockets-refactored
 * [new tag]         3.5837     -> 3.5837
 * [new tag]         3.5834     -> 3.5834
HEAD is now at 591a669 - Fixed: Blockly/Lua, FOR and RANDOM are now again in minutes (Fixes commit #927)
-- Using builtin Mosquitto library
-- Compiling Revision #5837
-- Boost version: 1.61.0
-- Found the following Boost libraries:
--   thread
--   date_time
--   system
--   chrono
--   atomic
-- Linking against boost static libraries
-- ZLIB libraries found at: /usr/lib/x86_64-linux-gnu/libz.so
-- ZLIB includes found at: /usr/include
-- Curl libraries found at: /usr/lib/x86_64-linux-gnu/libcurl.so
-- Curl includes found at: /usr/include
-- LIBUSB found at: /usr/lib/x86_64-linux-gnu/libusb.so
-- /home/pim/open-zwave-read-only/libopenzwave.a
-- /usr/lib/x86_64-linux-gnu/libudev.so
-- ==== WiringPi include file (wiringPi.h) not found. GPIO support disabled.
-- ==== (Please follow http://wiringpi.com/download-and-install/ if you want to use GPIO.)
-- Not found telldus-core (telldus-core.h), not adding tellstick support
CMake Warning (dev) at CMakeLists.txt:151 (GET_DIRECTORY_PROPERTY):
  Policy CMP0059 is not set: Do no treat DEFINITIONS as a built-in directory
  property.  Run "cmake --help-policy CMP0059" for policy details.  Use the
  cmake_policy command to set the policy and suppress this warning.
Call Stack (most recent call first):
  CMakeLists.txt:609 (ADD_PRECOMPILED_HEADER)
This warning is for project developers.  Use -Wno-dev to suppress it.

/usr/bin/c++  ;-O3;-DNDEBUG;-I/home/pim/domoticz/main;-I/usr/include;-I/usr/include;-I/usr/include;-I/usr/include;-I/home/pim/domoticz/hardware/openzwave;;-DBUILTIN_MQTT;-DHAVE_EXECINFO_H;-DWITH_LIBUSB;-DWWW_ENABLE_SSL;-DWITH_OPENZWAVE -x c++-header -o /home/pim/domoticz/stdafx.h.gch/.c++ /home/pim/domoticz/main/stdafx.h
-- Using static libgcc/libstdc++
-- Configuring done
-- Generating done
-- Build files have been written to: /home/pim/domoticz
[  1%] Built target sqlite
-- Found Git: /usr/bin/git (found version "2.9.3")
[  1%] Built target revisiontag
[  2%] Built target domoticz_gch
[ 16%] Built target lua
[ 24%] Built target mqtt


....

cc1plus: warning: ./stdafx.h.gch/.c++: created by a different GCC executable
[ 69%] Building CXX object CMakeFiles/domoticz.dir/tcpserver/TCPServer.cpp.o
cc1plus: warning: ./stdafx.h.gch/.c++: created by a different GCC executable
[ 69%] Building CXX object CMakeFiles/domoticz.dir/webserver/proxyclient.cpp.o
cc1plus: warning: ./stdafx.h.gch/.c++: created by a different GCC executable
make[2]: *** No rule to make target '/usr/lib/x86_64-linux-gnu/libudev.so', needed by 'domoticz'.  Stop.
CMakeFiles/Makefile2:103: recipe for target 'CMakeFiles/domoticz.dir/all' failed
make[1]: *** [CMakeFiles/domoticz.dir/all] Error 2
Makefile:149: recipe for target 'all' failed
make: *** [all] Error 2
Compile failed!

What can i do to solve this ?

Try to install libudev-dev before compiling.
sudo apt-get install libudev-dev

[thecosmicgate]

trying to build version 3.5837, but still :

Code: Select all

Updating to server revision...
Fetching origin
remote: Counting objects: 218, done.
remote: Compressing objects: 100% (110/110), done.
remote: Total 218 (delta 100), reused 68 (delta 68), pack-reused 39
Receiving objects: 100% (218/218), 1.40 MiB | 245.00 KiB/s, done.
Resolving deltas: 100% (110/110), completed with 34 local objects.
From https://github.com/domoticz/domoticz
   ee1170c..591a669  master     -> origin/master
   79e9201..0e830cc  Websockets-refactored -> origin/Websockets-refactored
 * [new tag]         3.5837     -> 3.5837
 * [new tag]         3.5834     -> 3.5834
HEAD is now at 591a669 - Fixed: Blockly/Lua, FOR and RANDOM are now again in minutes (Fixes commit #927)
-- Using builtin Mosquitto library
-- Compiling Revision #5837
-- Boost version: 1.61.0
-- Found the following Boost libraries:
--   thread
--   date_time
--   system
--   chrono
--   atomic
-- Linking against boost static libraries
-- ZLIB libraries found at: /usr/lib/x86_64-linux-gnu/libz.so
-- ZLIB includes found at: /usr/include
-- Curl libraries found at: /usr/lib/x86_64-linux-gnu/libcurl.so
-- Curl includes found at: /usr/include
-- LIBUSB found at: /usr/lib/x86_64-linux-gnu/libusb.so
-- /home/pim/open-zwave-read-only/libopenzwave.a
-- /usr/lib/x86_64-linux-gnu/libudev.so
-- ==== WiringPi include file (wiringPi.h) not found. GPIO support disabled.
-- ==== (Please follow http://wiringpi.com/download-and-install/ if you want to use GPIO.)
-- Not found telldus-core (telldus-core.h), not adding tellstick support
CMake Warning (dev) at CMakeLists.txt:151 (GET_DIRECTORY_PROPERTY):
  Policy CMP0059 is not set: Do no treat DEFINITIONS as a built-in directory
  property.  Run "cmake --help-policy CMP0059" for policy details.  Use the
  cmake_policy command to set the policy and suppress this warning.
Call Stack (most recent call first):
  CMakeLists.txt:609 (ADD_PRECOMPILED_HEADER)
This warning is for project developers.  Use -Wno-dev to suppress it.

/usr/bin/c++  ;-O3;-DNDEBUG;-I/home/pim/domoticz/main;-I/usr/include;-I/usr/include;-I/usr/include;-I/usr/include;-I/home/pim/domoticz/hardware/openzwave;;-DBUILTIN_MQTT;-DHAVE_EXECINFO_H;-DWITH_LIBUSB;-DWWW_ENABLE_SSL;-DWITH_OPENZWAVE -x c++-header -o /home/pim/domoticz/stdafx.h.gch/.c++ /home/pim/domoticz/main/stdafx.h
-- Using static libgcc/libstdc++
-- Configuring done
-- Generating done
-- Build files have been written to: /home/pim/domoticz
[  1%] Built target sqlite
-- Found Git: /usr/bin/git (found version "2.9.3")
[  1%] Built target revisiontag
[  2%] Built target domoticz_gch
[ 16%] Built target lua
[ 24%] Built target mqtt


....

cc1plus: warning: ./stdafx.h.gch/.c++: created by a different GCC executable
[ 69%] Building CXX object CMakeFiles/domoticz.dir/tcpserver/TCPServer.cpp.o
cc1plus: warning: ./stdafx.h.gch/.c++: created by a different GCC executable
[ 69%] Building CXX object CMakeFiles/domoticz.dir/webserver/proxyclient.cpp.o
cc1plus: warning: ./stdafx.h.gch/.c++: created by a different GCC executable
make[2]: *** No rule to make target '/usr/lib/x86_64-linux-gnu/libudev.so', needed by 'domoticz'.  Stop.
CMakeFiles/Makefile2:103: recipe for target 'CMakeFiles/domoticz.dir/all' failed
make[1]: *** [CMakeFiles/domoticz.dir/all] Error 2
Makefile:149: recipe for target 'all' failed
make: *** [all] Error 2
Compile failed!

What can i do to solve this ?

Try to install libudev-dev before compiling.
sudo apt-get install libudev-dev

done :

Code: Select all

Reading package lists... Done
Building dependency tree
Reading state information... Done
libudev-dev is already the newest version (231-9git1).
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.

[thecosmicgate]

So I still didn't solve this ? Are there any more clue's?