From: Francis Dupont <fdupont@isc.org>
Date: Tue, 25 Sep 2018 10:38:22 +0000 (+0200)
Subject: [65-libyang-config-build] Added uses of SYSREPO_REPO
X-Git-Tag: 65-libyang-class_base~1^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0fb788847d0ac52d14e8a66aed542e5c30d8a37;p=thirdparty%2Fkea.git

[65-libyang-config-build] Added uses of SYSREPO_REPO
---

diff --git a/doc/guide/netconf.xml b/doc/guide/netconf.xml
index 572b24f708..afd01c7c67 100644
--- a/doc/guide/netconf.xml
+++ b/doc/guide/netconf.xml
@@ -134,8 +134,8 @@ sudo sysrepoctl -i -s /home/thomson/devel/sysrepo-0.7.5/build/repository/yang -s
 
 Note the first -s parameter specifies the location of your YANG schema
 repository. You can check it with sysrepoctl -l. This is a parameter that is
-configured during sysrepo compilation.
-<!-- will be fixed soon -->
+configured during sysrepo compilation and is detected by Kea configure
+under the SYSREPO_REPO name.
 
 The installation should look similar to the following:
 <screen>
diff --git a/src/lib/yang/pretests/Makefile.am b/src/lib/yang/pretests/Makefile.am
index a3d841dabc..ef4f486367 100644
--- a/src/lib/yang/pretests/Makefile.am
+++ b/src/lib/yang/pretests/Makefile.am
@@ -2,7 +2,7 @@ CLEANFILES = *.gcno *.gcda
 
 TESTS = sysrepo_setup_tests
 sysrepo_setup_tests_SOURCES = sysrepo_setup_tests.cc
-sysrepo_setup_tests_CPPFLAGS = $(SYSREPO_CPPFLAGS)
+sysrepo_setup_tests_CPPFLAGS = $(SYSREPO_CPPFLAGS) -DSYSREPO_REPO=\"@SYSREPO_REPO@\"
 sysrepo_setup_tests_LDFLAGS = $(AM_LDFLAGS)
 sysrepo_setup_tests_LDADD = $(SYSREPO_LIBS)
 
diff --git a/src/lib/yang/pretests/sysrepo_setup_tests.cc b/src/lib/yang/pretests/sysrepo_setup_tests.cc
index defb9d289c..7a4e592c48 100644
--- a/src/lib/yang/pretests/sysrepo_setup_tests.cc
+++ b/src/lib/yang/pretests/sysrepo_setup_tests.cc
@@ -19,8 +19,7 @@ const string KEA_DHCP4_MODULE = "kea-dhcp4-server";
 const string KEA_DHCP6_MODULE = "kea-dhcp6-server";
 const string KEA_CTRL_AGENT_MODULE = "kea-ctrl-agent";
 const string KEA_D2_MODULE = "kea-dhcp-ddns";
-// const string REPOSITORY = SYSREPO_REPO;
-const string REPOSITORY = "<sysrepo repository>";
+const string REPOSITORY = SYSREPO_REPO;
 
 /// @brief Returns nicely formed error message if module is missing
 ///
diff --git a/src/lib/yang/yang.dox b/src/lib/yang/yang.dox
index ecd2077686..60c03709a8 100644
--- a/src/lib/yang/yang.dox
+++ b/src/lib/yang/yang.dox
@@ -101,9 +101,6 @@ sysrepoctl -l
 Make sure that keatest-module is on the list.
 */
 
-To install standard module dependency, look for ietf-inet-types and
-ietf-yang-types YANG files in the libyang distribution.
-
 Note as DHCP modules are still being developed it can be useful to
 deinstall them before reinstalling a more recent version vy:
 @verbatim
@@ -117,6 +114,9 @@ of keatest-module:
  - kea-dhcp-ddns
  - kea-dhcp4-server
  - kea-dhcp6-server
+Dependencies are:
+ - ietf-inet-types
+ - ietf-yang-types
 
 To finish the sysrepod daemon must run as root:
 @verbatim