experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

YANG_INSTALLDIR fixes

Browse source
This commit is contained in:
Olof hagsand 2019-06-05 17:53:08 +02:00
parent 88b0db3e95
commit ee863e5dbd
5 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/FAQ.md
View file

@ -305,7 +305,7 @@ The following configuration file options control the loading of Yang files:
- `CLICON_YANG_MODULE_REVISION` : Specifies a revision to the main module. - `CLICON_YANG_MODULE_REVISION` : Specifies a revision to the main module.
- `CLICON_YANG_MAIN_DIR` - Load all yang modules in this directory. - `CLICON_YANG_MAIN_DIR` - Load all yang modules in this directory.
Note that the special `CLIXON_DATADIR`, by default `/usr/local/share/clixon` should be included in the yang dir path for Clixon system files to be found. Note that the special `YANG_INSTALLDIR`, by default `/usr/local/share/clixon` should be included in the yang dir path for Clixon system files to be found.
You can combine the options, however, if there are different variants You can combine the options, however, if there are different variants
of the same module, more specific options override less of the same module, more specific options override less

4
example/hello/Makefile.in
View file

@ -45,7 +45,7 @@ libdir = @exec_prefix@/lib
APPNAME = hello APPNAME = hello
# Here is where example yang appears # Here is where example yang appears
CLIXON_DATADIR = @CLIXON_DATADIR@ YANG_INSTALLDIR = @YANG_INSTALLDIR@
# Install here if you want default clixon location: # Install here if you want default clixon location:
CLIXON_DEFAULT_CONFIG = @CLIXON_DEFAULT_CONFIG@ CLIXON_DEFAULT_CONFIG = @CLIXON_DEFAULT_CONFIG@
@ -125,7 +125,7 @@ install: $(YANGSPECS) $(CLISPECS) $(PLUGINS) $(APPNAME).xml
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/clispec install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/clispec
install -m 0644 $(CLISPECS) $(DESTDIR)$(libdir)/$(APPNAME)/clispec install -m 0644 $(CLISPECS) $(DESTDIR)$(libdir)/$(APPNAME)/clispec
install -d -m 0755 $(DESTDIR)$(datarootdir)/$(APPNAME)/yang install -d -m 0755 $(DESTDIR)$(datarootdir)/$(APPNAME)/yang
install -m 0644 $(YANGSPECS) $(DESTDIR)$(DESTDIR)$(CLIXON_DATADIR) install -m 0644 $(YANGSPECS) $(DESTDIR)$(DESTDIR)$(YANG_INSTALLDIR)
install -d -m 0755 $(DESTDIR)$(localstatedir)/$(APPNAME) install -d -m 0755 $(DESTDIR)$(localstatedir)/$(APPNAME)
# Uncomment for installing config file in /usr/local/etc instead # Uncomment for installing config file in /usr/local/etc instead

4
example/main/Makefile.in
View file

@ -44,7 +44,7 @@ libdir = @exec_prefix@/lib
APPNAME = example APPNAME = example
# Here is where example yang appears # Here is where example yang appears
CLIXON_DATADIR = @CLIXON_DATADIR@ YANG_INSTALLDIR = @YANG_INSTALLDIR@
# Install here if you want default clixon location: # Install here if you want default clixon location:
CLIXON_DEFAULT_CONFIG = @CLIXON_DEFAULT_CONFIG@ CLIXON_DEFAULT_CONFIG = @CLIXON_DEFAULT_CONFIG@
@ -129,7 +129,7 @@ install: $(YANGSPECS) $(CLISPECS) $(PLUGINS) $(APPNAME).xml
install -m 0644 $(APPNAME).xml $(DESTDIR)$(sysconfdir) install -m 0644 $(APPNAME).xml $(DESTDIR)$(sysconfdir)
# install -m 0644 $(APPNAME).xml $(DESTDIR)$(CLIXON_DEFAULT_CONFIG) # install -m 0644 $(APPNAME).xml $(DESTDIR)$(CLIXON_DEFAULT_CONFIG)
install -d -m 0755 $(DESTDIR)$(datarootdir)/$(APPNAME)/yang install -d -m 0755 $(DESTDIR)$(datarootdir)/$(APPNAME)/yang
install -m 0644 $(YANGSPECS) $(DESTDIR)$(DESTDIR)$(CLIXON_DATADIR) install -m 0644 $(YANGSPECS) $(DESTDIR)$(DESTDIR)$(YANG_INSTALLDIR)
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/cli install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/cli
install -m 0644 $(INSTALLFLAGS) $(CLI_PLUGIN) $(DESTDIR)$(libdir)/$(APPNAME)/cli install -m 0644 $(INSTALLFLAGS) $(CLI_PLUGIN) $(DESTDIR)$(libdir)/$(APPNAME)/cli
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/backend install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/backend

2
yang/Makefile.in
View file

@ -39,8 +39,6 @@ includedir = @includedir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
enable_stdyangs = @enable_stdyangs@ enable_stdyangs = @enable_stdyangs@
CLIXON_DATADIR = @CLIXON_DATADIR@
SUBDIRS = clixon SUBDIRS = clixon
# See configure.ac # See configure.ac
ifeq ($(enable_stdyangs),yes) ifeq ($(enable_stdyangs),yes)

2
yang/clixon/clixon-config@2019-06-05.yang
View file

@ -205,7 +205,7 @@ module clixon-config {
"Yang directory path for finding module and submodule files. "Yang directory path for finding module and submodule files.
A list of these options should be in the configuration. A list of these options should be in the configuration.
When loading a Yang module, Clixon searches this list in the order When loading a Yang module, Clixon searches this list in the order
they appear. Ensure that CLIXON_DATADIR(default they appear. Ensure that YANG_INSTALLDIR(default
/usr/local/share/clixon) is present in the path"; /usr/local/share/clixon) is present in the path";
} }
leaf CLICON_YANG_MAIN_FILE { leaf CLICON_YANG_MAIN_FILE {