Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 7e0e3c0c6a2cd4e76ebca17ed16a37155992025e / . / meta-openembedded / meta-networking / recipes-connectivity / networkmanager / networkmanager / 0002-Do-not-create-settings-settings-property-documentati.patch
blob: 86e8eaafc57e510d2047146b51ad4c7564b749b5 [file] [log] [blame]
Andrew Geisslere34f8962021-04-15 15:53:51 -0500[diff] [blame]1From d0dead0478a070b96f37bd3b310443eaa8c93a25 Mon Sep 17 00:00:00 2001
Andrew Geissler69721092021-07-23 12:57:00 -0400[diff] [blame]2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Mon, 5 Jul 2021 00:42:23 +0200
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 Geissler69721092021-07-23 12:57:00 -0400[diff] [blame]18 Makefile.am | 5 -----
Andrew Geisslere34f8962021-04-15 15:53:51 -0500[diff] [blame]19 configure.ac | 5 -----
Andrew Geissler69721092021-07-23 12:57:00 -0400[diff] [blame]20 2 files changed, 10 deletions(-)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]21
22diff --git a/Makefile.am b/Makefile.am
Andrew Geissler69721092021-07-23 12:57:00 -0400[diff] [blame]23index 5a62070..3d0ebcd 100644
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]24--- a/Makefile.am
25+++ b/Makefile.am
Andrew Geissler69721092021-07-23 12:57:00 -0400[diff] [blame]26@@ -1860,15 +1860,10 @@ src/libnm-client-impl/libnm.typelib: src/libnm-client-impl/libnm.gir
27 INTROSPECTION_GIRS += src/libnm-client-impl/NM-1.0.gir
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]28
29 libnm_noinst_data = \
Andrew Geissler69721092021-07-23 12:57:00 -0400[diff] [blame]30- src/nmcli/generate-docs-nm-settings-nmcli.xml \
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame]31- man/nm-settings-docs-dbus.xml \
32- man/nm-settings-docs-nmcli.xml \
Andrew Geissler69721092021-07-23 12:57:00 -0400[diff] [blame]33 src/libnm-client-impl/nm-property-infos-dbus.xml \
34 src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml \
35 src/libnm-client-impl/nm-property-infos-keyfile.xml \
36 src/libnm-client-impl/nm-property-infos-nmcli.xml \
37- src/libnm-client-impl/nm-settings-docs-gir.xml \
38- src/libnmc-setting/settings-docs-input.xml \
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame]39 $(NULL)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]40
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame]41 noinst_DATA += $(libnm_noinst_data)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]42diff --git a/configure.ac b/configure.ac
Andrew Geissler69721092021-07-23 12:57:00 -0400[diff] [blame]43index 8fe23de..dc24850 100644
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]44--- a/configure.ac
45+++ b/configure.ac
Andrew Geissler69721092021-07-23 12:57:00 -0400[diff] [blame]46@@ -1258,11 +1258,6 @@ GTK_DOC_CHECK(1.0)
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]47 # check if we can build setting property documentation
48 build_docs=no
49 if test -n "$INTROSPECTION_MAKEFILE"; then
50- # 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]51- if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]52- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
53- fi
54-
55 AC_PATH_PROG(PERL, perl)
56 if test -z "$PERL"; then
57 AC_MSG_ERROR([--enable-introspection requires perl])
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame]58--
Andrew Geissler69721092021-07-23 12:57:00 -0400[diff] [blame]592.31.1
Andrew Geisslereef63862021-01-29 15:58:13 -0600[diff] [blame]60