Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
df0c714a
Commit
df0c714a
authored
May 27, 2019
by
Michal Nowikowski
Browse files
Revert "[#584,!338] Only install YANG and netconf files with --with-sysrepo"
This reverts commit
b25b3032
.
parent
f301de25
Changes
4
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
df0c714a
158
7
. [build] razvan, marcin
158
6
. [build] razvan, marcin
Bumped up libraries version numbers for Kea 1.6.0 beta release.
(Gitlab #617,!340, git c0434bf882b6ec483120e39f6b70b5a40fe7c711)
158
6
. [bug, func] marcin
158
5
. [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 )
1584. [doc] marcin
Documented Kea Configuration Backend in the Kea Administrator
Reference Manual.
...
...
@@ -27,6 +22,7 @@
will now be trimmed of any trailing null bytes (0x0).
(Gitlab #539, !330, git b126558e9e39e9bff517dceac25a00e96d150085)
1581. [bug] marcin
Corrected a bug whereby the DHCPv6 server did not take into
account a relay address specified at the shared network level
...
...
doc/Makefile.am
View file @
df0c714a
...
...
@@ -67,8 +67,6 @@ nobase_dist_doc_DATA += examples/kea6/simple.json
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
if
HAVE_SYSREPO
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
...
...
@@ -81,7 +79,6 @@ 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
...
...
src/bin/keactrl/Makefile.am
View file @
df0c714a
...
...
@@ -6,12 +6,7 @@ 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
if
HAVE_SYSREPO
KEA_CONFIGFILES
+=
kea-netconf.conf
endif
kea-ctrl-agent.conf kea-netconf.conf
CONFIGFILES
=
keactrl.conf
$(KEA_CONFIGFILES)
man_MANS
=
keactrl.8
...
...
@@ -22,10 +17,6 @@ EXTRA_DIST = keactrl.in keactrl.conf.in kea-dhcp4.conf.pre \
kea-ctrl-agent.conf.pre kea-netconf.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)
...
...
@@ -60,11 +51,9 @@ 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
...
...
src/share/Makefile.am
View file @
df0c714a
SUBDIRS
=
database
if
HAVE_SYSREPO
SUBDIRS
+=
yang
endif
SUBDIRS
=
database yang
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment