[#584,!364] only install yang modules and kea-netconf.conf only for sysrepo

Added ChangeLog entry

doc/Makefile.am
    Removed netconf BAD example configs

src/bin/keactrl/Makefile.am
    Only install kea-netconf.conf when sysrepo is enabled

src/share/yang/modules/Makefile.am
    Only install yang modules when sysrepo is enabled

diff --git a/ChangeLog b/ChangeLog
index 7ef40655a9134d407e0568f61186c13436b41de3..d533d36769bd40f0a280e4e7c4d3734416724036 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1592.  [build]         tmark
+       Files related to YANG and netconf are now only installed
+       when the build is configured with --with-syspro.
+       (Gitlab #584,!364, git TBD)
+
 1591.  [doc]           razvan
        Fixed classify and pd-exclude documentation examples.
        (Gitlab #590,!380, git 26b04d2d2d2a88be6abc5879a2fb48e05f0003fd)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4be49d0560c1c59acb28eec9b7395a213b89a600..2478778f1d1f4cf705f93018b6c7f3f3a9003303 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -68,9 +68,6 @@ nobase_dist_doc_DATA += examples/kea6/softwire46.json
 nobase_dist_doc_DATA += examples/kea6/stateless.json
 nobase_dist_doc_DATA += examples/kea6/tee-times.json
 nobase_dist_doc_DATA += examples/kea6/with-ddns.json
-nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-config.xml
-nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-schema.xml
-nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-translator.xml
 nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/boot.json
 nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/logging.xml
 nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/netconf.json

diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am
index 9851f58f5ecd9ddc09f066ee2ee9b48845a2d93f..f8a1d569e48ccc63694e00c3784562dc60b76911 100644 (file)
--- a/src/bin/keactrl/Makefile.am
+++ b/src/bin/keactrl/Makefile.am
@@ -6,7 +6,11 @@ SUBDIRS = . tests
 # setting KEACTRL_CONF environment variable.
 sbin_SCRIPTS  = keactrl
 KEA_CONFIGFILES = kea-dhcp4.conf kea-dhcp6.conf kea-dhcp-ddns.conf \
-                  kea-ctrl-agent.conf kea-netconf.conf
+                  kea-ctrl-agent.conf
+if HAVE_SYSREPO
+KEA_CONFIGFILES += kea-netconf.conf
+endif
+
 CONFIGFILES = keactrl.conf $(KEA_CONFIGFILES)
 
 man_MANS = keactrl.8

diff --git a/src/share/yang/modules/Makefile.am b/src/share/yang/modules/Makefile.am
index 576ecbf920b4028c6e98574cedad008004f7a77c..5e61c9a1f6c830fe6cb4e9f80dd6b6422e53cf6b 100644 (file)
--- a/src/share/yang/modules/Makefile.am
+++ b/src/share/yang/modules/Makefile.am
@@ -1,20 +1,25 @@
 SUBDIRS = .
 
 yangmodulesdir = ${datarootdir}/${PACKAGE_NAME}/yang/modules
-yangmodules_DATA  = ietf-dhcpv6-client@2018-09-04.yang
-yangmodules_DATA += ietf-interfaces@2014-05-08.yang
-yangmodules_DATA += ietf-dhcpv6-options@2018-09-04.yang
-yangmodules_DATA += ietf-dhcpv6-relay@2018-09-04.yang
-yangmodules_DATA += ietf-dhcpv6-server@2018-09-04.yang
-yangmodules_DATA += ietf-dhcpv6-types@2018-09-04.yang
-yangmodules_DATA += ietf-inet-types@2013-07-15.yang
-yangmodules_DATA += ietf-yang-types@2013-07-15.yang
-yangmodules_DATA += kea-ctrl-agent@2018-11-20.yang
-yangmodules_DATA += kea-dhcp-ddns@2018-11-20.yang
-yangmodules_DATA += kea-dhcp-types@2018-11-20.yang
-yangmodules_DATA += kea-dhcp4-server@2018-11-20.yang
-yangmodules_DATA += kea-dhcp6-server@2018-11-20.yang
-yangmodules_DATA += kea-logging@2018-11-20.yang
-yangmodules_DATA += kea-types@2018-11-20.yang
 
-EXTRA_DIST = ${yangmodules_DATA}
+yangmodules_list = ietf-dhcpv6-client@2018-09-04.yang
+yangmodules_list += ietf-interfaces@2014-05-08.yang
+yangmodules_list += ietf-dhcpv6-options@2018-09-04.yang
+yangmodules_list += ietf-dhcpv6-relay@2018-09-04.yang
+yangmodules_list += ietf-dhcpv6-server@2018-09-04.yang
+yangmodules_list += ietf-dhcpv6-types@2018-09-04.yang
+yangmodules_list += ietf-inet-types@2013-07-15.yang
+yangmodules_list += ietf-yang-types@2013-07-15.yang
+yangmodules_list += kea-ctrl-agent@2018-11-20.yang
+yangmodules_list += kea-dhcp-ddns@2018-11-20.yang
+yangmodules_list += kea-dhcp-types@2018-11-20.yang
+yangmodules_list += kea-dhcp4-server@2018-11-20.yang
+yangmodules_list += kea-dhcp6-server@2018-11-20.yang
+yangmodules_list += kea-logging@2018-11-20.yang
+yangmodules_list += kea-types@2018-11-20.yang
+
+if HAVE_SYSREPO
+yangmodules_DATA  = ${yangmodules_list}
+endif
+
+EXTRA_DIST = ${yangmodules_list}