From 350ae513ed4e8e8e07b159658f88ec7d70b644d3 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Thu, 6 Jun 2019 12:56:42 -0400 Subject: [PATCH] [#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 --- ChangeLog | 5 ++++ doc/Makefile.am | 3 --- src/bin/keactrl/Makefile.am | 6 ++++- src/share/yang/modules/Makefile.am | 37 +++++++++++++++++------------- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ef40655a9..d533d36769 100644 --- 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 4be49d0560..2478778f1d 100644 --- 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 9851f58f5e..f8a1d569e4 100644 --- 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 576ecbf920..5e61c9a1f6 100644 --- 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} -- 2.47.2