diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2018-10-29 10:40:42 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-11-02 10:05:06 -0700 |
commit | 4be3dce466a329e97a9d9dc4a3123a8c329df432 (patch) | |
tree | 283397af72f20a433ef9ebc106fb95ebea325589 /meta-networking | |
parent | 1627aa060995318363d24e0e7d4be2190a940f11 (diff) | |
download | meta-openembedded-4be3dce466a329e97a9d9dc4a3123a8c329df432.tar.gz |
networkmanager: upgrade 1.10.10 -> 1.14.4
* License checksum: copyright year changed
* packageconfig glib: with this version (udev-)glib support hase to be enabled
explicitly. Split this out to meta-gnome where network-manager-applet lives.
* packageconfig netconfig: This was nonsense: netconfig is a SUSE tool [1]
which is not found in layer index. The error was detected now because
configuration checks for presence of netconfig.
* --disable-ifnet and --disable-ifcfg-suse are gone
* musl patches were aligned but have no resources to test them
[1] https://github.com/openSUSE/sysconfig
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
10 files changed, 82 insertions, 85 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch index 719442319..49a07353d 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 18f71c1b48730b8602826517f2b5b088283ae948 Mon Sep 17 00:00:00 2001 | 1 | From 18f71c1b48730b8602826517f2b5b088283ae948 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 31 Mar 2017 16:48:00 -0700 | 3 | Date: Fri, 31 Mar 2017 16:48:00 -0700 |
4 | Subject: [PATCH 5/7] sd-lldp.h: Remove net/ethernet.h seems to be over | 4 | Subject: [PATCH] sd-lldp.h: Remove net/ethernet.h seems to be over specified |
5 | specified | ||
6 | 5 | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
8 | --- | 7 | --- |
@@ -14,7 +13,7 @@ diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/systemd/src/libs | |||
14 | index 31e2448..7721cc2 100644 | 13 | index 31e2448..7721cc2 100644 |
15 | --- a/src/systemd/src/libsystemd-network/sd-lldp.c | 14 | --- a/src/systemd/src/libsystemd-network/sd-lldp.c |
16 | +++ b/src/systemd/src/libsystemd-network/sd-lldp.c | 15 | +++ b/src/systemd/src/libsystemd-network/sd-lldp.c |
17 | @@ -21,6 +21,7 @@ | 16 | @@ -3,6 +3,7 @@ |
18 | #include "nm-sd-adapt.h" | 17 | #include "nm-sd-adapt.h" |
19 | 18 | ||
20 | #include <arpa/inet.h> | 19 | #include <arpa/inet.h> |
@@ -26,7 +25,7 @@ diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp | |||
26 | index 3f35eeb..61b0e45 100644 | 25 | index 3f35eeb..61b0e45 100644 |
27 | --- a/src/systemd/src/systemd/sd-lldp.h | 26 | --- a/src/systemd/src/systemd/sd-lldp.h |
28 | +++ b/src/systemd/src/systemd/sd-lldp.h | 27 | +++ b/src/systemd/src/systemd/sd-lldp.h |
29 | @@ -22,7 +22,7 @@ | 28 | @@ -18,7 +18,7 @@ |
30 | ***/ | 29 | ***/ |
31 | 30 | ||
32 | #include <inttypes.h> | 31 | #include <inttypes.h> |
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch index 28848d354..351f264cb 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 583f0448fb7e9aba2b410c06eec6f420b41a6a0c Mon Sep 17 00:00:00 2001 | 1 | From 583f0448fb7e9aba2b410c06eec6f420b41a6a0c Mon Sep 17 00:00:00 2001 |
2 | From: Pablo Saavedra <psaavedra@igalia.com> | 2 | From: Pablo Saavedra <psaavedra@igalia.com> |
3 | Date: Tue, 13 Mar 2018 17:36:20 +0100 | 3 | Date: Tue, 13 Mar 2018 17:36:20 +0100 |
4 | Subject: [PATCH 7/7] Fixed configure.ac: Fix pkgconfig sysroot locations | 4 | Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations |
5 | 5 | ||
6 | --- | 6 | --- |
7 | configure.ac | 2 +- | 7 | configure.ac | 2 +- |
@@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac | |||
11 | index 51e5eb6..c9d3e56 100644 | 11 | index 51e5eb6..c9d3e56 100644 |
12 | --- a/configure.ac | 12 | --- a/configure.ac |
13 | +++ b/configure.ac | 13 | +++ b/configure.ac |
14 | @@ -669,7 +669,7 @@ else | 14 | @@ -572,7 +572,7 @@ if test "$have_jansson" = "yes"; then |
15 | AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) | 15 | AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) |
16 | 16 | ||
17 | AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) | 17 | AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) |
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 92485f044..c50293c09 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,15 +13,15 @@ Upstream-Status: Inappropriate [OE specific] | |||
13 | 13 | ||
14 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | 14 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
15 | --- | 15 | --- |
16 | Makefile.am | 18 ++---------------- | 16 | Makefile.am | 20 -------------------- |
17 | configure.ac | 4 ---- | 17 | configure.ac | 5 ----- |
18 | 2 files changed, 2 insertions(+), 20 deletions(-) | 18 | 2 files changed, 25 deletions(-) |
19 | 19 | ||
20 | diff --git a/Makefile.am b/Makefile.am | 20 | diff --git a/Makefile.am b/Makefile.am |
21 | index 639921d..314a61d 100644 | 21 | index 1e100f6..d31e3c1 100644 |
22 | --- a/Makefile.am | 22 | --- a/Makefile.am |
23 | +++ b/Makefile.am | 23 | +++ b/Makefile.am |
24 | @@ -961,9 +961,7 @@ endif | 24 | @@ -1115,9 +1115,7 @@ EXTRA_DIST += \ |
25 | if HAVE_INTROSPECTION | 25 | if HAVE_INTROSPECTION |
26 | 26 | ||
27 | libnm_noinst_data = \ | 27 | libnm_noinst_data = \ |
@@ -31,37 +31,39 @@ index 639921d..314a61d 100644 | |||
31 | libnm/nm-settings-keyfile-docs.xml \ | 31 | libnm/nm-settings-keyfile-docs.xml \ |
32 | libnm/nm-settings-ifcfg-rh-docs.xml | 32 | libnm/nm-settings-ifcfg-rh-docs.xml |
33 | 33 | ||
34 | @@ -3317,23 +3315,11 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) | 34 | @@ -3692,27 +3690,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) |
35 | $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp | 35 | $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp |
36 | 36 | ||
37 | clients_common_settings_doc_c = clients/common/settings-docs.c | 37 | clients_common_settings_doc_h = clients/common/settings-docs.h |
38 | -if HAVE_INTROSPECTION | 38 | -if HAVE_INTROSPECTION |
39 | -$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp | 39 | -$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp |
40 | - $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) | 40 | - $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) |
41 | -DISTCLEANFILES += $(clients_common_settings_doc_c) | 41 | -DISTCLEANFILES += $(clients_common_settings_doc_h) |
42 | -check-local-settings-docs: $(clients_common_settings_doc_c) | 42 | -check-local-settings-docs: $(clients_common_settings_doc_h) |
43 | - @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ | 43 | - @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ |
44 | - if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \ | 44 | - if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \ |
45 | - echo "The generated file \"$(builddir)/$(clients_common_settings_doc_c)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_c).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"; \ | 45 | - if test "$$NM_TEST_REGENERATE" == 1 ; then \ |
46 | - false; \ | 46 | - cp -f "$(builddir)/$(clients_common_settings_doc_h)" "$(srcdir)/$(clients_common_settings_doc_h).in"; \ |
47 | - else \ | ||
48 | - 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 ; \ | ||
49 | - false; \ | ||
50 | - fi; \ | ||
47 | - fi;\ | 51 | - fi;\ |
48 | - fi | 52 | - fi |
49 | -check_local += check-local-settings-docs | 53 | -check_local += check-local-settings-docs |
50 | -else | 54 | -else |
51 | + | 55 | $(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp |
52 | $(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp | 56 | $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" |
53 | $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" | ||
54 | check-local-settings-docs: | 57 | check-local-settings-docs: |
55 | -endif | 58 | -endif |
56 | + | ||
57 | EXTRA_DIST += \ | 59 | EXTRA_DIST += \ |
58 | $(clients_common_settings_doc_c) \ | 60 | $(clients_common_settings_doc_h) \ |
59 | $(clients_common_settings_doc_c).in | 61 | $(clients_common_settings_doc_h).in |
60 | diff --git a/configure.ac b/configure.ac | 62 | diff --git a/configure.ac b/configure.ac |
61 | index c9d3e56..407222e 100644 | 63 | index 79dc3b9..23d14a6 100644 |
62 | --- a/configure.ac | 64 | --- a/configure.ac |
63 | +++ b/configure.ac | 65 | +++ b/configure.ac |
64 | @@ -1286,10 +1286,6 @@ GTK_DOC_CHECK(1.0) | 66 | @@ -1195,11 +1195,6 @@ GTK_DOC_CHECK(1.0) |
65 | # check if we can build setting property documentation | 67 | # check if we can build setting property documentation |
66 | build_docs=no | 68 | build_docs=no |
67 | if test -n "$INTROSPECTION_MAKEFILE"; then | 69 | if test -n "$INTROSPECTION_MAKEFILE"; then |
@@ -69,9 +71,10 @@ index c9d3e56..407222e 100644 | |||
69 | - if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then | 71 | - if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then |
70 | - AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) | 72 | - AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) |
71 | - fi | 73 | - fi |
72 | 74 | - | |
73 | AC_PATH_PROG(PERL, perl) | 75 | AC_PATH_PROG(PERL, perl) |
74 | if test -z "$PERL"; then | 76 | if test -z "$PERL"; then |
77 | AC_MSG_ERROR([--enable-introspection requires perl]) | ||
75 | -- | 78 | -- |
76 | 2.14.3 | 79 | 2.14.5 |
77 | 80 | ||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch index 9d208e1fd..00dda5b18 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e92de7409a3e107f90d108a9c5d49bd0418296dd Mon Sep 17 00:00:00 2001 | 1 | From e92de7409a3e107f90d108a9c5d49bd0418296dd Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
3 | Date: Thu, 22 Mar 2018 17:54:10 +0100 | 3 | Date: Thu, 22 Mar 2018 17:54:10 +0100 |
4 | Subject: [PATCH 1/4] Usual fix for musl libc | 4 | Subject: [PATCH] Usual fix for musl libc |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -13,18 +13,19 @@ Stolen from [1] and prettyfied slightly | |||
13 | [1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches | 13 | [1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches |
14 | 14 | ||
15 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | 15 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
16 | |||
16 | --- | 17 | --- |
17 | src/systemd/src/basic/stdio-util.h | 2 ++ | 18 | src/systemd/src/basic/stdio-util.h | 2 ++ |
18 | src/systemd/src/basic/util.h | 5 +++++ | 19 | src/systemd/src/basic/util.h | 5 +++++ |
19 | 2 files changed, 7 insertions(+) | 20 | 2 files changed, 7 insertions(+) |
20 | 21 | ||
21 | diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h | 22 | diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h |
22 | index bd1144b..9eafacb 100644 | 23 | index 73c0327..e1ce64f 100644 |
23 | --- a/src/systemd/src/basic/stdio-util.h | 24 | --- a/src/systemd/src/basic/stdio-util.h |
24 | +++ b/src/systemd/src/basic/stdio-util.h | 25 | +++ b/src/systemd/src/basic/stdio-util.h |
25 | @@ -19,7 +19,9 @@ | 26 | @@ -1,7 +1,9 @@ |
26 | along with systemd; If not, see <http://www.gnu.org/licenses/>. | 27 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
27 | ***/ | 28 | #pragma once |
28 | 29 | ||
29 | +#if defined(__GLIBC__) | 30 | +#if defined(__GLIBC__) |
30 | #include <printf.h> | 31 | #include <printf.h> |
@@ -36,7 +37,7 @@ diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h | |||
36 | index b31dfd1..9b7032c 100644 | 37 | index b31dfd1..9b7032c 100644 |
37 | --- a/src/systemd/src/basic/util.h | 38 | --- a/src/systemd/src/basic/util.h |
38 | +++ b/src/systemd/src/basic/util.h | 39 | +++ b/src/systemd/src/basic/util.h |
39 | @@ -46,6 +46,11 @@ | 40 | @@ -28,6 +28,11 @@ |
40 | #include "missing.h" | 41 | #include "missing.h" |
41 | #include "time-util.h" | 42 | #include "time-util.h" |
42 | 43 | ||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch index 548cccb32..c162c1dfb 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001 | 1 | From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
3 | Date: Thu, 22 Mar 2018 18:18:06 +0100 | 3 | Date: Thu, 22 Mar 2018 18:18:06 +0100 |
4 | Subject: [PATCH 2/4] musl: dlopen is included so LD_LIBS="" instead of | 4 | Subject: [PATCH] musl: dlopen is included so LD_LIBS="" instead of |
5 | LD_LIBS="none required" | 5 | LD_LIBS="none required" |
6 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
7 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
@@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac | |||
22 | index 487a266..96ae4f7 100644 | 22 | index 487a266..96ae4f7 100644 |
23 | --- a/configure.ac | 23 | --- a/configure.ac |
24 | +++ b/configure.ac | 24 | +++ b/configure.ac |
25 | @@ -305,6 +305,7 @@ dnl | 25 | @@ -235,6 +235,7 @@ dnl |
26 | dnl Checks for libdl - on certain platforms its part of libc | 26 | dnl Checks for libdl - on certain platforms its part of libc |
27 | dnl | 27 | dnl |
28 | AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=]) | 28 | AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=]) |
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch index 5dd17b63b..9a58c0e34 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 714b4731a238653e9c7d885c0dee10677b0a4df3 Mon Sep 17 00:00:00 2001 | 1 | From 714b4731a238653e9c7d885c0dee10677b0a4df3 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
3 | Date: Thu, 22 Mar 2018 18:24:07 +0100 | 3 | Date: Thu, 22 Mar 2018 18:24:07 +0100 |
4 | Subject: [PATCH 3/4] musl: network support | 4 | Subject: [PATCH] musl: network support |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -15,7 +15,7 @@ Stolen from [1] and prettyfied slightly | |||
15 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | 15 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
16 | --- | 16 | --- |
17 | libnm-core/nm-utils.h | 4 ++++ | 17 | libnm-core/nm-utils.h | 4 ++++ |
18 | src/platform/wifi/wifi-utils.h | 4 ++++ | 18 | src/platform/wifi/nm-wifi-utils.h | 4 ++++ |
19 | src/systemd/src/basic/socket-util.h | 5 +++++ | 19 | src/systemd/src/basic/socket-util.h | 5 +++++ |
20 | 3 files changed, 13 insertions(+) | 20 | 3 files changed, 13 insertions(+) |
21 | 21 | ||
@@ -35,10 +35,10 @@ index df9284b..2bcf4b8 100644 | |||
35 | #include <linux/if_infiniband.h> | 35 | #include <linux/if_infiniband.h> |
36 | 36 | ||
37 | #include "nm-core-enum-types.h" | 37 | #include "nm-core-enum-types.h" |
38 | diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h | 38 | diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils.h |
39 | index 705717b..da3edc4 100644 | 39 | index 705717b..da3edc4 100644 |
40 | --- a/src/platform/wifi/wifi-utils.h | 40 | --- a/src/platform/wifi/nm-wifi-utils.h |
41 | +++ b/src/platform/wifi/wifi-utils.h | 41 | +++ b/src/platform/wifi/nm-wifi-utils.h |
42 | @@ -22,7 +22,11 @@ | 42 | @@ -22,7 +22,11 @@ |
43 | #ifndef __WIFI_UTILS_H__ | 43 | #ifndef __WIFI_UTILS_H__ |
44 | #define __WIFI_UTILS_H__ | 44 | #define __WIFI_UTILS_H__ |
@@ -50,12 +50,12 @@ index 705717b..da3edc4 100644 | |||
50 | +#endif | 50 | +#endif |
51 | 51 | ||
52 | #include "nm-dbus-interface.h" | 52 | #include "nm-dbus-interface.h" |
53 | 53 | #include "nm-setting-wireless.h" | |
54 | diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h | 54 | diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h |
55 | index d7e2d85..d109c84 100644 | 55 | index d7e2d85..d109c84 100644 |
56 | --- a/src/systemd/src/basic/socket-util.h | 56 | --- a/src/systemd/src/basic/socket-util.h |
57 | +++ b/src/systemd/src/basic/socket-util.h | 57 | +++ b/src/systemd/src/basic/socket-util.h |
58 | @@ -29,6 +29,11 @@ | 58 | @@ -11,6 +11,11 @@ |
59 | #include <linux/netlink.h> | 59 | #include <linux/netlink.h> |
60 | #include <linux/if_infiniband.h> | 60 | #include <linux/if_infiniband.h> |
61 | #include <linux/if_packet.h> | 61 | #include <linux/if_packet.h> |
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch index fc55ce85f..9e5c94336 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d513c8bfc982dbd976617178b040c512c95710b6 Mon Sep 17 00:00:00 2001 | 1 | From d513c8bfc982dbd976617178b040c512c95710b6 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
3 | Date: Thu, 22 Mar 2018 18:29:00 +0100 | 3 | Date: Thu, 25 Oct 2018 09:57:07 +0200 |
4 | Subject: [PATCH 4/4] musl: process-util | 4 | Subject: [PATCH] musl: process-util |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -18,10 +18,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | |||
18 | 1 file changed, 9 insertions(+) | 18 | 1 file changed, 9 insertions(+) |
19 | 19 | ||
20 | diff --git a/src/systemd/src/basic/process-util.c b/src/systemd/src/basic/process-util.c | 20 | diff --git a/src/systemd/src/basic/process-util.c b/src/systemd/src/basic/process-util.c |
21 | index 272030d..485f1db 100644 | 21 | index 1412f03..45f5049 100644 |
22 | --- a/src/systemd/src/basic/process-util.c | 22 | --- a/src/systemd/src/basic/process-util.c |
23 | +++ b/src/systemd/src/basic/process-util.c | 23 | +++ b/src/systemd/src/basic/process-util.c |
24 | @@ -36,6 +36,9 @@ | 24 | @@ -21,6 +21,9 @@ |
25 | #include <sys/wait.h> | 25 | #include <sys/wait.h> |
26 | #include <syslog.h> | 26 | #include <syslog.h> |
27 | #include <unistd.h> | 27 | #include <unistd.h> |
@@ -31,7 +31,7 @@ index 272030d..485f1db 100644 | |||
31 | #if 0 /* NM_IGNORED */ | 31 | #if 0 /* NM_IGNORED */ |
32 | #if HAVE_VALGRIND_VALGRIND_H | 32 | #if HAVE_VALGRIND_VALGRIND_H |
33 | #include <valgrind/valgrind.h> | 33 | #include <valgrind/valgrind.h> |
34 | @@ -1015,11 +1018,13 @@ static void reset_cached_pid(void) { | 34 | @@ -1153,11 +1156,13 @@ void reset_cached_pid(void) { |
35 | cached_pid = CACHED_PID_UNSET; | 35 | cached_pid = CACHED_PID_UNSET; |
36 | } | 36 | } |
37 | 37 | ||
@@ -39,24 +39,24 @@ index 272030d..485f1db 100644 | |||
39 | /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc | 39 | /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc |
40 | * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against | 40 | * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against |
41 | * libpthread, as it is part of glibc anyway. */ | 41 | * libpthread, as it is part of glibc anyway. */ |
42 | extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle); | 42 | extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle); |
43 | extern void* __dso_handle __attribute__ ((__weak__)); | 43 | extern void* __dso_handle __attribute__ ((__weak__)); |
44 | +#endif | 44 | +#endif |
45 | 45 | ||
46 | pid_t getpid_cached(void) { | 46 | pid_t getpid_cached(void) { |
47 | pid_t current_value; | 47 | static bool installed = false; |
48 | @@ -1042,7 +1047,11 @@ pid_t getpid_cached(void) { | 48 | @@ -1186,7 +1191,11 @@ pid_t getpid_cached(void) { |
49 | 49 | * only half-documented (glibc doesn't document it but LSB does — though only superficially) | |
50 | new_pid = getpid(); | 50 | * we'll check for errors only in the most generic fashion possible. */ |
51 | 51 | ||
52 | +#ifdef __GLIBC__ | 52 | +#ifdef __GLIBC__ |
53 | if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { | 53 | if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { |
54 | +#else | 54 | +#else |
55 | + if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) { | 55 | + if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) { |
56 | +#endif | 56 | +#endif |
57 | /* OOM? Let's try again later */ | 57 | /* OOM? Let's try again later */ |
58 | cached_pid = CACHED_PID_UNSET; | 58 | cached_pid = CACHED_PID_UNSET; |
59 | return new_pid; | 59 | return new_pid; |
60 | -- | 60 | -- |
61 | 2.14.3 | 61 | 2.14.5 |
62 | 62 | ||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch index 752fe4f58..6bca95e18 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch | |||
@@ -17,10 +17,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | |||
17 | 4 files changed, 8 insertions(+) | 17 | 4 files changed, 8 insertions(+) |
18 | 18 | ||
19 | diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h | 19 | diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h |
20 | index 5e46d8d..18a613f 100644 | 20 | index e388552..9c4dde8 100644 |
21 | --- a/src/systemd/src/systemd/sd-dhcp-client.h | 21 | --- a/src/systemd/src/systemd/sd-dhcp-client.h |
22 | +++ b/src/systemd/src/systemd/sd-dhcp-client.h | 22 | +++ b/src/systemd/src/systemd/sd-dhcp-client.h |
23 | @@ -21,7 +21,9 @@ | 23 | @@ -20,7 +20,9 @@ |
24 | ***/ | 24 | ***/ |
25 | 25 | ||
26 | #include <inttypes.h> | 26 | #include <inttypes.h> |
@@ -31,10 +31,10 @@ index 5e46d8d..18a613f 100644 | |||
31 | #include <sys/types.h> | 31 | #include <sys/types.h> |
32 | 32 | ||
33 | diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h | 33 | diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h |
34 | index 7ab99cc..85acdf2 100644 | 34 | index 2a60145..19d1814 100644 |
35 | --- a/src/systemd/src/systemd/sd-dhcp-lease.h | 35 | --- a/src/systemd/src/systemd/sd-dhcp-lease.h |
36 | +++ b/src/systemd/src/systemd/sd-dhcp-lease.h | 36 | +++ b/src/systemd/src/systemd/sd-dhcp-lease.h |
37 | @@ -22,7 +22,9 @@ | 37 | @@ -19,7 +19,9 @@ |
38 | ***/ | 38 | ***/ |
39 | 39 | ||
40 | #include <inttypes.h> | 40 | #include <inttypes.h> |
@@ -45,24 +45,24 @@ index 7ab99cc..85acdf2 100644 | |||
45 | #include <sys/types.h> | 45 | #include <sys/types.h> |
46 | 46 | ||
47 | diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h | 47 | diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h |
48 | index 7819f0d..35f30ee 100644 | 48 | index fa36dca..2d25010 100644 |
49 | --- a/src/systemd/src/systemd/sd-dhcp6-client.h | 49 | --- a/src/systemd/src/systemd/sd-dhcp6-client.h |
50 | +++ b/src/systemd/src/systemd/sd-dhcp6-client.h | 50 | +++ b/src/systemd/src/systemd/sd-dhcp6-client.h |
51 | @@ -21,7 +21,9 @@ | 51 | @@ -20,7 +20,9 @@ |
52 | ***/ | 52 | ***/ |
53 | 53 | ||
54 | #include <inttypes.h> | 54 | #include <inttypes.h> |
55 | +#if defined(__GLIBC__) | 55 | +#if defined(__GLIBC__) |
56 | #include <net/ethernet.h> | 56 | #include <net/ethernet.h> |
57 | +#endif | 57 | +#endif |
58 | #include <stdbool.h> | ||
58 | #include <sys/types.h> | 59 | #include <sys/types.h> |
59 | 60 | ||
60 | #include "sd-dhcp6-lease.h" | ||
61 | diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h | 61 | diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h |
62 | index 5ba9208..c90eca6 100644 | 62 | index 71bd4cf..1c667ba 100644 |
63 | --- a/src/systemd/src/systemd/sd-ipv4ll.h | 63 | --- a/src/systemd/src/systemd/sd-ipv4ll.h |
64 | +++ b/src/systemd/src/systemd/sd-ipv4ll.h | 64 | +++ b/src/systemd/src/systemd/sd-ipv4ll.h |
65 | @@ -20,7 +20,9 @@ | 65 | @@ -19,7 +19,9 @@ |
66 | along with systemd; If not, see <http://www.gnu.org/licenses/>. | 66 | along with systemd; If not, see <http://www.gnu.org/licenses/>. |
67 | ***/ | 67 | ***/ |
68 | 68 | ||
@@ -73,5 +73,5 @@ index 5ba9208..c90eca6 100644 | |||
73 | 73 | ||
74 | #include "sd-event.h" | 74 | #include "sd-event.h" |
75 | -- | 75 | -- |
76 | 2.14.3 | 76 | 2.14.5 |
77 | 77 | ||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch index 8ed7ee64f..023a4d9ad 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch | |||
@@ -18,7 +18,7 @@ diff --git a/src/systemd/src/basic/in-addr-util.c b/src/systemd/src/basic/in-add | |||
18 | index 2a02d90..a57c360 100644 | 18 | index 2a02d90..a57c360 100644 |
19 | --- a/src/systemd/src/basic/in-addr-util.c | 19 | --- a/src/systemd/src/basic/in-addr-util.c |
20 | +++ b/src/systemd/src/basic/in-addr-util.c | 20 | +++ b/src/systemd/src/basic/in-addr-util.c |
21 | @@ -30,6 +30,7 @@ | 21 | @@ -13,6 +13,7 @@ |
22 | #include "in-addr-util.h" | 22 | #include "in-addr-util.h" |
23 | #include "macro.h" | 23 | #include "macro.h" |
24 | #include "parse-util.h" | 24 | #include "parse-util.h" |
@@ -30,7 +30,7 @@ diff --git a/src/systemd/src/basic/string-util.h b/src/systemd/src/basic/string- | |||
30 | index 4c94b18..a6dc446 100644 | 30 | index 4c94b18..a6dc446 100644 |
31 | --- a/src/systemd/src/basic/string-util.h | 31 | --- a/src/systemd/src/basic/string-util.h |
32 | +++ b/src/systemd/src/basic/string-util.h | 32 | +++ b/src/systemd/src/basic/string-util.h |
33 | @@ -44,6 +44,11 @@ | 33 | @@ -26,6 +26,11 @@ |
34 | #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0) | 34 | #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0) |
35 | #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0) | 35 | #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0) |
36 | 36 | ||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.10.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb index 682c89623..3ce2a2f89 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.10.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb | |||
@@ -5,16 +5,13 @@ SECTION = "net/misc" | |||
5 | LICENSE = "GPLv2+" | 5 | LICENSE = "GPLv2+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ |
7 | file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ | 7 | file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ |
8 | file://docs/api/html/license.html;md5=ac20f1edc24f72480a1106871e9fbe9a \ | 8 | file://docs/api/html/license.html;md5=2d56a1b0c42e388aa86aef59b154e8c3 \ |
9 | " | 9 | " |
10 | 10 | ||
11 | DEPENDS = " \ | 11 | DEPENDS = " \ |
12 | intltool-native \ | 12 | intltool-native \ |
13 | libxslt-native \ | 13 | libxslt-native \ |
14 | libnl \ | 14 | libnl \ |
15 | dbus \ | ||
16 | dbus-glib \ | ||
17 | dbus-glib-native \ | ||
18 | libgudev \ | 15 | libgudev \ |
19 | util-linux \ | 16 | util-linux \ |
20 | libndp \ | 17 | libndp \ |
@@ -38,8 +35,8 @@ SRC_URI = " \ | |||
38 | file://musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch \ | 35 | file://musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch \ |
39 | file://musl/0006-Add-a-strndupa-replacement-for-musl.patch \ | 36 | file://musl/0006-Add-a-strndupa-replacement-for-musl.patch \ |
40 | " | 37 | " |
41 | SRC_URI[md5sum] = "8c67fc286150ed357b6c833b9e015330" | 38 | SRC_URI[md5sum] = "54ce62f0aa18ef6c5e754eaac47494ac" |
42 | SRC_URI[sha256sum] = "244e29c0d1a57492df9aaf2d8c31e4a1b76bdfa8e862ae106239862e1c78c3ca" | 39 | SRC_URI[sha256sum] = "35a3ede4c7d12d6212033c9e44cb82b7692f38063b53a067567f02f5937c8c18" |
43 | 40 | ||
44 | UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.10/" | 41 | UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.10/" |
45 | UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P<pver>1\.10(\.\d+)+).tar.xz" | 42 | UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P<pver>1\.10(\.\d+)+).tar.xz" |
@@ -48,8 +45,6 @@ S = "${WORKDIR}/NetworkManager-${PV}" | |||
48 | 45 | ||
49 | EXTRA_OECONF = " \ | 46 | EXTRA_OECONF = " \ |
50 | --disable-ifcfg-rh \ | 47 | --disable-ifcfg-rh \ |
51 | --disable-ifnet \ | ||
52 | --disable-ifcfg-suse \ | ||
53 | --disable-more-warnings \ | 48 | --disable-more-warnings \ |
54 | --with-iptables=${sbindir}/iptables \ | 49 | --with-iptables=${sbindir}/iptables \ |
55 | --with-tests \ | 50 | --with-tests \ |
@@ -69,7 +64,7 @@ do_compile_prepend() { | |||
69 | export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" | 64 | export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" |
70 | } | 65 | } |
71 | 66 | ||
72 | PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ | 67 | PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \ |
73 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ | 68 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ |
74 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ | 69 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ |
75 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ | 70 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ |
@@ -88,10 +83,10 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" | |||
88 | PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" | 83 | PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" |
89 | PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" | 84 | PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" |
90 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" | 85 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" |
86 | PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib" | ||
91 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" | 87 | PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" |
92 | PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant" | 88 | PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant" |
93 | PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" | 89 | PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" |
94 | PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" | ||
95 | PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" | 90 | PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" |
96 | 91 | ||
97 | PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \ | 92 | PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \ |
@@ -107,8 +102,7 @@ FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" | |||
107 | 102 | ||
108 | FILES_${PN} += " \ | 103 | FILES_${PN} += " \ |
109 | ${libexecdir} \ | 104 | ${libexecdir} \ |
110 | ${libdir}/pppd/*/nm-pppd-plugin.so \ | 105 | ${libdir}/NetworkManager/${PV}/*.so \ |
111 | ${libdir}/NetworkManager/*.so \ | ||
112 | ${nonarch_libdir}/NetworkManager/VPN \ | 106 | ${nonarch_libdir}/NetworkManager/VPN \ |
113 | ${nonarch_libdir}/NetworkManager/conf.d \ | 107 | ${nonarch_libdir}/NetworkManager/conf.d \ |
114 | ${datadir}/polkit-1 \ | 108 | ${datadir}/polkit-1 \ |