[#2049] some fixes for NETCONF build

diff --git a/hammer.py b/hammer.py
index 108ba9d9771dd951e489546032c7c6b9d68ff3ee..54be685195977910852352e51b5e3eacaaff1977 100755 (executable)
--- a/hammer.py
+++ b/hammer.py
@@ -1057,7 +1057,7 @@ def _install_sysrepo_from_sources():
         execute('git clone https://github.com/sysrepo/sysrepo.git /tmp/sysrepo')
         execute('git checkout v%s' % sysrepo_version, cwd='/tmp/sysrepo')
         execute('mkdir /tmp/sysrepo/build')
-        execute('cmake .. -DGEN_CPP_BINDINGS=ON -DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_BINDINGS=OFF', cwd='/tmp/sysrepo/build')
+        execute('cmake .. -DGEN_CPP_BINDINGS=ON -DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_BINDINGS=OFF -DREPO_PATH=/etc/sysrepo', cwd='/tmp/sysrepo/build')
         execute('make -j $(nproc || gnproc || echo 1)', cwd='/tmp/sysrepo/build')
         execute('sudo make install', cwd='/tmp/sysrepo/build')
     finally:

diff --git a/src/share/yang/modules/utils/reinstall.sh.in b/src/share/yang/modules/utils/reinstall.sh.in
index 2cff5fd988d59664139f07017d2c7ce4cc0b57d5..ed9f7cfc1662a21f775fc528515734c2fb67e141 100644 (file)
--- a/src/share/yang/modules/utils/reinstall.sh.in
+++ b/src/share/yang/modules/utils/reinstall.sh.in
@@ -86,7 +86,7 @@ if test -z "${modules+x}"; then
 fi
 
 # sysrepoctl does not set its rpath. Set LD_LIBRARY_PATH instead.
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH-}:${sysrepo}/lib"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH-}:${sysrepo}/lib:${sysrepo}/lib64"
 
 # Check if model is installed.
 is_model_installed() {