mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

Revert "[master] Revert "[#584,!338] Only install YANG and netconf files with --with-sysrepo""

Browse Source 
This reverts commit fa96b8d337.
This commit is contained in:
Michal Nowikowski
2019-05-27 22:53:51 +02:00
parent fa96b8d337
commit a2d6442aa0
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,11 +1,16 @@
1586. [build] razvan, marcin
1587. [build] razvan, marcin
Bumped up libraries version numbers for Kea 1.6.0 beta release.
(Gitlab #617,!340, git c0434bf882b6ec483120e39f6b70b5a40fe7c711)
1585. [bug, func] marcin
1586. [bug, func] marcin
MySQL Configuration Backend supports DHCPv6 interface-id parameter.
(Gitlab #628,!341, git 3a07c636ba4c7fceabe59ec597c44a9c8e3367eb)
1585. [build] tmark
Files related to YANG and netconf are now only installed
when the build is configured with --with-syspro.
(Gitlab #584,!338, git 882022ce95006b051d0d17f8e5fdf4f3571b8ae2)
1584. [doc] marcin
Documented Kea Configuration Backend in the Kea Administrator
Reference Manual.

5
doc/Makefile.am
View File

@@ -68,9 +68,7 @@ nobase_dist_doc_DATA += examples/kea6/softwire46.json
nobase_dist_doc_DATA += examples/kea6/stateless.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
if HAVE_SYSREPO
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
@@ -80,6 +78,7 @@ nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/twosubnets.xml
nobase_dist_doc_DATA += examples/netconf/comments.json
nobase_dist_doc_DATA += examples/netconf/simple-dhcp4.json
nobase_dist_doc_DATA += examples/netconf/simple-dhcp6.json
endif
# These are files that document our APIs. They're not really needed as the
# content is included in the api.xml, but may be useful for people who

13
src/bin/keactrl/Makefile.am
View File

@@ -6,7 +6,12 @@ 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
@@ -17,6 +22,10 @@ EXTRA_DIST = keactrl.in keactrl.conf.in kea-dhcp4.conf.pre \
kea-ctrl-agent.conf.pre \
$(man_MANS) keactrl.xml
if HAVE_SYSREPO
EXTRA_DIST += kea-netconf.conf.pre
endif
# *.conf files are not really sources used for building other targets, but we need
# these files to be generated before make install is called.
BUILT_SOURCES = $(KEA_CONFIGFILES)
@@ -51,9 +60,11 @@ kea-ctrl-agent.conf: kea-ctrl-agent.conf.pre
$(top_builddir)/tools/path_replacer.sh \
$(top_srcdir)/src/bin/keactrl/kea-ctrl-agent.conf.pre $@
if HAVE_SYSREPO
kea-netconf.conf: kea-netconf.conf.pre
$(top_builddir)/tools/path_replacer.sh \
$(top_srcdir)/src/bin/keactrl/kea-netconf.conf.pre $@
endif
if INSTALL_CONFIGURATIONS

7
src/share/Makefile.am
View File

@@ -1 +1,6 @@
SUBDIRS = database yang
SUBDIRS = database
if HAVE_SYSREPO
SUBDIRS += yang
endif