* License checksum changed
* Patch was aligned but have no resources to test them
Signed-off-by: Arturo Buzarra
---
...ttings-settings-property-documentati.patch | 33 +++
...ger_1.14.4.bb => networkmanager_1.14.6.bb} | 6 ++--
2 files changed, 15 insertions(+), 24 deletions(-)
rename
meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.14.4.bb
=> networkmanager_1.14.6.bb} (95%)
diff --git
a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
index c50293c09..7d9bc32ad 100644
---
a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
+++
b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
@@ -13,43 +13,34 @@ Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Andreas Müller
---
- Makefile.am | 20
+ Makefile.am | 11 ---
configure.ac | 5 -
- 2 files changed, 25 deletions(-)
+ 2 files changed, 16 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 1e100f6..d31e3c1 100644
+index e1b442e99..d977e9457 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -1115,9 +1115,7 @@ EXTRA_DIST += \
+@@ -1117,9 +1117,7 @@ EXTRA_DIST += \
if HAVE_INTROSPECTION
-
+
libnm_noinst_data = \
- libnm/nm-property-docs.xml \
libnm/nm-settings-docs-overrides.xml \
- libnm/nm-settings-docs.xml \
libnm/nm-settings-keyfile-docs.xml \
libnm/nm-settings-ifcfg-rh-docs.xml
-
-@@ -3692,27 +3690,9 @@ $(clients_common_libnmc_base_la_OBJECTS):
$(libnm_lib_h_pub_mkenums)
+
+@@ -3696,18 +3694,9 @@ $(clients_common_libnmc_base_la_OBJECTS):
$(libnm_lib_h_pub_mkenums)
$(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
-
+
clients_common_settings_doc_h = clients/common/settings-docs.h
-if HAVE_INTROSPECTION
-$(clients_common_settings_doc_h): clients/common/settings-docs.xsl
libnm/nm-property-docs.xml clients/common/.dirstamp
- $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
-DISTCLEANFILES += $(clients_common_settings_doc_h)
-check-local-settings-docs: $(clients_common_settings_doc_h)
-- @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \
-- if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in"
"$(builddir)/$(clients_common_settings_doc_h)" ; then \
-- if test "$$NM_TEST_REGENERATE" == 1 ; then \
-- cp -f
"$(builddir)/$(clients_common_settings_doc_h)"
"$(srcdir)/$(clients_common_settings_doc_h).in"; \
-- else \
-- echo "The generated file
\"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file
\"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the
generated file over to the source file. You can skip this test by setting
\$$NMTST_NO_CHECK_SETTINGS_DOCS=yes". You can also automatically copy the file
by rerunning the test with \$$NM_TEST_REGENERATE=1 ; \
-- false; \
-- fi; \
-- fi;\
-- fi
+- $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)"
"$(clients_common_settings_doc_h)"
-check_local += check-local-settings-docs
-else
$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in
clients/common/.dirstamp
@@ -60,7 +51,7 @@ index 1e100f6..d31e3c1 100644
$(clients_common_settings_doc_h) \
$(clients_common_settings_doc_h).in
diff --git a/configure.ac b/configure.ac
-index 79dc3b9..23d14a6 100644
+index 1f9dcb3c7..ca8db970a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1195,11 +1195,6 @@ GTK_DOC_CHECK(1.0)
@@ -75,6 +66,6 @@ index 79dc3b9..23d14a6 100644
AC_PATH_PROG(PERL, perl)
if test -z "$PERL"; then
AC_MSG_ERROR([--enable-introspection requires perl])
---
-2.14.5
+--
+2.21.0
diff --git
a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.6.bb
similarity index 95%
rename from
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
rename to
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.6.bb
index f21600eda..c10403ba1 100644
---
a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
+++
b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.6.bb
@@ -5,7 +5,7 @@ SECTION = "net/misc"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
-
