mirror of https://gerrit.osmocom.org/libosmocore
Revert "osmo-config-merge: Add manual page"
This reverts commit 6dd00d876e
.
Unfortunately, it seems older a2x versions don't support "-D" for
manpage generation:
All the osmocom master builds started to fail with:
make[2]: Entering directory '/build/deps/libosmocore/man'
a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc
a2x: WARNING: --destination-dir option is only applicable to HTML based outputs
a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned
non-zero exit status 127
Makefile:545: recipe for target 'osmo-config-merge.8' failed
Change-Id: I0f45362d3e978c328d962a5c0d883eade27b875c
This commit is contained in:
parent
6dd00d876e
commit
40f35212c7
|
@ -81,7 +81,6 @@ doc/gsm
|
||||||
doc/gb
|
doc/gb
|
||||||
doc/html.tar
|
doc/html.tar
|
||||||
doc/*.tag
|
doc/*.tag
|
||||||
man/*.8
|
|
||||||
tags
|
tags
|
||||||
|
|
||||||
src/crc*gen.c
|
src/crc*gen.c
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
|
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
|
||||||
SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests man
|
SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \
|
pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \
|
||||||
|
|
14
configure.ac
14
configure.ac
|
@ -77,19 +77,6 @@ AC_ARG_ENABLE(doxygen,
|
||||||
AC_PATH_PROG(DOXYGEN,doxygen,false)
|
AC_PATH_PROG(DOXYGEN,doxygen,false)
|
||||||
AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes")
|
AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes")
|
||||||
|
|
||||||
AC_ARG_ENABLE([man-doc],
|
|
||||||
[AS_HELP_STRING([--disable-man-doc], [Disable man page documentation])],
|
|
||||||
[ BUILD_MAN=$enableval ], [ BUILD_MAN="yes" ])
|
|
||||||
|
|
||||||
AS_IF([test "x$BUILD_MAN" = "xyes"], [
|
|
||||||
AC_CHECK_PROG(A2X, [a2x], [yes])
|
|
||||||
AS_IF([test "$A2X" != "yes"],
|
|
||||||
[AC_MSG_ERROR([a2x not found, please install asciidoc or use the
|
|
||||||
option --disable-man-doc])])
|
|
||||||
])
|
|
||||||
AM_CONDITIONAL(BUILD_MAN, test "x$BUILD_MAN" = "xyes")
|
|
||||||
AC_SUBST(BUILD_MAN)
|
|
||||||
|
|
||||||
# check for syscal fallback on glibc < 2.25 - can be removed once glibc version requirement is bumped
|
# check for syscal fallback on glibc < 2.25 - can be removed once glibc version requirement is bumped
|
||||||
AC_CHECK_DECLS([SYS_getrandom], [], [], [[#include <sys/syscall.h>]])
|
AC_CHECK_DECLS([SYS_getrandom], [], [], [[#include <sys/syscall.h>]])
|
||||||
|
|
||||||
|
@ -383,7 +370,6 @@ AC_OUTPUT(
|
||||||
libosmoctrl.pc
|
libosmoctrl.pc
|
||||||
libosmosim.pc
|
libosmosim.pc
|
||||||
include/Makefile
|
include/Makefile
|
||||||
man/Makefile
|
|
||||||
src/Makefile
|
src/Makefile
|
||||||
src/vty/Makefile
|
src/vty/Makefile
|
||||||
src/codec/Makefile
|
src/codec/Makefile
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
if BUILD_MAN
|
|
||||||
man_MANS = osmo-config-merge.8
|
|
||||||
endif
|
|
||||||
|
|
||||||
ASCIIDOCS = osmo-config-merge.adoc
|
|
||||||
|
|
||||||
A2X_OPTS_MANPAGE = --doctype manpage --format manpage -D ${builddir}
|
|
||||||
|
|
||||||
%.8 : %.adoc
|
|
||||||
a2x ${A2X_OPTS_MANPAGE} $<
|
|
||||||
|
|
||||||
EXTRA_DIST = ${ASCIIDOCS}
|
|
||||||
|
|
||||||
CLEANFILES = \
|
|
||||||
osmo-config-merge.8
|
|
|
@ -1,64 +0,0 @@
|
||||||
osmo-config-merge(8)
|
|
||||||
=====================
|
|
||||||
|
|
||||||
NAME
|
|
||||||
----
|
|
||||||
osmo-config-merge - Merge osmocom config snippets into an existing config
|
|
||||||
|
|
||||||
SYNOPSIS
|
|
||||||
--------
|
|
||||||
[verse]
|
|
||||||
*osmo-config-merge* <config-file> <config-patch> [--debug]
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
-----------
|
|
||||||
This utility allows you to merge an incremental config "patch"
|
|
||||||
into an osmocom-style config file.
|
|
||||||
|
|
||||||
The patch file follows the same syntax as the original config file.
|
|
||||||
|
|
||||||
It works by appending the leaf nodes of the patch file to the respective
|
|
||||||
nodes of the input config file.
|
|
||||||
|
|
||||||
This process allows configuration file changes/updates to be performed
|
|
||||||
in a more stable/reliable way than by means of (unified) diff files,
|
|
||||||
as they break every time the context lines break.
|
|
||||||
|
|
||||||
osmo-config-merge doesn't suffer from this problem, as it understands
|
|
||||||
the tree-like nature of VTY config files.
|
|
||||||
|
|
||||||
The resulting config is printed to stdout.
|
|
||||||
|
|
||||||
NOTE: This only works with configuration files that have proper
|
|
||||||
indenting, i.e. every level in the hierarchy must be indented excatly
|
|
||||||
one character, not multiple.
|
|
||||||
|
|
||||||
OPTIONS
|
|
||||||
-------
|
|
||||||
*--debug*::
|
|
||||||
Show debugging output when parsing the config tree. Needs to be the last argument.
|
|
||||||
|
|
||||||
EXAMPLE USAGE
|
|
||||||
-------------
|
|
||||||
[verse]
|
|
||||||
$ osmo-config-merge osmo-msc.cfg.base osmo-msc_change_network.cfg > osmo-msc.cfg
|
|
||||||
|
|
||||||
EXIT STATUS
|
|
||||||
-----------
|
|
||||||
Exit status is 0 if the command was successful, and 1 in case of a
|
|
||||||
wrong/missing argument. If the tool detects an error in the patch file the
|
|
||||||
exit status is 2.
|
|
||||||
|
|
||||||
SEE ALSO
|
|
||||||
--------
|
|
||||||
The official Osmocom documentation including the VTY config refernce can be
|
|
||||||
found at: http://ftp.osmocom.org/docs/latest/
|
|
||||||
|
|
||||||
The Osmocom wiki is located at: http://projects.osmocom.org/
|
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
|
||||||
-------
|
|
||||||
osmo-config-merge was written by Harald Welte.
|
|
||||||
|
|
||||||
The man page was written by Daniel Willmann.
|
|
Loading…
Reference in New Issue