* [PATCH 0/9] Fixes and updates for sumo
@ 2018-04-09 22:02 Andreas Müller
2018-04-09 22:02 ` [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup Andreas Müller
` (9 more replies)
0 siblings, 10 replies; 16+ messages in thread
From: Andreas Müller @ 2018-04-09 22:02 UTC (permalink / raw)
To: openembedded-devel
History:
1. networkmanager: fix gobject-introspection/musl and cleanup: This was sent
already but not applied yet. Now I know why: It introduced a parse error
for PACKAGECONFIG. I removed this 'fix' - the recipe was perfectly fine. I did
not notice this error because one of my layers overrided PACKAGECONFIG for
networkmanager.
2. poppler: Rework patch fixing do_configure: resend
3. poppler: update 0.62.0- > 0.63.0: resend
4. poppler: fix build for TARGET_FPU = "soft": Fix for qemuarm build error on
autobuilder
5. New - more meta-gnome cleanup
6.-
9. New - build- and run-tested on Raspi3
The following changes since commit fa1913215275899b09c49c0bb5531f26909c5790:
samba: update to 4.7.6 (2018-04-09 12:32:07 -0400)
are available in the Git repository at:
https://github.com/schnitzeltony/meta-openembedded.git more-sumo
for you to fetch changes up to b3117108ca0c464638d401602a84b52ff05e0b41:
thunar: update 1.6.14 -> 1.6.15 (2018-04-09 23:40:27 +0200)
----------------------------------------------------------------
Andreas Müller (9):
networkmanager: fix gobject-introspection/musl and cleanup
poppler: Rework patch fixing do_configure
poppler: update 0.62.0- > 0.63.0
poppler: fix build for TARGET_FPU = "soft"
samba: refresh patches
polkit-gnome: remove
xfce4-terminal: update 0.8.7.2 -> 0.8.7.3
xfce4-whiskermenu-plugin: update 2.1.5 -> 2.1.6
thunar: update 1.6.14 -> 1.6.15
meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch | 86 ------------------------------------------------------------
...05-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch => 0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch} | 0
.../{0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch => 0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch} | 0
meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch | 30 ---------------------
meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch | 39 ---------------------------
meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch | 92 ----------------------------------------------------------------
meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch | 67 -----------------------------------------------
meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch | 53 +++++++++++++++++++++++++++++++++++++
meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch | 35 +++++++++++++++++++++++++
meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++
meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch | 62 +++++++++++++++++++++++++++++++++++++++++++
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb | 31 ++++++++++++----------
meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch | 5 ++--
meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch | 56 ++++++++++++++++++++++++---------------
meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch | 19 +++++++-------
meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch | 12 ---------
meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb | 28 --------------------
meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch | 36 +++++++++++++------------
meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
meta-oe/recipes-support/poppler/{poppler_0.62.0.bb => poppler_0.63.0.bb} | 5 ++--
meta-xfce/recipes-apps/xfce4-terminal/{xfce4-terminal_0.8.7.2.bb => xfce4-terminal_0.8.7.3.bb} | 4 +--
meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.1.5.bb => xfce4-whiskermenu-plugin_2.1.6.bb} | 4 +--
meta-xfce/recipes-xfce/thunar/{thunar_1.6.14.bb => thunar_1.6.15.bb} | 4 +--
24 files changed, 492 insertions(+), 425 deletions(-)
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch => 0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch} (100%)
rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch => 0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch} (100%)
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
delete mode 100644 meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch
delete mode 100644 meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb
create mode 100644 meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch
rename meta-oe/recipes-support/poppler/{poppler_0.62.0.bb => poppler_0.63.0.bb} (90%)
rename meta-xfce/recipes-apps/xfce4-terminal/{xfce4-terminal_0.8.7.2.bb => xfce4-terminal_0.8.7.3.bb} (68%)
rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.1.5.bb => xfce4-whiskermenu-plugin_2.1.6.bb} (66%)
rename meta-xfce/recipes-xfce/thunar/{thunar_1.6.14.bb => thunar_1.6.15.bb} (88%)
--
2.14.3
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup
2018-04-09 22:02 [PATCH 0/9] Fixes and updates for sumo Andreas Müller
@ 2018-04-09 22:02 ` Andreas Müller
2018-04-10 14:53 ` akuster808
2018-04-09 22:02 ` [PATCH 2/9] poppler: Rework patch fixing do_configure Andreas Müller
` (8 subsequent siblings)
9 siblings, 1 reply; 16+ messages in thread
From: Andreas Müller @ 2018-04-09 22:02 UTC (permalink / raw)
To: openembedded-devel
This adresses the comments for recent patch which updated nm to 1.10.6 and is a
follow-up for [1].
* Make gobject-introspection work by skipping creation of gobject-introspection
specific documentation. This fixes networkmanager-applet regression.
* Cleanup patches: Remove current musl patches completely and re-use those
found in void-linux because they do look much cleaner and don't touch glibc
build. One nice side effect: In the future when nm is updated we can steal
again and don't need to reenvent here. Usually they are much faster than we
are (and I know one major contibutor personally from the good old Z80 times..)
[1] https://patchwork.openembedded.org/patch/149244/
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
| 86 --------------------
...move-net-ethernet.h-seems-to-be-over-spe.patch} | 0
...igure.ac-Fix-pkgconfig-sysroot-locations.patch} | 0
...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 -------
.../networkmanager/0003-Define-ETH_ALEN.patch | 39 ---------
...te-settings-settings-property-documentati.patch | 77 ++++++++++++++++++
...Define-missing-features-to-cater-for-musl.patch | 92 ----------------------
.../0006-check-for-strndupa-before-using-it.patch | 67 ----------------
.../networkmanager/musl/0001-musl-basic.patch | 53 +++++++++++++
.../musl/0002-musl-dlopen-configure-ac.patch | 35 ++++++++
.../musl/0003-musl-network-support.patch | 72 +++++++++++++++++
.../musl/0004-musl-process-util.patch | 62 +++++++++++++++
.../networkmanager/networkmanager_1.10.6.bb | 31 ++++----
13 files changed, 316 insertions(+), 328 deletions(-)
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch => 0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch} (100%)
rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch => 0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch} (100%)
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
deleted file mode 100644
index 194e03722..000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From f81abf62c0ae93628df36c27357358523be25fb8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 15:57:05 -0700
-Subject: [PATCH 1/7] adjust net/ headers for musl compatibility
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libnm-core/nm-utils.c | 13 ++++++++-----
- libnm-core/nm-utils.h | 5 ++---
- src/platform/wifi/wifi-utils.h | 2 +-
- 3 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
-index ebbbfd3..77273df 100644
---- a/libnm-core/nm-utils.c
-+++ b/libnm-core/nm-utils.c
-@@ -19,14 +19,9 @@
- * Copyright 2005 - 2017 Red Hat, Inc.
- */
-
--#include "nm-default.h"
--
--#include "nm-utils.h"
--
- #include <string.h>
- #include <errno.h>
- #include <stdlib.h>
--#include <netinet/ether.h>
- #include <arpa/inet.h>
- #include <uuid/uuid.h>
- #include <libintl.h>
-@@ -34,12 +29,20 @@
- #include <sys/stat.h>
- #include <net/if.h>
- #include <linux/pkt_sched.h>
-+//#include <net/if_arp.h>
-+//#include <net/ethernet.h>
-+#include <netinet/ether.h>
-+
-+#include "nm-default.h"
-+
-+#include "nm-utils.h"
-
- #if WITH_JANSSON
- #include "nm-json.h"
- #include <jansson.h>
- #endif
-
-+
- #include "nm-utils/nm-enum-utils.h"
- #include "nm-utils/nm-hash-utils.h"
- #include "nm-common-macros.h"
-diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
-index df9284b..02e24ea 100644
---- a/libnm-core/nm-utils.h
-+++ b/libnm-core/nm-utils.h
-@@ -27,11 +27,10 @@
-
- #include <glib.h>
-
--#include <netinet/in.h>
--
- /* For ETH_ALEN and INFINIBAND_ALEN */
--#include <linux/if_ether.h>
-+//#include <linux/if_ether.h>
- #include <linux/if_infiniband.h>
-+#include <netinet/in.h>
-
- #include "nm-core-enum-types.h"
- #include "nm-setting-wireless-security.h"
-diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
-index 705717b..939080f 100644
---- a/src/platform/wifi/wifi-utils.h
-+++ b/src/platform/wifi/wifi-utils.h
-@@ -22,7 +22,7 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
-
--#include <net/ethernet.h>
-+//#include <net/ethernet.h>
-
- #include "nm-dbus-interface.h"
-
---
-2.14.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-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
similarity index 100%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
similarity index 100%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
deleted file mode 100644
index cdcd397d7..000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7f0e0613abe8aa1861946e2cc25397690da7128b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 16:05:05 -0700
-Subject: [PATCH 2/7] socket-util.h: Include linux/sockios.h on musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/systemd/src/basic/socket-util.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h
-index d7e2d85..2e7f7b6 100644
---- a/src/systemd/src/basic/socket-util.h
-+++ b/src/systemd/src/basic/socket-util.h
-@@ -30,6 +30,12 @@
- #include <linux/if_infiniband.h>
- #include <linux/if_packet.h>
-
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
-+
- #include "macro.h"
- #include "missing.h"
- #include "util.h"
---
-2.14.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
deleted file mode 100644
index 549e46e0e..000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d0951fe7da63d8296a305781d7322ce4d3249415 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 16:08:45 -0700
-Subject: [PATCH 3/7] Define ETH_ALEN
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libnm-core/nm-utils.h | 1 +
- src/platform/wifi/wifi-utils.h | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
-index 02e24ea..5ff279c 100644
---- a/libnm-core/nm-utils.h
-+++ b/libnm-core/nm-utils.h
-@@ -29,6 +29,7 @@
-
- /* For ETH_ALEN and INFINIBAND_ALEN */
- //#include <linux/if_ether.h>
-+#define ETH_ALEN 6 /* Octets in one ethernet addr */
- #include <linux/if_infiniband.h>
- #include <netinet/in.h>
-
-diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
-index 939080f..2274408 100644
---- a/src/platform/wifi/wifi-utils.h
-+++ b/src/platform/wifi/wifi-utils.h
-@@ -24,6 +24,8 @@
-
- //#include <net/ethernet.h>
-
-+#define ETH_ALEN 6 /* Octets in one ethernet addr */
-+
- #include "nm-dbus-interface.h"
-
- typedef struct WifiData WifiData;
---
-2.14.1
-
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
new file mode 100644
index 000000000..92485f044
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
@@ -0,0 +1,77 @@
+From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 22 Mar 2018 11:08:30 +0100
+Subject: [PATCH] Do not create settings settings/property documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It was tried to get this work but gi / GirRepository could not be found by
+python. Anyway it is not necessary for us to have the settings/property docs.
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ Makefile.am | 18 ++----------------
+ configure.ac | 4 ----
+ 2 files changed, 2 insertions(+), 20 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 639921d..314a61d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -961,9 +961,7 @@ endif
+ 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
+
+@@ -3317,23 +3315,11 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+ $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
+
+ clients_common_settings_doc_c = clients/common/settings-docs.c
+-if HAVE_INTROSPECTION
+-$(clients_common_settings_doc_c): 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_c)
+-check-local-settings-docs: $(clients_common_settings_doc_c)
+- @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \
+- if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \
+- 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"; \
+- false; \
+- fi;\
+- fi
+-check_local += check-local-settings-docs
+-else
++
+ $(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp
+ $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)"
+ check-local-settings-docs:
+-endif
++
+ EXTRA_DIST += \
+ $(clients_common_settings_doc_c) \
+ $(clients_common_settings_doc_c).in
+diff --git a/configure.ac b/configure.ac
+index c9d3e56..407222e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1286,10 +1286,6 @@ GTK_DOC_CHECK(1.0)
+ # check if we can build setting property documentation
+ build_docs=no
+ if test -n "$INTROSPECTION_MAKEFILE"; then
+- # If g-i is installed we know we have python, but we might not have pygobject
+- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then
+- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
+- fi
+
+ AC_PATH_PROG(PERL, perl)
+ if test -z "$PERL"; then
+--
+2.14.3
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
deleted file mode 100644
index b56f6a37d..000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From c9e0f112a90b6b1ade87a698608dca8d6fbe89cc Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 16:09:41 -0700
-Subject: [PATCH 4/7] Define missing features to cater for musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/systemd/sd-adapt/nm-sd-adapt.h | 2 +-
- src/systemd/src/basic/parse-util.c | 4 ++++
- src/systemd/src/basic/stdio-util.h | 2 ++
- src/systemd/src/basic/util.h | 5 +++++
- src/systemd/src/systemd/sd-event.h | 4 ----
- 5 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h
-index 0d291e2..d88dd9b 100644
---- a/src/systemd/sd-adapt/nm-sd-adapt.h
-+++ b/src/systemd/sd-adapt/nm-sd-adapt.h
-@@ -134,7 +134,7 @@ G_STMT_START { \
- # ifdef HAVE___SECURE_GETENV
- # define secure_getenv __secure_getenv
- # else
--# error neither secure_getenv nor __secure_getenv is available
-+# define secure_getenv getenv
- # endif
- #endif
-
-diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c
-index 6d978e9..e74e84b 100644
---- a/src/systemd/src/basic/parse-util.c
-+++ b/src/systemd/src/basic/parse-util.c
-@@ -21,7 +21,11 @@
-
- #include <errno.h>
- #include <inttypes.h>
-+#ifdef __GLIBC__
-+#include <xlocale.h>
-+#else
- #include <locale.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h
-index bd1144b..c92e935 100644
---- a/src/systemd/src/basic/stdio-util.h
-+++ b/src/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
-
-+#ifdef __GLIBC__
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
-diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h
-index b31dfd1..9b7032c 100644
---- a/src/systemd/src/basic/util.h
-+++ b/src/systemd/src/basic/util.h
-@@ -46,6 +46,11 @@
- #include "missing.h"
- #include "time-util.h"
-
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+#endif
-+
- size_t page_size(void) _pure_;
- #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
-
-diff --git a/src/systemd/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h
-index f8cb895..c7e0004 100644
---- a/src/systemd/src/systemd/sd-event.h
-+++ b/src/systemd/src/systemd/sd-event.h
-@@ -69,11 +69,7 @@ typedef int (*sd_event_handler_t)(sd_event_source *s, void *userdata);
- typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata);
- typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata);
- typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata);
--#if defined _GNU_SOURCE || _POSIX_C_SOURCE >= 199309L
- typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata);
--#else
--typedef void* sd_event_child_handler_t;
--#endif
-
- int sd_event_default(sd_event **e);
-
---
-2.14.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch
deleted file mode 100644
index 6adb84baa..000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From f24d958fc85f9a43ac13abc85f74c4ae233dc8a4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 18:37:19 -0700
-Subject: [PATCH 6/7] check for strndupa before using it
-
-musl does not have strndupa
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- config.h.in | 4 ++++
- configure.ac | 1 +
- src/systemd/src/basic/alloc-util.h | 12 ++++++++++++
- 3 files changed, 17 insertions(+)
-
-diff --git a/config.h.in b/config.h.in
-index edec211..0799030 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -34,6 +34,10 @@
- */
- #undef HAVE_DCGETTEXT
-
-+/* Define to 1 if you have the declaration of `strndupa', and to 0 if you
-+ don't. */
-+#undef HAVE_DECL_STRNDUPA
-+
- /* Define to 1 if you have the declaration of `explicit_bzero', and to 0 if
- you don't. */
- #undef HAVE_DECL_EXPLICIT_BZERO
-diff --git a/configure.ac b/configure.ac
-index 8a066ad..51e5eb6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,6 +56,7 @@ AC_SUBST(NM_VERSION)
-
- GIT_SHA_RECORD(NM_GIT_SHA)
-
-+AC_CHECK_DECLS([strndupa], [], [], [[#include <string.h>]])
- dnl
- dnl Checks for typedefs, structures, and compiler characteristics.
- dnl
-diff --git a/src/systemd/src/basic/alloc-util.h b/src/systemd/src/basic/alloc-util.h
-index 0a89691..1e95260 100644
---- a/src/systemd/src/basic/alloc-util.h
-+++ b/src/systemd/src/basic/alloc-util.h
-@@ -25,6 +25,18 @@
- #include <string.h>
-
- #include "macro.h"
-+#include "config.h"
-+
-+#if !HAVE_DECL_STRNDUPA
-+#define strndupa(s, n) \
-+ ({ \
-+ const char *__old = (s); \
-+ size_t __len = strnlen(__old, (n)); \
-+ char *__new = (char *)alloca(__len + 1); \
-+ __new[__len] = '\0'; \
-+ (char *)memcpy(__new, __old, __len); \
-+ })
-+#endif
-
- #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n)))
-
---
-2.14.1
-
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
new file mode 100644
index 000000000..9d208e1fd
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
@@ -0,0 +1,53 @@
+From e92de7409a3e107f90d108a9c5d49bd0418296dd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 22 Mar 2018 17:54:10 +0100
+Subject: [PATCH 1/4] Usual fix for musl libc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Stolen from [1] and prettyfied slightly
+
+[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/systemd/src/basic/stdio-util.h | 2 ++
+ src/systemd/src/basic/util.h | 5 +++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h
+index bd1144b..9eafacb 100644
+--- a/src/systemd/src/basic/stdio-util.h
++++ b/src/systemd/src/basic/stdio-util.h
+@@ -19,7 +19,9 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
+
++#if defined(__GLIBC__)
+ #include <printf.h>
++#endif
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h
+index b31dfd1..9b7032c 100644
+--- a/src/systemd/src/basic/util.h
++++ b/src/systemd/src/basic/util.h
+@@ -46,6 +46,11 @@
+ #include "missing.h"
+ #include "time-util.h"
+
++#if !defined(__GLIBC__)
++typedef int (*__compar_fn_t) (const void*, const void*);
++typedef __compar_fn_t comparison_fn_t;
++#endif
++
+ size_t page_size(void) _pure_;
+ #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
+
+--
+2.14.3
+
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
new file mode 100644
index 000000000..548cccb32
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
@@ -0,0 +1,35 @@
+From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 22 Mar 2018 18:18:06 +0100
+Subject: [PATCH 2/4] musl: dlopen is included so LD_LIBS="" instead of
+ LD_LIBS="none required"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Stolen from [1] and prettyfied slightly
+
+[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 487a266..96ae4f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -305,6 +305,7 @@ dnl
+ dnl Checks for libdl - on certain platforms its part of libc
+ dnl
+ AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
++AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""])
+ AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
+
+ PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
+--
+2.14.3
+
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
new file mode 100644
index 000000000..5dd17b63b
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
@@ -0,0 +1,72 @@
+From 714b4731a238653e9c7d885c0dee10677b0a4df3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 22 Mar 2018 18:24:07 +0100
+Subject: [PATCH 3/4] musl: network support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Stolen from [1] and prettyfied slightly
+
+[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ libnm-core/nm-utils.h | 4 ++++
+ src/platform/wifi/wifi-utils.h | 4 ++++
+ src/systemd/src/basic/socket-util.h | 5 +++++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
+index df9284b..2bcf4b8 100644
+--- a/libnm-core/nm-utils.h
++++ b/libnm-core/nm-utils.h
+@@ -30,7 +30,11 @@
+ #include <netinet/in.h>
+
+ /* For ETH_ALEN and INFINIBAND_ALEN */
++#if defined(__GLIBC__)
+ #include <linux/if_ether.h>
++#else
++#define ETH_ALEN 6 /* Octets in one ethernet addr */
++#endif
+ #include <linux/if_infiniband.h>
+
+ #include "nm-core-enum-types.h"
+diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
+index 705717b..da3edc4 100644
+--- a/src/platform/wifi/wifi-utils.h
++++ b/src/platform/wifi/wifi-utils.h
+@@ -22,7 +22,11 @@
+ #ifndef __WIFI_UTILS_H__
+ #define __WIFI_UTILS_H__
+
++#if defined(__GLIBC__)
+ #include <net/ethernet.h>
++#else /* musl libc */
++#define ETH_ALEN 6 /* Octets in one ethernet addr */
++#endif
+
+ #include "nm-dbus-interface.h"
+
+diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h
+index d7e2d85..d109c84 100644
+--- a/src/systemd/src/basic/socket-util.h
++++ b/src/systemd/src/basic/socket-util.h
+@@ -29,6 +29,11 @@
+ #include <linux/netlink.h>
+ #include <linux/if_infiniband.h>
+ #include <linux/if_packet.h>
++#if !defined(__GLIBC__)
++/* SIOCGSTAMPNS from linux/asm-generic.h
++ * for src/systemd/src/libsystemd-network/sd-lldp.c */
++#include <linux/sockios.h>
++#endif
+
+ #include "macro.h"
+ #include "missing.h"
+--
+2.14.3
+
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
new file mode 100644
index 000000000..fc55ce85f
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
@@ -0,0 +1,62 @@
+From d513c8bfc982dbd976617178b040c512c95710b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 22 Mar 2018 18:29:00 +0100
+Subject: [PATCH 4/4] musl: process-util
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Stolen from [1] and prettyfied slightly
+
+[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/systemd/src/basic/process-util.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/systemd/src/basic/process-util.c b/src/systemd/src/basic/process-util.c
+index 272030d..485f1db 100644
+--- a/src/systemd/src/basic/process-util.c
++++ b/src/systemd/src/basic/process-util.c
+@@ -36,6 +36,9 @@
+ #include <sys/wait.h>
+ #include <syslog.h>
+ #include <unistd.h>
++#ifndef __GLIBC__
++#include <pthread.h>
++#endif
+ #if 0 /* NM_IGNORED */
+ #if HAVE_VALGRIND_VALGRIND_H
+ #include <valgrind/valgrind.h>
+@@ -1015,11 +1018,13 @@ static void reset_cached_pid(void) {
+ cached_pid = CACHED_PID_UNSET;
+ }
+
++#ifdef __GLIBC__
+ /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
+ * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
+ * libpthread, as it is part of glibc anyway. */
+ extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle);
+ extern void* __dso_handle __attribute__ ((__weak__));
++#endif
+
+ pid_t getpid_cached(void) {
+ pid_t current_value;
+@@ -1042,7 +1047,11 @@ pid_t getpid_cached(void) {
+
+ new_pid = getpid();
+
++#ifdef __GLIBC__
+ if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
++#else
++ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
++#endif
+ /* OOM? Let's try again later */
+ cached_pid = CACHED_PID_UNSET;
+ return new_pid;
+--
+2.14.3
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
index 6538e7b82..972556176 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
DEPENDS = " \
intltool-native \
+ libxslt-native \
libnl \
dbus \
dbus-glib \
@@ -23,18 +24,18 @@ DEPENDS = " \
curl \
"
-inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection
-
-GI_DATA_ENABLED_libc-musl = "False"
-
-SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
- file://0001-adjust-net-headers-for-musl-compatibility.patch \
- file://0002-socket-util.h-Include-linux-sockios.h-on-musl.patch \
- file://0003-Define-ETH_ALEN.patch \
- file://0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
- file://0006-check-for-strndupa-before-using-it.patch \
- file://0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
- "
+inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection gtk-doc
+
+SRC_URI = " \
+ ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
+ file://0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
+ file://0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
+ file://0003-Do-not-create-settings-settings-property-documentati.patch \
+ file://musl/0001-musl-basic.patch \
+ file://musl/0002-musl-dlopen-configure-ac.patch \
+ file://musl/0003-musl-network-support.patch \
+ file://musl/0004-musl-process-util.patch \
+"
SRC_URI[md5sum] = "de3c7147a693da6f80eb22f126086a14"
SRC_URI[sha256sum] = "6af0b1e856a3725f88791f55c4fbb04105dc0b20dbf182aaec8aad16481fac76"
@@ -44,15 +45,17 @@ EXTRA_OECONF = " \
--disable-ifcfg-rh \
--disable-ifnet \
--disable-ifcfg-suse \
- --disable-introspection \
--disable-more-warnings \
--with-iptables=${sbindir}/iptables \
--with-tests \
--with-nmtui=yes \
"
+# gobject-introspection related
+GI_DATA_ENABLED_libc-musl = "False"
+
do_compile_prepend() {
- export GIR_EXTRA_LIBS_PATH="${B}/libnm-util/.libs"
+ export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs"
}
PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
--
2.14.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/9] poppler: Rework patch fixing do_configure
2018-04-09 22:02 [PATCH 0/9] Fixes and updates for sumo Andreas Müller
2018-04-09 22:02 ` [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup Andreas Müller
@ 2018-04-09 22:02 ` Andreas Müller
2018-04-09 22:02 ` [PATCH 3/9] poppler: update 0.62.0- > 0.63.0 Andreas Müller
` (7 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2018-04-09 22:02 UTC (permalink / raw)
To: openembedded-devel
Turn the patch from a workaround into a proper fix. It was submitted to poppler
bugzilla.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...0001-Do-not-overwrite-all-our-build-flags.patch | 36 ++++++++++++----------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch
index 5b66a8a9c..18f508519 100644
--- a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch
+++ b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch
@@ -10,27 +10,29 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- cmake/modules/PopplerMacros.cmake | 2 ++
- 1 file changed, 2 insertions(+)
+ cmake/modules/PopplerMacros.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index ccb2790..f29481e 100644
+index ccb2790..0f392cb 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
-@@ -98,6 +98,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-
-+if(false)
- if(CMAKE_COMPILER_IS_GNUCXX)
- # set the default compile warnings
- set(_warn "-Wall -Wextra -Wpedantic")
-@@ -159,4 +160,5 @@ if(CMAKE_C_COMPILER MATCHES "icc")
- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}")
- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}")
- endif(CMAKE_C_COMPILER MATCHES "icc")
-+endif(false)
+@@ -125,14 +125,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+ set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
++ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
+ set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
+ set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
+ set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+ set(_save_cflags "${CMAKE_C_FLAGS}")
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
++ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
+ set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
+ set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
--
2.14.3
-
--
2.14.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/9] poppler: update 0.62.0- > 0.63.0
2018-04-09 22:02 [PATCH 0/9] Fixes and updates for sumo Andreas Müller
2018-04-09 22:02 ` [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup Andreas Müller
2018-04-09 22:02 ` [PATCH 2/9] poppler: Rework patch fixing do_configure Andreas Müller
@ 2018-04-09 22:02 ` Andreas Müller
2018-04-09 22:02 ` [PATCH 4/9] poppler: fix build for TARGET_FPU = "soft" Andreas Müller
` (6 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2018-04-09 22:02 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-support/poppler/{poppler_0.62.0.bb => poppler_0.63.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-support/poppler/{poppler_0.62.0.bb => poppler_0.63.0.bb} (93%)
diff --git a/meta-oe/recipes-support/poppler/poppler_0.62.0.bb b/meta-oe/recipes-support/poppler/poppler_0.63.0.bb
similarity index 93%
rename from meta-oe/recipes-support/poppler/poppler_0.62.0.bb
rename to meta-oe/recipes-support/poppler/poppler_0.63.0.bb
index 696621938..143df3f73 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.62.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.63.0.bb
@@ -6,8 +6,8 @@ SRC_URI = " \
http://poppler.freedesktop.org/${BP}.tar.xz \
file://0001-Do-not-overwrite-all-our-build-flags.patch \
"
-SRC_URI[md5sum] = "42b801f2defaccb6b6cf1bf783ee1552"
-SRC_URI[sha256sum] = "5b9a73dfd4d6f61d165ada1e4f0abd2d420494bf9d0b1c15d0db3f7b83a729c6"
+SRC_URI[md5sum] = "66a54da4896b1408611699feda5c1821"
+SRC_URI[sha256sum] = "27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111"
DEPENDS = "fontconfig zlib cairo lcms"
--
2.14.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/9] poppler: fix build for TARGET_FPU = "soft"
2018-04-09 22:02 [PATCH 0/9] Fixes and updates for sumo Andreas Müller
` (2 preceding siblings ...)
2018-04-09 22:02 ` [PATCH 3/9] poppler: update 0.62.0- > 0.63.0 Andreas Müller
@ 2018-04-09 22:02 ` Andreas Müller
2018-04-09 22:02 ` [PATCH 5/9] samba: refresh patches Andreas Müller
` (5 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2018-04-09 22:02 UTC (permalink / raw)
To: openembedded-devel
Detected for qemuarm on autobuilder
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...Dev.cc-fix-build-error-when-using-fixedpo.patch | 100 +++++++++++++++++++++
meta-oe/recipes-support/poppler/poppler_0.63.0.bb | 1 +
2 files changed, 101 insertions(+)
create mode 100644 meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch
diff --git a/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch b/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch
new file mode 100644
index 000000000..3c231fe93
--- /dev/null
+++ b/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch
@@ -0,0 +1,100 @@
+From 6287663e7db04df7e6dec58a1fc5bb5d510e8bde Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 9 Apr 2018 19:11:20 +0200
+Subject: [PATCH] CairoOutputDev.cc: fix build error when using fixedpoint
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashRound(SplashCoord)':
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1604:28: error: call of overloaded 'floor(FixedPoint)' is ambiguous
+| return (int)floor(x + 0.5);
+| ^
+| In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44:
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:165:1: note: candidate: double floor(double)
+| __MATHCALLX (floor,, (_Mdouble_ __x), (__const__));
+| ^
+| In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/math.h:36:0,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:46:
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:260:3: note: candidate: constexpr float std::floor(float)
+| floor(float __x)
+| ^~~~~
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:264:3: note: candidate: constexpr long double std::floor(long double)
+| floor(long double __x)
+| ^~~~~
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashCeil(SplashCoord)':
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1608:21: error: call of overloaded 'ceil(SplashCoord&)' is ambiguous
+| return (int)ceil(x);
+| ^
+| In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44:
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:159:1: note: candidate: double ceil(double)
+| __MATHCALLX (ceil,, (_Mdouble_ __x), (__const__));
+| ^
+| In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/math.h:36:0,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:46:
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:165:3: note: candidate: constexpr float std::ceil(float)
+| ceil(float __x)
+| ^~~~
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:169:3: note: candidate: constexpr long double std::ceil(long double)
+| ceil(long double __x)
+| ^~~~
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashFloor(SplashCoord)':
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1612:22: error: call of overloaded 'floor(SplashCoord&)' is ambiguous
+| return (int)floor(x);
+| ^
+| In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38,
+| from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44:
+| <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:165:1: note: candidate: double floor(double)
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ poppler/CairoOutputDev.cc | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
+index 18124b8f..4c85ad65 100644
+--- a/poppler/CairoOutputDev.cc
++++ b/poppler/CairoOutputDev.cc
+@@ -1602,15 +1602,27 @@ void CairoOutputDev::endActualText(GfxState *state)
+ }
+
+ static inline int splashRound(SplashCoord x) {
++#if defined(USE_FIXEDPOINT)
++ return FixedPoint::floor(x + 0.5);
++#else
+ return (int)floor(x + 0.5);
++#endif
+ }
+
+ static inline int splashCeil(SplashCoord x) {
++#if defined(USE_FIXEDPOINT)
++ return FixedPoint::ceil(x);
++#else
+ return (int)ceil(x);
++#endif
+ }
+
+ static inline int splashFloor(SplashCoord x) {
++#if defined(USE_FIXEDPOINT)
++ return FixedPoint::floor(x);
++#else
+ return (int)floor(x);
++#endif
+ }
+
+ static
+--
+2.14.3
+
diff --git a/meta-oe/recipes-support/poppler/poppler_0.63.0.bb b/meta-oe/recipes-support/poppler/poppler_0.63.0.bb
index 143df3f73..8acb35628 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.63.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.63.0.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SRC_URI = " \
http://poppler.freedesktop.org/${BP}.tar.xz \
file://0001-Do-not-overwrite-all-our-build-flags.patch \
+ file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \
"
SRC_URI[md5sum] = "66a54da4896b1408611699feda5c1821"
SRC_URI[sha256sum] = "27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111"
--
2.14.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 5/9] samba: refresh patches
2018-04-09 22:02 [PATCH 0/9] Fixes and updates for sumo Andreas Müller
` (3 preceding siblings ...)
2018-04-09 22:02 ` [PATCH 4/9] poppler: fix build for TARGET_FPU = "soft" Andreas Müller
@ 2018-04-09 22:02 ` Andreas Müller
2018-04-09 22:02 ` [PATCH 6/9] polkit-gnome: remove Andreas Müller
` (4 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2018-04-09 22:02 UTC (permalink / raw)
To: openembedded-devel
For 16-do-not-check-xsltproc-manpages.patch devtool created a heavy monster
---
...void-timeout-for-nmbd-if-started-offline-.patch | 5 +-
.../samba/16-do-not-check-xsltproc-manpages.patch | 56 ++++++++++++++--------
.../21-add-config-option-without-valgrind.patch | 19 ++++----
3 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch b/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch
index 0ab3436fc..0e89a9be0 100644
--- a/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch
+++ b/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch
@@ -13,16 +13,17 @@ If no network connection appears within DefaultTimeoutStartSec
therefore get killed.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+
---
packaging/systemd/nmb.service | 1 +
1 file changed, 1 insertion(+)
diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
-index 992c0cd..555c9ab 100644
+index 71c93d6..f3d2fc2 100644
--- a/packaging/systemd/nmb.service
+++ b/packaging/systemd/nmb.service
@@ -10,6 +10,7 @@ EnvironmentFile=-/etc/sysconfig/samba
- ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
+ ExecStart=/usr/sbin/nmbd --foreground --no-process-group $NMBDOPTIONS
ExecReload=/usr/bin/kill -HUP $MAINPID
LimitCORE=infinity
+TimeoutStartSec=0
diff --git a/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch b/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch
index c37cfcde4..8ca7a52ed 100644
--- a/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch
+++ b/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch
@@ -1,13 +1,24 @@
-Don't check xsltproc manpages
+From 2214c2d1e455a38c891d17e421b438e3f7c495d8 Mon Sep 17 00:00:00 2001
+From: Bian Naimeng <biannm@cn.fujitsu.com>
+Date: Mon, 18 Apr 2016 17:00:53 -0400
+Subject: [PATCH] Don't check xsltproc manpages
+Upstream-Status: Pending
+
Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
-Index: samba-4.4.2/lib/ldb/wscript
-===================================================================
---- samba-4.4.2.orig/lib/ldb/wscript
-+++ samba-4.4.2/lib/ldb/wscript
-@@ -65,7 +65,7 @@ def configure(conf):
- conf.define('USING_SYSTEM_LDB', 1)
+---
+ lib/ldb/wscript | 2 +-
+ lib/talloc/wscript | 2 +-
+ lib/tdb/wscript | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/ldb/wscript b/lib/ldb/wscript
+index 5ea5231..d94086b 100644
+--- a/lib/ldb/wscript
++++ b/lib/ldb/wscript
+@@ -98,7 +98,7 @@ def configure(conf):
+ conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2]))
if conf.env.standalone_ldb:
- conf.CHECK_XSLTPROC_MANPAGES()
@@ -15,24 +26,24 @@ Index: samba-4.4.2/lib/ldb/wscript
# we need this for the ldap backend
if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
-Index: samba-4.4.2/lib/talloc/wscript
-===================================================================
---- samba-4.4.2.orig/lib/talloc/wscript
-+++ samba-4.4.2/lib/talloc/wscript
-@@ -56,7 +56,7 @@ def configure(conf):
- if conf.env.standalone_talloc:
- conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
+diff --git a/lib/talloc/wscript b/lib/talloc/wscript
+index df7e6be..b3305cf 100644
+--- a/lib/talloc/wscript
++++ b/lib/talloc/wscript
+@@ -49,7 +49,7 @@ def configure(conf):
+ conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
+ conf.env.TALLOC_VERSION = VERSION
- conf.CHECK_XSLTPROC_MANPAGES()
+ #conf.CHECK_XSLTPROC_MANPAGES()
- if not conf.env.disable_python:
- # also disable if we don't have the python libs installed
-Index: samba-4.4.2/lib/tdb/wscript
-===================================================================
---- samba-4.4.2.orig/lib/tdb/wscript
-+++ samba-4.4.2/lib/tdb/wscript
-@@ -92,7 +92,7 @@ def configure(conf):
+ conf.CHECK_HEADERS('sys/auxv.h')
+ conf.CHECK_FUNCS('getauxval')
+diff --git a/lib/tdb/wscript b/lib/tdb/wscript
+index 4782550..6bb3fa1 100644
+--- a/lib/tdb/wscript
++++ b/lib/tdb/wscript
+@@ -89,7 +89,7 @@ def configure(conf):
not conf.env.disable_tdb_mutex_locking):
conf.define('USE_TDB_MUTEX_LOCKING', 1)
@@ -41,3 +52,6 @@ Index: samba-4.4.2/lib/tdb/wscript
if not conf.env.disable_python:
# also disable if we don't have the python libs installed
+--
+2.14.3
+
diff --git a/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch
index 025ac2775..6a7f8facc 100644
--- a/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch
+++ b/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch
@@ -6,6 +6,7 @@ Subject: [PATCH] Add config option without-valgrind
Upstream-Status: Pending
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+
---
lib/replace/wscript | 4 +++-
source3/wscript | 5 ++++-
@@ -16,9 +17,9 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript
index f0040b1..aca73af 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
-@@ -101,7 +101,9 @@ struct foo bar = { .y = 'X', .x = 1 };
-
- conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
+@@ -101,7 +101,9 @@ def configure(conf):
+ conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
+ conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+ if not Options.options.disable_valgrind:
@@ -26,12 +27,12 @@ index f0040b1..aca73af 100644
+
conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
- conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h malloc.h')
+ conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
diff --git a/source3/wscript b/source3/wscript
index bac3dd5..a5c51ea 100644
--- a/source3/wscript
+++ b/source3/wscript
-@@ -1016,7 +1016,10 @@ syscall(SYS_setgroups32, 0, NULL);
+@@ -1070,7 +1070,10 @@ syscall(SYS_setgroups32, 0, NULL);
Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient")
else:
conf.DEFINE('WITH_DNS_UPDATES', 1)
@@ -44,12 +45,12 @@ index bac3dd5..a5c51ea 100644
if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'):
conf.DEFINE('VALGRIND', '1')
diff --git a/wscript b/wscript
-index 7679c0f..681ac17 100644
+index 542a60c..22e6116 100644
--- a/wscript
+++ b/wscript
-@@ -72,6 +72,10 @@ def set_options(opt):
- help=("Disable systemd integration"),
- action='store_false', dest='enable_systemd')
+@@ -86,6 +86,10 @@ def set_options(opt):
+ help=("Disable RELRO builds"),
+ action="store_false", dest='enable_relro')
+ opt.add_option('--without-valgrind',
+ help=("Disable use of the valgrind headers"),
--
2.14.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 6/9] polkit-gnome: remove
2018-04-09 22:02 [PATCH 0/9] Fixes and updates for sumo Andreas Müller
` (4 preceding siblings ...)
2018-04-09 22:02 ` [PATCH 5/9] samba: refresh patches Andreas Müller
@ 2018-04-09 22:02 ` Andreas Müller
2018-04-09 22:02 ` [PATCH 7/9] xfce4-terminal: update 0.8.7.2 -> 0.8.7.3 Andreas Müller
` (3 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2018-04-09 22:02 UTC (permalink / raw)
To: openembedded-devel
* last release was 2011
* it fails on autobuilder
* nothing uses it
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../polkit/files/gtk-doc-check.patch | 12 ----------
.../recipes-extended/polkit/polkit-gnome_0.105.bb | 28 ----------------------
2 files changed, 40 deletions(-)
delete mode 100644 meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch
delete mode 100644 meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb
diff --git a/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch b/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch
deleted file mode 100644
index 4b6ad75cc..000000000
--- a/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- polkit-gnome-0.105/configure.ac.org 2015-05-04 22:33:03.925977953 -0700
-+++ polkit-gnome-0.105/configure.ac 2015-05-04 22:33:16.862288030 -0700
-@@ -120,6 +120,9 @@
- # Check for required packages
- # ***************************
-
-+# check for gtk-doc
-+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-+
- POLKIT_AGENT_REQUIRED=0.97
- POLKIT_GOBJECT_REQUIRED=0.97
- GTK_REQUIRED=3.0.0
diff --git a/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb b/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb
deleted file mode 100644
index 6e941e5d7..000000000
--- a/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "GNOME Authentication Agent for PolicyKit"
-DESCRIPTION = "PolicyKit-gnome provides an Authentication Agent for PolicyKit that integrates well with the GNOME desktop environment"
-HOMEPAGE = "http://www.packagekit.org/"
-BUGTRACKER = "http://bugzilla.gnome.org/"
-DEPENDS = "polkit dbus-glib gconf gtk+ intltool-native gnome-common"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \
- file://src/main.c;beginline=1;endline=20;md5=aba145d1802f2329ba561e3e48ecb795"
-
-SRC_URI = "https://download.gnome.org/sources/polkit-gnome/${PV}/polkit-gnome-${PV}.tar.xz \
- file://gtk-doc-check.patch \
-"
-SRC_URI[md5sum] = "50ecad37c8342fb4a52f590db7530621"
-SRC_URI[sha256sum] = "1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369"
-
-EXTRA_OECONF = "\
- --disable-static \
-"
-
-DEPENDS += "gtk+3"
-
-inherit distro_features_check autotools gtk-doc pkgconfig
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-FILES_${PN} += " ${datadir}/dbus-1 \
- ${datadir}/PolicyKit \
-"
--
2.14.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 7/9] xfce4-terminal: update 0.8.7.2 -> 0.8.7.3
2018-04-09 22:02 [PATCH 0/9] Fixes and updates for sumo Andreas Müller
` (5 preceding siblings ...)
2018-04-09 22:02 ` [PATCH 6/9] polkit-gnome: remove Andreas Müller
@ 2018-04-09 22:02 ` Andreas Müller
2018-04-09 22:02 ` [PATCH 8/9] xfce4-whiskermenu-plugin: update 2.1.5 -> 2.1.6 Andreas Müller
` (2 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2018-04-09 22:02 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../{xfce4-terminal_0.8.7.2.bb => xfce4-terminal_0.8.7.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-apps/xfce4-terminal/{xfce4-terminal_0.8.7.2.bb => xfce4-terminal_0.8.7.3.bb} (68%)
diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.2.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb
similarity index 68%
rename from meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.2.bb
rename to meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb
index 26bdf59aa..7630abc6b 100644
--- a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.2.bb
+++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb
@@ -8,5 +8,5 @@ inherit xfce-app
FILES_${PN} += "${datadir}/xfce4 \
${datadir}/gnome-control-center"
-SRC_URI[md5sum] = "2a812438aeeb3d76e3d8d790817456bd"
-SRC_URI[sha256sum] = "a91fcbb89cab7987abc5d42e32d7ad62d2bf07656e30773eb274c7f087017bf3"
+SRC_URI[md5sum] = "f014d613438848b452f1f9eecbf7027d"
+SRC_URI[sha256sum] = "dafa155177934fc7dce2d4efb33402f74b1a593a17ff17d2187a6429f599dfd6"
--
2.14.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 8/9] xfce4-whiskermenu-plugin: update 2.1.5 -> 2.1.6
2018-04-09 22:02 [PATCH 0/9] Fixes and updates for sumo Andreas Müller
` (6 preceding siblings ...)
2018-04-09 22:02 ` [PATCH 7/9] xfce4-terminal: update 0.8.7.2 -> 0.8.7.3 Andreas Müller
@ 2018-04-09 22:02 ` Andreas Müller
2018-04-09 22:02 ` [PATCH 9/9] thunar: update 1.6.14 -> 1.6.15 Andreas Müller
2018-04-09 22:39 ` [PATCH 0/9] Fixes and updates for sumo akuster808
9 siblings, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2018-04-09 22:02 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.1.5.bb => xfce4-whiskermenu-plugin_2.1.6.bb} (66%)
diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.5.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.6.bb
similarity index 66%
rename from meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.5.bb
rename to meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.6.bb
index 4aed9902b..762cff0f6 100644
--- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.5.bb
+++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.6.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
inherit xfce-panel-plugin cmake
-SRC_URI[md5sum] = "9bb98425d45b027e7a35905d07b0cbbc"
-SRC_URI[sha256sum] = "20684ffe014b84d3d0630bbfcc5f8707582acb67b602ab7ef6317df6782df2b4"
+SRC_URI[md5sum] = "b2b2bacc8d5f3c3119a0f317b6074276"
+SRC_URI[sha256sum] = "8b2a8ee1445df39a2cda139e353f2e9ec3720a780296dc41b7d4aebde57371fc"
RRECOMMENDS_${PN} += "menulibre"
--
2.14.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 9/9] thunar: update 1.6.14 -> 1.6.15
2018-04-09 22:02 [PATCH 0/9] Fixes and updates for sumo Andreas Müller
` (7 preceding siblings ...)
2018-04-09 22:02 ` [PATCH 8/9] xfce4-whiskermenu-plugin: update 2.1.5 -> 2.1.6 Andreas Müller
@ 2018-04-09 22:02 ` Andreas Müller
2018-04-09 22:39 ` [PATCH 0/9] Fixes and updates for sumo akuster808
9 siblings, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2018-04-09 22:02 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-xfce/recipes-xfce/thunar/{thunar_1.6.14.bb => thunar_1.6.15.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-xfce/thunar/{thunar_1.6.14.bb => thunar_1.6.15.bb} (88%)
diff --git a/meta-xfce/recipes-xfce/thunar/thunar_1.6.14.bb b/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb
similarity index 88%
rename from meta-xfce/recipes-xfce/thunar/thunar_1.6.14.bb
rename to meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb
index 585a46d82..170e25070 100644
--- a/meta-xfce/recipes-xfce/thunar/thunar_1.6.14.bb
+++ b/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb
@@ -9,8 +9,8 @@ inherit xfce distro_features_check
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2"
-SRC_URI[md5sum] = "22ba809c5b146738a3531c9abca78522"
-SRC_URI[sha256sum] = "d6112133a1c43494e3b1cb75e775e1d05988805a06fd1e11253e9a29b8ebe59a"
+SRC_URI[md5sum] = "8fea2af69c3acbb273fd1a177d3d8e47"
+SRC_URI[sha256sum] = "e81291a8519f495e0a059ff1f2d29608bc6d37c0be83b1f38f3c9aa25f8d252d"
S = "${WORKDIR}/Thunar-${PV}/"
--
2.14.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 0/9] Fixes and updates for sumo
2018-04-09 22:02 [PATCH 0/9] Fixes and updates for sumo Andreas Müller
` (8 preceding siblings ...)
2018-04-09 22:02 ` [PATCH 9/9] thunar: update 1.6.14 -> 1.6.15 Andreas Müller
@ 2018-04-09 22:39 ` akuster808
2018-04-10 13:25 ` Andreas Müller
9 siblings, 1 reply; 16+ messages in thread
From: akuster808 @ 2018-04-09 22:39 UTC (permalink / raw)
To: Andreas Müller, openembedded-devel
On 04/09/2018 03:02 PM, Andreas Müller wrote:
> History:
>
> 1. networkmanager: fix gobject-introspection/musl and cleanup: This was sent
> already but not applied yet. Now I know why: It introduced a parse error
> for PACKAGECONFIG. I removed this 'fix' - the recipe was perfectly fine. I did
> not notice this error because one of my layers overrided PACKAGECONFIG for
> networkmanager.
> 2. poppler: Rework patch fixing do_configure: resend
> 3. poppler: update 0.62.0- > 0.63.0: resend
> 4. poppler: fix build for TARGET_FPU = "soft": Fix for qemuarm build error on
> autobuilder
> 5. New - more meta-gnome cleanup
> 6.-
> 9. New - build- and run-tested on Raspi3
Thanks. I will pull in for the next planed build.
regards,
Armin
>
> The following changes since commit fa1913215275899b09c49c0bb5531f26909c5790:
>
> samba: update to 4.7.6 (2018-04-09 12:32:07 -0400)
>
> are available in the Git repository at:
>
> https://github.com/schnitzeltony/meta-openembedded.git more-sumo
>
> for you to fetch changes up to b3117108ca0c464638d401602a84b52ff05e0b41:
>
> thunar: update 1.6.14 -> 1.6.15 (2018-04-09 23:40:27 +0200)
>
> ----------------------------------------------------------------
> Andreas Müller (9):
> networkmanager: fix gobject-introspection/musl and cleanup
> poppler: Rework patch fixing do_configure
> poppler: update 0.62.0- > 0.63.0
> poppler: fix build for TARGET_FPU = "soft"
> samba: refresh patches
> polkit-gnome: remove
> xfce4-terminal: update 0.8.7.2 -> 0.8.7.3
> xfce4-whiskermenu-plugin: update 2.1.5 -> 2.1.6
> thunar: update 1.6.14 -> 1.6.15
>
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch | 86 ------------------------------------------------------------
> ...05-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch => 0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch} | 0
> .../{0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch => 0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch} | 0
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch | 30 ---------------------
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch | 39 ---------------------------
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch | 92 ----------------------------------------------------------------
> meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch | 67 -----------------------------------------------
> meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch | 53 +++++++++++++++++++++++++++++++++++++
> meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch | 35 +++++++++++++++++++++++++
> meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++
> meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch | 62 +++++++++++++++++++++++++++++++++++++++++++
> meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb | 31 ++++++++++++----------
> meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch | 5 ++--
> meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch | 56 ++++++++++++++++++++++++---------------
> meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch | 19 +++++++-------
> meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch | 12 ---------
> meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb | 28 --------------------
> meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch | 36 +++++++++++++------------
> meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> meta-oe/recipes-support/poppler/{poppler_0.62.0.bb => poppler_0.63.0.bb} | 5 ++--
> meta-xfce/recipes-apps/xfce4-terminal/{xfce4-terminal_0.8.7.2.bb => xfce4-terminal_0.8.7.3.bb} | 4 +--
> meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.1.5.bb => xfce4-whiskermenu-plugin_2.1.6.bb} | 4 +--
> meta-xfce/recipes-xfce/thunar/{thunar_1.6.14.bb => thunar_1.6.15.bb} | 4 +--
> 24 files changed, 492 insertions(+), 425 deletions(-)
> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
> rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch => 0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch} (100%)
> rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch => 0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch} (100%)
> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
> create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch
> create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
> create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
> create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
> create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
> delete mode 100644 meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch
> delete mode 100644 meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb
> create mode 100644 meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch
> rename meta-oe/recipes-support/poppler/{poppler_0.62.0.bb => poppler_0.63.0.bb} (90%)
> rename meta-xfce/recipes-apps/xfce4-terminal/{xfce4-terminal_0.8.7.2.bb => xfce4-terminal_0.8.7.3.bb} (68%)
> rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.1.5.bb => xfce4-whiskermenu-plugin_2.1.6.bb} (66%)
> rename meta-xfce/recipes-xfce/thunar/{thunar_1.6.14.bb => thunar_1.6.15.bb} (88%)
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/9] Fixes and updates for sumo
2018-04-09 22:39 ` [PATCH 0/9] Fixes and updates for sumo akuster808
@ 2018-04-10 13:25 ` Andreas Müller
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Müller @ 2018-04-10 13:25 UTC (permalink / raw)
To: akuster808; +Cc: openembeded-devel
On Tue, Apr 10, 2018 at 12:39 AM, akuster808 <akuster808@gmail.com> wrote:
>
>
> On 04/09/2018 03:02 PM, Andreas Müller wrote:
>> History:
>>
>> 1. networkmanager: fix gobject-introspection/musl and cleanup: This was sent
>> already but not applied yet. Now I know why: It introduced a parse error
>> for PACKAGECONFIG. I removed this 'fix' - the recipe was perfectly fine. I did
>> not notice this error because one of my layers overrided PACKAGECONFIG for
>> networkmanager.
>> 2. poppler: Rework patch fixing do_configure: resend
>> 3. poppler: update 0.62.0- > 0.63.0: resend
>> 4. poppler: fix build for TARGET_FPU = "soft": Fix for qemuarm build error on
>> autobuilder
>> 5. New - more meta-gnome cleanup
>> 6.-
>> 9. New - build- and run-tested on Raspi3
>
> Thanks. I will pull in for the next planed build.
>
Hi Armin,
can you please update stagging/master-next then - last update upstream
is 3 weeks old. For me that would help to see what the autobuilder
builds currently (and if patches are not applied look into further)
Regards
Andreas
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup
2018-04-09 22:02 ` [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup Andreas Müller
@ 2018-04-10 14:53 ` akuster808
2018-04-10 15:02 ` Andreas Müller
0 siblings, 1 reply; 16+ messages in thread
From: akuster808 @ 2018-04-10 14:53 UTC (permalink / raw)
To: Andreas Müller, openembedded-devel
On 04/09/2018 03:02 PM, Andreas Müller wrote:
> This adresses the comments for recent patch which updated nm to 1.10.6 and is a
> follow-up for [1].
There is a form of this already in my stagging/master-next. Should it
be removed and replaced by this one?
- armin
>
> * Make gobject-introspection work by skipping creation of gobject-introspection
> specific documentation. This fixes networkmanager-applet regression.
> * Cleanup patches: Remove current musl patches completely and re-use those
> found in void-linux because they do look much cleaner and don't touch glibc
> build. One nice side effect: In the future when nm is updated we can steal
> again and don't need to reenvent here. Usually they are much faster than we
> are (and I know one major contibutor personally from the good old Z80 times..)
>
> [1] https://patchwork.openembedded.org/patch/149244/
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> ...adjust-net-headers-for-musl-compatibility.patch | 86 --------------------
> ...move-net-ethernet.h-seems-to-be-over-spe.patch} | 0
> ...igure.ac-Fix-pkgconfig-sysroot-locations.patch} | 0
> ...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 -------
> .../networkmanager/0003-Define-ETH_ALEN.patch | 39 ---------
> ...te-settings-settings-property-documentati.patch | 77 ++++++++++++++++++
> ...Define-missing-features-to-cater-for-musl.patch | 92 ----------------------
> .../0006-check-for-strndupa-before-using-it.patch | 67 ----------------
> .../networkmanager/musl/0001-musl-basic.patch | 53 +++++++++++++
> .../musl/0002-musl-dlopen-configure-ac.patch | 35 ++++++++
> .../musl/0003-musl-network-support.patch | 72 +++++++++++++++++
> .../musl/0004-musl-process-util.patch | 62 +++++++++++++++
> .../networkmanager/networkmanager_1.10.6.bb | 31 ++++----
> 13 files changed, 316 insertions(+), 328 deletions(-)
> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
> rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch => 0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch} (100%)
> rename meta-networking/recipes-connectivity/networkmanager/networkmanager/{0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch => 0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch} (100%)
> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
> create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
> delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch
> create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
> create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
> create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
> create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
>
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
> deleted file mode 100644
> index 194e03722..000000000
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
> +++ /dev/null
> @@ -1,86 +0,0 @@
> -From f81abf62c0ae93628df36c27357358523be25fb8 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 31 Mar 2017 15:57:05 -0700
> -Subject: [PATCH 1/7] adjust net/ headers for musl compatibility
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - libnm-core/nm-utils.c | 13 ++++++++-----
> - libnm-core/nm-utils.h | 5 ++---
> - src/platform/wifi/wifi-utils.h | 2 +-
> - 3 files changed, 11 insertions(+), 9 deletions(-)
> -
> -diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
> -index ebbbfd3..77273df 100644
> ---- a/libnm-core/nm-utils.c
> -+++ b/libnm-core/nm-utils.c
> -@@ -19,14 +19,9 @@
> - * Copyright 2005 - 2017 Red Hat, Inc.
> - */
> -
> --#include "nm-default.h"
> --
> --#include "nm-utils.h"
> --
> - #include <string.h>
> - #include <errno.h>
> - #include <stdlib.h>
> --#include <netinet/ether.h>
> - #include <arpa/inet.h>
> - #include <uuid/uuid.h>
> - #include <libintl.h>
> -@@ -34,12 +29,20 @@
> - #include <sys/stat.h>
> - #include <net/if.h>
> - #include <linux/pkt_sched.h>
> -+//#include <net/if_arp.h>
> -+//#include <net/ethernet.h>
> -+#include <netinet/ether.h>
> -+
> -+#include "nm-default.h"
> -+
> -+#include "nm-utils.h"
> -
> - #if WITH_JANSSON
> - #include "nm-json.h"
> - #include <jansson.h>
> - #endif
> -
> -+
> - #include "nm-utils/nm-enum-utils.h"
> - #include "nm-utils/nm-hash-utils.h"
> - #include "nm-common-macros.h"
> -diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
> -index df9284b..02e24ea 100644
> ---- a/libnm-core/nm-utils.h
> -+++ b/libnm-core/nm-utils.h
> -@@ -27,11 +27,10 @@
> -
> - #include <glib.h>
> -
> --#include <netinet/in.h>
> --
> - /* For ETH_ALEN and INFINIBAND_ALEN */
> --#include <linux/if_ether.h>
> -+//#include <linux/if_ether.h>
> - #include <linux/if_infiniband.h>
> -+#include <netinet/in.h>
> -
> - #include "nm-core-enum-types.h"
> - #include "nm-setting-wireless-security.h"
> -diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
> -index 705717b..939080f 100644
> ---- a/src/platform/wifi/wifi-utils.h
> -+++ b/src/platform/wifi/wifi-utils.h
> -@@ -22,7 +22,7 @@
> - #ifndef __WIFI_UTILS_H__
> - #define __WIFI_UTILS_H__
> -
> --#include <net/ethernet.h>
> -+//#include <net/ethernet.h>
> -
> - #include "nm-dbus-interface.h"
> -
> ---
> -2.14.1
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-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
> similarity index 100%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> similarity index 100%
> rename from meta-networking/recipes-connectivity/networkmanager/networkmanager/0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> rename to meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
> deleted file mode 100644
> index cdcd397d7..000000000
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From 7f0e0613abe8aa1861946e2cc25397690da7128b Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 31 Mar 2017 16:05:05 -0700
> -Subject: [PATCH 2/7] socket-util.h: Include linux/sockios.h on musl
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - src/systemd/src/basic/socket-util.h | 6 ++++++
> - 1 file changed, 6 insertions(+)
> -
> -diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h
> -index d7e2d85..2e7f7b6 100644
> ---- a/src/systemd/src/basic/socket-util.h
> -+++ b/src/systemd/src/basic/socket-util.h
> -@@ -30,6 +30,12 @@
> - #include <linux/if_infiniband.h>
> - #include <linux/if_packet.h>
> -
> -+#if !defined(__GLIBC__)
> -+/* SIOCGSTAMPNS from linux/asm-generic.h
> -+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
> -+#include <linux/sockios.h>
> -+#endif
> -+
> - #include "macro.h"
> - #include "missing.h"
> - #include "util.h"
> ---
> -2.14.1
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
> deleted file mode 100644
> index 549e46e0e..000000000
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From d0951fe7da63d8296a305781d7322ce4d3249415 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 31 Mar 2017 16:08:45 -0700
> -Subject: [PATCH 3/7] Define ETH_ALEN
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - libnm-core/nm-utils.h | 1 +
> - src/platform/wifi/wifi-utils.h | 2 ++
> - 2 files changed, 3 insertions(+)
> -
> -diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
> -index 02e24ea..5ff279c 100644
> ---- a/libnm-core/nm-utils.h
> -+++ b/libnm-core/nm-utils.h
> -@@ -29,6 +29,7 @@
> -
> - /* For ETH_ALEN and INFINIBAND_ALEN */
> - //#include <linux/if_ether.h>
> -+#define ETH_ALEN 6 /* Octets in one ethernet addr */
> - #include <linux/if_infiniband.h>
> - #include <netinet/in.h>
> -
> -diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
> -index 939080f..2274408 100644
> ---- a/src/platform/wifi/wifi-utils.h
> -+++ b/src/platform/wifi/wifi-utils.h
> -@@ -24,6 +24,8 @@
> -
> - //#include <net/ethernet.h>
> -
> -+#define ETH_ALEN 6 /* Octets in one ethernet addr */
> -+
> - #include "nm-dbus-interface.h"
> -
> - typedef struct WifiData WifiData;
> ---
> -2.14.1
> -
> 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
> new file mode 100644
> index 000000000..92485f044
> --- /dev/null
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
> @@ -0,0 +1,77 @@
> +From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Thu, 22 Mar 2018 11:08:30 +0100
> +Subject: [PATCH] Do not create settings settings/property documentation
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +It was tried to get this work but gi / GirRepository could not be found by
> +python. Anyway it is not necessary for us to have the settings/property docs.
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + Makefile.am | 18 ++----------------
> + configure.ac | 4 ----
> + 2 files changed, 2 insertions(+), 20 deletions(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 639921d..314a61d 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -961,9 +961,7 @@ endif
> + 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
> +
> +@@ -3317,23 +3315,11 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
> + $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
> +
> + clients_common_settings_doc_c = clients/common/settings-docs.c
> +-if HAVE_INTROSPECTION
> +-$(clients_common_settings_doc_c): 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_c)
> +-check-local-settings-docs: $(clients_common_settings_doc_c)
> +- @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \
> +- if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \
> +- 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"; \
> +- false; \
> +- fi;\
> +- fi
> +-check_local += check-local-settings-docs
> +-else
> ++
> + $(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp
> + $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)"
> + check-local-settings-docs:
> +-endif
> ++
> + EXTRA_DIST += \
> + $(clients_common_settings_doc_c) \
> + $(clients_common_settings_doc_c).in
> +diff --git a/configure.ac b/configure.ac
> +index c9d3e56..407222e 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -1286,10 +1286,6 @@ GTK_DOC_CHECK(1.0)
> + # check if we can build setting property documentation
> + build_docs=no
> + if test -n "$INTROSPECTION_MAKEFILE"; then
> +- # If g-i is installed we know we have python, but we might not have pygobject
> +- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then
> +- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
> +- fi
> +
> + AC_PATH_PROG(PERL, perl)
> + if test -z "$PERL"; then
> +--
> +2.14.3
> +
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
> deleted file mode 100644
> index b56f6a37d..000000000
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
> +++ /dev/null
> @@ -1,92 +0,0 @@
> -From c9e0f112a90b6b1ade87a698608dca8d6fbe89cc Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 31 Mar 2017 16:09:41 -0700
> -Subject: [PATCH 4/7] Define missing features to cater for musl
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - src/systemd/sd-adapt/nm-sd-adapt.h | 2 +-
> - src/systemd/src/basic/parse-util.c | 4 ++++
> - src/systemd/src/basic/stdio-util.h | 2 ++
> - src/systemd/src/basic/util.h | 5 +++++
> - src/systemd/src/systemd/sd-event.h | 4 ----
> - 5 files changed, 12 insertions(+), 5 deletions(-)
> -
> -diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h
> -index 0d291e2..d88dd9b 100644
> ---- a/src/systemd/sd-adapt/nm-sd-adapt.h
> -+++ b/src/systemd/sd-adapt/nm-sd-adapt.h
> -@@ -134,7 +134,7 @@ G_STMT_START { \
> - # ifdef HAVE___SECURE_GETENV
> - # define secure_getenv __secure_getenv
> - # else
> --# error neither secure_getenv nor __secure_getenv is available
> -+# define secure_getenv getenv
> - # endif
> - #endif
> -
> -diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c
> -index 6d978e9..e74e84b 100644
> ---- a/src/systemd/src/basic/parse-util.c
> -+++ b/src/systemd/src/basic/parse-util.c
> -@@ -21,7 +21,11 @@
> -
> - #include <errno.h>
> - #include <inttypes.h>
> -+#ifdef __GLIBC__
> -+#include <xlocale.h>
> -+#else
> - #include <locale.h>
> -+#endif
> - #include <stdio.h>
> - #include <stdlib.h>
> - #include <string.h>
> -diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h
> -index bd1144b..c92e935 100644
> ---- a/src/systemd/src/basic/stdio-util.h
> -+++ b/src/systemd/src/basic/stdio-util.h
> -@@ -19,7 +19,9 @@
> - along with systemd; If not, see <http://www.gnu.org/licenses/>.
> - ***/
> -
> -+#ifdef __GLIBC__
> - #include <printf.h>
> -+#endif
> - #include <stdarg.h>
> - #include <stdio.h>
> - #include <sys/types.h>
> -diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h
> -index b31dfd1..9b7032c 100644
> ---- a/src/systemd/src/basic/util.h
> -+++ b/src/systemd/src/basic/util.h
> -@@ -46,6 +46,11 @@
> - #include "missing.h"
> - #include "time-util.h"
> -
> -+#if !defined(__GLIBC__)
> -+typedef int (*__compar_fn_t) (const void*, const void*);
> -+typedef __compar_fn_t comparison_fn_t;
> -+#endif
> -+
> - size_t page_size(void) _pure_;
> - #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
> -
> -diff --git a/src/systemd/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h
> -index f8cb895..c7e0004 100644
> ---- a/src/systemd/src/systemd/sd-event.h
> -+++ b/src/systemd/src/systemd/sd-event.h
> -@@ -69,11 +69,7 @@ typedef int (*sd_event_handler_t)(sd_event_source *s, void *userdata);
> - typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata);
> - typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata);
> - typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata);
> --#if defined _GNU_SOURCE || _POSIX_C_SOURCE >= 199309L
> - typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata);
> --#else
> --typedef void* sd_event_child_handler_t;
> --#endif
> -
> - int sd_event_default(sd_event **e);
> -
> ---
> -2.14.1
> -
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch
> deleted file mode 100644
> index 6adb84baa..000000000
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0006-check-for-strndupa-before-using-it.patch
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -From f24d958fc85f9a43ac13abc85f74c4ae233dc8a4 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 31 Mar 2017 18:37:19 -0700
> -Subject: [PATCH 6/7] check for strndupa before using it
> -
> -musl does not have strndupa
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - config.h.in | 4 ++++
> - configure.ac | 1 +
> - src/systemd/src/basic/alloc-util.h | 12 ++++++++++++
> - 3 files changed, 17 insertions(+)
> -
> -diff --git a/config.h.in b/config.h.in
> -index edec211..0799030 100644
> ---- a/config.h.in
> -+++ b/config.h.in
> -@@ -34,6 +34,10 @@
> - */
> - #undef HAVE_DCGETTEXT
> -
> -+/* Define to 1 if you have the declaration of `strndupa', and to 0 if you
> -+ don't. */
> -+#undef HAVE_DECL_STRNDUPA
> -+
> - /* Define to 1 if you have the declaration of `explicit_bzero', and to 0 if
> - you don't. */
> - #undef HAVE_DECL_EXPLICIT_BZERO
> -diff --git a/configure.ac b/configure.ac
> -index 8a066ad..51e5eb6 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -56,6 +56,7 @@ AC_SUBST(NM_VERSION)
> -
> - GIT_SHA_RECORD(NM_GIT_SHA)
> -
> -+AC_CHECK_DECLS([strndupa], [], [], [[#include <string.h>]])
> - dnl
> - dnl Checks for typedefs, structures, and compiler characteristics.
> - dnl
> -diff --git a/src/systemd/src/basic/alloc-util.h b/src/systemd/src/basic/alloc-util.h
> -index 0a89691..1e95260 100644
> ---- a/src/systemd/src/basic/alloc-util.h
> -+++ b/src/systemd/src/basic/alloc-util.h
> -@@ -25,6 +25,18 @@
> - #include <string.h>
> -
> - #include "macro.h"
> -+#include "config.h"
> -+
> -+#if !HAVE_DECL_STRNDUPA
> -+#define strndupa(s, n) \
> -+ ({ \
> -+ const char *__old = (s); \
> -+ size_t __len = strnlen(__old, (n)); \
> -+ char *__new = (char *)alloca(__len + 1); \
> -+ __new[__len] = '\0'; \
> -+ (char *)memcpy(__new, __old, __len); \
> -+ })
> -+#endif
> -
> - #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n)))
> -
> ---
> -2.14.1
> -
> 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
> new file mode 100644
> index 000000000..9d208e1fd
> --- /dev/null
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
> @@ -0,0 +1,53 @@
> +From e92de7409a3e107f90d108a9c5d49bd0418296dd Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Thu, 22 Mar 2018 17:54:10 +0100
> +Subject: [PATCH 1/4] Usual fix for musl libc
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Pending
> +
> +Stolen from [1] and prettyfied slightly
> +
> +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + src/systemd/src/basic/stdio-util.h | 2 ++
> + src/systemd/src/basic/util.h | 5 +++++
> + 2 files changed, 7 insertions(+)
> +
> +diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h
> +index bd1144b..9eafacb 100644
> +--- a/src/systemd/src/basic/stdio-util.h
> ++++ b/src/systemd/src/basic/stdio-util.h
> +@@ -19,7 +19,9 @@
> + along with systemd; If not, see <http://www.gnu.org/licenses/>.
> + ***/
> +
> ++#if defined(__GLIBC__)
> + #include <printf.h>
> ++#endif
> + #include <stdarg.h>
> + #include <stdio.h>
> + #include <sys/types.h>
> +diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h
> +index b31dfd1..9b7032c 100644
> +--- a/src/systemd/src/basic/util.h
> ++++ b/src/systemd/src/basic/util.h
> +@@ -46,6 +46,11 @@
> + #include "missing.h"
> + #include "time-util.h"
> +
> ++#if !defined(__GLIBC__)
> ++typedef int (*__compar_fn_t) (const void*, const void*);
> ++typedef __compar_fn_t comparison_fn_t;
> ++#endif
> ++
> + size_t page_size(void) _pure_;
> + #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
> +
> +--
> +2.14.3
> +
> 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
> new file mode 100644
> index 000000000..548cccb32
> --- /dev/null
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
> @@ -0,0 +1,35 @@
> +From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Thu, 22 Mar 2018 18:18:06 +0100
> +Subject: [PATCH 2/4] musl: dlopen is included so LD_LIBS="" instead of
> + LD_LIBS="none required"
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Pending
> +
> +Stolen from [1] and prettyfied slightly
> +
> +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + configure.ac | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 487a266..96ae4f7 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -305,6 +305,7 @@ dnl
> + dnl Checks for libdl - on certain platforms its part of libc
> + dnl
> + AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
> ++AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""])
> + AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
> +
> + PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
> +--
> +2.14.3
> +
> 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
> new file mode 100644
> index 000000000..5dd17b63b
> --- /dev/null
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
> @@ -0,0 +1,72 @@
> +From 714b4731a238653e9c7d885c0dee10677b0a4df3 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Thu, 22 Mar 2018 18:24:07 +0100
> +Subject: [PATCH 3/4] musl: network support
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Pending
> +
> +Stolen from [1] and prettyfied slightly
> +
> +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + libnm-core/nm-utils.h | 4 ++++
> + src/platform/wifi/wifi-utils.h | 4 ++++
> + src/systemd/src/basic/socket-util.h | 5 +++++
> + 3 files changed, 13 insertions(+)
> +
> +diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
> +index df9284b..2bcf4b8 100644
> +--- a/libnm-core/nm-utils.h
> ++++ b/libnm-core/nm-utils.h
> +@@ -30,7 +30,11 @@
> + #include <netinet/in.h>
> +
> + /* For ETH_ALEN and INFINIBAND_ALEN */
> ++#if defined(__GLIBC__)
> + #include <linux/if_ether.h>
> ++#else
> ++#define ETH_ALEN 6 /* Octets in one ethernet addr */
> ++#endif
> + #include <linux/if_infiniband.h>
> +
> + #include "nm-core-enum-types.h"
> +diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
> +index 705717b..da3edc4 100644
> +--- a/src/platform/wifi/wifi-utils.h
> ++++ b/src/platform/wifi/wifi-utils.h
> +@@ -22,7 +22,11 @@
> + #ifndef __WIFI_UTILS_H__
> + #define __WIFI_UTILS_H__
> +
> ++#if defined(__GLIBC__)
> + #include <net/ethernet.h>
> ++#else /* musl libc */
> ++#define ETH_ALEN 6 /* Octets in one ethernet addr */
> ++#endif
> +
> + #include "nm-dbus-interface.h"
> +
> +diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h
> +index d7e2d85..d109c84 100644
> +--- a/src/systemd/src/basic/socket-util.h
> ++++ b/src/systemd/src/basic/socket-util.h
> +@@ -29,6 +29,11 @@
> + #include <linux/netlink.h>
> + #include <linux/if_infiniband.h>
> + #include <linux/if_packet.h>
> ++#if !defined(__GLIBC__)
> ++/* SIOCGSTAMPNS from linux/asm-generic.h
> ++ * for src/systemd/src/libsystemd-network/sd-lldp.c */
> ++#include <linux/sockios.h>
> ++#endif
> +
> + #include "macro.h"
> + #include "missing.h"
> +--
> +2.14.3
> +
> 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
> new file mode 100644
> index 000000000..fc55ce85f
> --- /dev/null
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
> @@ -0,0 +1,62 @@
> +From d513c8bfc982dbd976617178b040c512c95710b6 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Thu, 22 Mar 2018 18:29:00 +0100
> +Subject: [PATCH 4/4] musl: process-util
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Pending
> +
> +Stolen from [1] and prettyfied slightly
> +
> +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + src/systemd/src/basic/process-util.c | 9 +++++++++
> + 1 file changed, 9 insertions(+)
> +
> +diff --git a/src/systemd/src/basic/process-util.c b/src/systemd/src/basic/process-util.c
> +index 272030d..485f1db 100644
> +--- a/src/systemd/src/basic/process-util.c
> ++++ b/src/systemd/src/basic/process-util.c
> +@@ -36,6 +36,9 @@
> + #include <sys/wait.h>
> + #include <syslog.h>
> + #include <unistd.h>
> ++#ifndef __GLIBC__
> ++#include <pthread.h>
> ++#endif
> + #if 0 /* NM_IGNORED */
> + #if HAVE_VALGRIND_VALGRIND_H
> + #include <valgrind/valgrind.h>
> +@@ -1015,11 +1018,13 @@ static void reset_cached_pid(void) {
> + cached_pid = CACHED_PID_UNSET;
> + }
> +
> ++#ifdef __GLIBC__
> + /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
> + * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
> + * libpthread, as it is part of glibc anyway. */
> + extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle);
> + extern void* __dso_handle __attribute__ ((__weak__));
> ++#endif
> +
> + pid_t getpid_cached(void) {
> + pid_t current_value;
> +@@ -1042,7 +1047,11 @@ pid_t getpid_cached(void) {
> +
> + new_pid = getpid();
> +
> ++#ifdef __GLIBC__
> + if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
> ++#else
> ++ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
> ++#endif
> + /* OOM? Let's try again later */
> + cached_pid = CACHED_PID_UNSET;
> + return new_pid;
> +--
> +2.14.3
> +
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
> index 6538e7b82..972556176 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
> @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
>
> DEPENDS = " \
> intltool-native \
> + libxslt-native \
> libnl \
> dbus \
> dbus-glib \
> @@ -23,18 +24,18 @@ DEPENDS = " \
> curl \
> "
>
> -inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection
> -
> -GI_DATA_ENABLED_libc-musl = "False"
> -
> -SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
> - file://0001-adjust-net-headers-for-musl-compatibility.patch \
> - file://0002-socket-util.h-Include-linux-sockios.h-on-musl.patch \
> - file://0003-Define-ETH_ALEN.patch \
> - file://0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
> - file://0006-check-for-strndupa-before-using-it.patch \
> - file://0007-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
> - "
> +inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection gtk-doc
> +
> +SRC_URI = " \
> + ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
> + file://0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
> + file://0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
> + file://0003-Do-not-create-settings-settings-property-documentati.patch \
> + file://musl/0001-musl-basic.patch \
> + file://musl/0002-musl-dlopen-configure-ac.patch \
> + file://musl/0003-musl-network-support.patch \
> + file://musl/0004-musl-process-util.patch \
> +"
> SRC_URI[md5sum] = "de3c7147a693da6f80eb22f126086a14"
> SRC_URI[sha256sum] = "6af0b1e856a3725f88791f55c4fbb04105dc0b20dbf182aaec8aad16481fac76"
>
> @@ -44,15 +45,17 @@ EXTRA_OECONF = " \
> --disable-ifcfg-rh \
> --disable-ifnet \
> --disable-ifcfg-suse \
> - --disable-introspection \
> --disable-more-warnings \
> --with-iptables=${sbindir}/iptables \
> --with-tests \
> --with-nmtui=yes \
> "
>
> +# gobject-introspection related
> +GI_DATA_ENABLED_libc-musl = "False"
> +
> do_compile_prepend() {
> - export GIR_EXTRA_LIBS_PATH="${B}/libnm-util/.libs"
> + export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs"
> }
>
> PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup
2018-04-10 14:53 ` akuster808
@ 2018-04-10 15:02 ` Andreas Müller
2018-04-16 8:29 ` Andreas Müller
0 siblings, 1 reply; 16+ messages in thread
From: Andreas Müller @ 2018-04-10 15:02 UTC (permalink / raw)
To: akuster808; +Cc: openembeded-devel
On Tue, Apr 10, 2018 at 4:53 PM, akuster808 <akuster808@gmail.com> wrote:
>
>
> On 04/09/2018 03:02 PM, Andreas Müller wrote:
>> This adresses the comments for recent patch which updated nm to 1.10.6 and is a
>> follow-up for [1].
>
> There is a form of this already in my stagging/master-next. Should it
> be removed and replaced by this one?
Please replace - with the first version I introduced a parse error!
Andreas
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup
2018-04-10 15:02 ` Andreas Müller
@ 2018-04-16 8:29 ` Andreas Müller
2018-04-16 21:21 ` akuster808
0 siblings, 1 reply; 16+ messages in thread
From: Andreas Müller @ 2018-04-16 8:29 UTC (permalink / raw)
To: akuster808; +Cc: openembeded-devel
On Tue, Apr 10, 2018 at 5:02 PM, Andreas Müller <schnitzeltony@gmail.com> wrote:
> On Tue, Apr 10, 2018 at 4:53 PM, akuster808 <akuster808@gmail.com> wrote:
>>
>>
>> On 04/09/2018 03:02 PM, Andreas Müller wrote:
>>> This adresses the comments for recent patch which updated nm to 1.10.6 and is a
>>> follow-up for [1].
>>
>> There is a form of this already in my stagging/master-next. Should it
>> be removed and replaced by this one?
> Please replace - with the first version I introduced a parse error!
>
> Andreas
Hi Armin,
Just checked master-next: There is still V1
(30b50a479c496e722d8ca590e60d3b34bcda2d67) of this patch which causes
parse errors. Your follow-up
(45cd132ff9d64902eb0152b5a3ee4c1a1c9504f5) patch fixes parsing but
breaks the logic.
Sorry that I have to say this: Our collaboration is far from working:
I wrote this several times that V1 breaks parsing / you asked in in
this thread which patch to take but still I see you have taken the
wrong version.
Don't misunderstand me: I don't want to criticise your work because I
know you very busy and take care of many issues - there is lots more
than checking my patches :)
Current situation causes extra efforts for both of us so what can we
do to improve the situation?
For networkmanager: I had to learn that musl is not fixed. Although I
don't plan to use musl I suggest to send V3 with fixed musl because I
really want to get this closed.
Andreas
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup
2018-04-16 8:29 ` Andreas Müller
@ 2018-04-16 21:21 ` akuster808
0 siblings, 0 replies; 16+ messages in thread
From: akuster808 @ 2018-04-16 21:21 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
On 04/16/2018 01:29 AM, Andreas Müller wrote:
> On Tue, Apr 10, 2018 at 5:02 PM, Andreas Müller <schnitzeltony@gmail.com> wrote:
>> On Tue, Apr 10, 2018 at 4:53 PM, akuster808 <akuster808@gmail.com> wrote:
>>>
>>> On 04/09/2018 03:02 PM, Andreas Müller wrote:
>>>> This adresses the comments for recent patch which updated nm to 1.10.6 and is a
>>>> follow-up for [1].
>>> There is a form of this already in my stagging/master-next. Should it
>>> be removed and replaced by this one?
>> Please replace - with the first version I introduced a parse error!
>>
>> Andreas
> Hi Armin,
>
> Just checked master-next: There is still V1
> (30b50a479c496e722d8ca590e60d3b34bcda2d67) of this patch which causes
> parse errors. Your follow-up
> (45cd132ff9d64902eb0152b5a3ee4c1a1c9504f5) patch fixes parsing but
> breaks the logic.
>
> Sorry that I have to say this: Our collaboration is far from working:
> I wrote this several times that V1 breaks parsing / you asked in in
> this thread which patch to take but still I see you have taken the
> wrong version.
>
> Don't misunderstand me: I don't want to criticise your work because I
> know you very busy and take care of many issues - there is lots more
> than checking my patches :)
My misunderstanding. This is a learning experience for me. I have not
been clean on when the transition for the layer maintainers was to take
on full ownership of reviewing and checking patches being submitted to
the list. I will only accept patches that have been ok'ed and are
signed off by you for the layers you maintain.
What do you think?
>
> Current situation causes extra efforts for both of us so what can we
> do to improve the situation?
>
> For networkmanager: I had to learn that musl is not fixed. Although I
> don't plan to use musl I suggest to send V3 with fixed musl because I
> really want to get this closed.
I plan on creating a 'sumo" branch this weekend.
kind regards,
Armin
>
> Andreas
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2018-04-16 21:21 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-09 22:02 [PATCH 0/9] Fixes and updates for sumo Andreas Müller
2018-04-09 22:02 ` [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup Andreas Müller
2018-04-10 14:53 ` akuster808
2018-04-10 15:02 ` Andreas Müller
2018-04-16 8:29 ` Andreas Müller
2018-04-16 21:21 ` akuster808
2018-04-09 22:02 ` [PATCH 2/9] poppler: Rework patch fixing do_configure Andreas Müller
2018-04-09 22:02 ` [PATCH 3/9] poppler: update 0.62.0- > 0.63.0 Andreas Müller
2018-04-09 22:02 ` [PATCH 4/9] poppler: fix build for TARGET_FPU = "soft" Andreas Müller
2018-04-09 22:02 ` [PATCH 5/9] samba: refresh patches Andreas Müller
2018-04-09 22:02 ` [PATCH 6/9] polkit-gnome: remove Andreas Müller
2018-04-09 22:02 ` [PATCH 7/9] xfce4-terminal: update 0.8.7.2 -> 0.8.7.3 Andreas Müller
2018-04-09 22:02 ` [PATCH 8/9] xfce4-whiskermenu-plugin: update 2.1.5 -> 2.1.6 Andreas Müller
2018-04-09 22:02 ` [PATCH 9/9] thunar: update 1.6.14 -> 1.6.15 Andreas Müller
2018-04-09 22:39 ` [PATCH 0/9] Fixes and updates for sumo akuster808
2018-04-10 13:25 ` Andreas Müller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.