Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / e34f89623c246d261efb7fd0f2ce4a30b10bd59d / . / meta-openembedded / meta-networking / recipes-connectivity / networkmanager / networkmanager / 0002-Do-not-create-settings-settings-property-documentati.patch
blob: 0a86abafc0618a41ab6cde7ad6d6ca0260474b3c [file] [log] [blame]
Andrew Geisslere34f8962021-04-15 15:53:51 -0500[diff] [blame^]1From d0dead0478a070b96f37bd3b310443eaa8c93a25 Mon Sep 17 00:00:00 2001
2From: Vinicius Aquino <voa.aquino@gmail.com>
3Date: Thu, 1 Apr 2021 14:13:07 -0300
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 Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame]9It was tried to get this work by adding python3-pygobject-native to DEPENDS but
Andrew Geisslere34f8962021-04-15 15:53:51 -0500[diff] [blame^]10compile could not find (configure passed) python module gi.
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame]11Anyway it is not necessary for us to have the settings/property docs.
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]12
13Upstream-Status: Inappropriate [OE specific]
14
15Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com>
Andrew Geisslere34f8962021-04-15 15:53:51 -0500[diff] [blame^]16Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com>
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]17---
Andrew Geisslere34f8962021-04-15 15:53:51 -0500[diff] [blame^]18 Makefile.am | 4 ----
19 configure.ac | 5 -----
20 2 files changed, 9 deletions(-)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]21
22diff --git a/Makefile.am b/Makefile.am
Andrew Geisslere34f8962021-04-15 15:53:51 -0500[diff] [blame^]23index 9279672c1..2e52acbb2 100644
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]24--- a/Makefile.am
25+++ b/Makefile.am
Andrew Geisslere34f8962021-04-15 15:53:51 -0500[diff] [blame^]26@@ -1686,14 +1686,10 @@ libnm/libnm.typelib: libnm/libnm.gir
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]27 INTROSPECTION_GIRS += libnm/NM-1.0.gir
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]28
29 libnm_noinst_data = \
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame]30- clients/cli/generate-docs-nm-settings-nmcli.xml \
31 libnm/nm-property-infos-dbus.xml \
32 libnm/nm-property-infos-ifcfg-rh.xml \
33 libnm/nm-property-infos-keyfile.xml \
34 libnm/nm-property-infos-nmcli.xml \
35- libnm/nm-settings-docs-gir.xml \
36- man/nm-settings-docs-dbus.xml \
37- man/nm-settings-docs-nmcli.xml \
38 $(NULL)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]39
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame]40 noinst_DATA += $(libnm_noinst_data)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]41diff --git a/configure.ac b/configure.ac
Andrew Geisslere34f8962021-04-15 15:53:51 -0500[diff] [blame^]42index 784ac4695..681e6cb32 100644
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]43--- a/configure.ac
44+++ b/configure.ac
Andrew Geisslere34f8962021-04-15 15:53:51 -0500[diff] [blame^]45@@ -1241,11 +1241,6 @@ GTK_DOC_CHECK(1.0)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]46 # check if we can build setting property documentation
47 build_docs=no
48 if test -n "$INTROSPECTION_MAKEFILE"; then
49- # 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]50- if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]51- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
52- fi
53-
54 AC_PATH_PROG(PERL, perl)
55 if test -z "$PERL"; then
56 AC_MSG_ERROR([--enable-introspection requires perl])
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame]57--
Andrew Geisslere34f8962021-04-15 15:53:51 -0500[diff] [blame^]582.20.1
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame]59