Commit 9097ad6a authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge branch 'devel-2.3'

* devel-2.3:
  Update ganeti-os-interface documentation
  Makefile: Check for empty files and dirs on distcheck
  Revert commit e7e23e73

, work around Automake bug
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 1e86ee97 f1a791b6
...@@ -57,10 +57,13 @@ DIRS = \ ...@@ -57,10 +57,13 @@ DIRS = \
test/data \ test/data \
tools tools
BUILDTIME_DIRS = \ BUILDTIME_DIR_AUTOCREATE = \
scripts \ scripts \
doc/api \ doc/api \
doc/coverage \ doc/coverage
BUILDTIME_DIRS = \
$(BUILDTIME_DIR_AUTOCREATE) \
doc/html doc/html
DIRCHECK_EXCLUDE = \ DIRCHECK_EXCLUDE = \
...@@ -68,7 +71,7 @@ DIRCHECK_EXCLUDE = \ ...@@ -68,7 +71,7 @@ DIRCHECK_EXCLUDE = \
ganeti-[0-9]*.[0-9]*.[0-9]* \ ganeti-[0-9]*.[0-9]*.[0-9]* \
doc/html/_* doc/html/_*
all_dirfiles = $(addsuffix /.dir,$(DIRS) $(BUILDTIME_DIRS)) all_dirfiles = $(addsuffix /.dir,$(DIRS) $(BUILDTIME_DIR_AUTOCREATE))
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
$(docpng) \ $(docpng) \
...@@ -227,9 +230,10 @@ docrst = \ ...@@ -227,9 +230,10 @@ docrst = \
$(RUN_IN_TEMPDIR): | $(all_dirfiles) $(RUN_IN_TEMPDIR): | $(all_dirfiles)
doc/html/index.html: $(docrst) $(docpng) doc/conf.py configure.ac \ doc/html/index.html: $(docrst) $(docpng) doc/conf.py configure.ac \
$(RUN_IN_TEMPDIR) | doc/html/.dir $(RUN_IN_TEMPDIR)
@test -n "$(SPHINX)" || \ @test -n "$(SPHINX)" || \
{ echo 'sphinx-build' not found during configure; exit 1; } { echo 'sphinx-build' not found during configure; exit 1; }
@mkdir_p@ $(dir $@)
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -W -b html \ PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -W -b html \
-d . \ -d . \
-D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \ -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
...@@ -733,7 +737,6 @@ dist-hook: ...@@ -733,7 +737,6 @@ dist-hook:
$(MAKE) regen-vcs-version && \ $(MAKE) regen-vcs-version && \
rm -f $(top_distdir)/vcs-version && \ rm -f $(top_distdir)/vcs-version && \
cp -p $(srcdir)/vcs-version $(top_distdir) cp -p $(srcdir)/vcs-version $(top_distdir)
rm $(top_distdir)/doc/html/.dir
# a distcheck hook rule for catching revision control directories # a distcheck hook rule for catching revision control directories
distcheck-hook: distcheck-hook:
...@@ -749,6 +752,15 @@ distcheck-hook: ...@@ -749,6 +752,15 @@ distcheck-hook:
echo "Found backup files in final archive." 1>&2; \ echo "Found backup files in final archive." 1>&2; \
exit 1; \ exit 1; \
fi fi
# Empty files or directories should not be distributed. They can cause
# unnecessary warnings for packagers. Directories used by automake during
# distcheck must be excluded.
if find $(top_distdir) -empty -and -not \( \
-path $(top_distdir)/_build -or \
-path $(top_distdir)/_inst \) | grep .; then \
echo "Found empty files or directories in final archive." 1>&2; \
exit 1; \
fi
if test -n "$(BUILD_RELEASE)" && \ if test -n "$(BUILD_RELEASE)" && \
grep -n -H -E '^\*.*unreleased' $(top_distdir)/NEWS; then \ grep -n -H -E '^\*.*unreleased' $(top_distdir)/NEWS; then \
echo "Found unreleased version in NEWS." >&2; \ echo "Found unreleased version in NEWS." >&2; \
......
...@@ -185,13 +185,27 @@ ...@@ -185,13 +185,27 @@
NIC of the instance.</simpara> NIC of the instance.</simpara>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>NIC_%N_MODE</term>
<listitem>
<simpara>The NIC mode, either routed or bridged</simpara>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term>NIC_%N_BRIDGE</term> <term>NIC_%N_BRIDGE</term>
<listitem> <listitem>
<simpara>The bridge to which this NIC will be attached <simpara>The bridge to which this NIC will be attached. This
to.</simpara> variable is defined only when the NIC is in bridged mode.</simpara>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>NIC_%N_LINK</term>
<listitem>
<simpara>If the NIC is in bridged mode, this is the same as
NIC_%N_BRIDGE. If it is in routed mode, the routing table
which will be used by the hypervisor to insert the appropriate
routes.</simpara> </listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term>NIC_%N_FRONTEND_TYPE</term> <term>NIC_%N_FRONTEND_TYPE</term>
<listitem> <listitem>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment