Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / eef6386ca7c8a62f37fc84a0a5a68842183cdfb0 / . / meta-openembedded / meta-networking / recipes-connectivity / networkmanager / networkmanager / 0002-Do-not-create-settings-settings-property-documentati.patch
blob: ecd13504d336207f6be5038fc0868b6552c17396 [file] [log] [blame]
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]1From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]3Date: Sat, 16 Jan 2021 14:27:38 +0100
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]4Subject: [PATCH] Do not create settings settings/property documentation
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]9From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
10MIME-Version: 1.0
11Content-Type: text/plain; charset=UTF-8
12Content-Transfer-Encoding: 8bit
13
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]14It was tried to get this work by adding python3-pygobject-native to DEPENDS but
15compile could not find (configure passed) python module gi.
16Anyway it is not necessary for us to have the settings/property docs.
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]17
18Upstream-Status: Inappropriate [OE specific]
19
20Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com>
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]21
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]22---
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]23 Makefile.am | 13 -------------
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]24 configure.ac | 5 -----
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]25 2 files changed, 18 deletions(-)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]26
27diff --git a/Makefile.am b/Makefile.am
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]28index 110957a..b4cfbcc 100644
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]29--- a/Makefile.am
30+++ b/Makefile.am
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]31@@ -1587,14 +1587,10 @@ libnm/libnm.typelib: libnm/libnm.gir
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]32 INTROSPECTION_GIRS += libnm/NM-1.0.gir
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]33
34 libnm_noinst_data = \
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]35- clients/cli/generate-docs-nm-settings-nmcli.xml \
36 libnm/nm-property-infos-dbus.xml \
37 libnm/nm-property-infos-ifcfg-rh.xml \
38 libnm/nm-property-infos-keyfile.xml \
39 libnm/nm-property-infos-nmcli.xml \
40- libnm/nm-settings-docs-gir.xml \
41- man/nm-settings-docs-dbus.xml \
42- man/nm-settings-docs-nmcli.xml \
43 $(NULL)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]44
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]45 noinst_DATA += $(libnm_noinst_data)
46@@ -4448,18 +4444,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]47 $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
48
49 clients_common_settings_doc_h = clients/common/settings-docs.h
50-if HAVE_INTROSPECTION
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]51-$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-settings-docs-gir.xml clients/common/.dirstamp
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]52- $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
53-DISTCLEANFILES += $(clients_common_settings_doc_h)
54-check-local-settings-docs: $(clients_common_settings_doc_h)
55- $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
56-check_local += check-local-settings-docs
57-else
58 $(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
59 $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)"
60 check-local-settings-docs:
61-endif
62 EXTRA_DIST += \
63 $(clients_common_settings_doc_h) \
64 $(clients_common_settings_doc_h).in
65diff --git a/configure.ac b/configure.ac
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]66index 704b1c1..18bba87 100644
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]67--- a/configure.ac
68+++ b/configure.ac
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]69@@ -1228,11 +1228,6 @@ GTK_DOC_CHECK(1.0)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]70 # check if we can build setting property documentation
71 build_docs=no
72 if test -n "$INTROSPECTION_MAKEFILE"; then
73- # If g-i is installed we know we have python, but we might not have pygobject
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]74- if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]75- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
76- fi
77-
78 AC_PATH_PROG(PERL, perl)
79 if test -z "$PERL"; then
80 AC_MSG_ERROR([--enable-introspection requires perl])
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame^]81--
822.26.2
83