mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-20 10:15:41 +00:00
networkmanager: upgrade 1.30.4 -> 1.32.2
Did not find hints upstream but musl build turned painless! Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller
Khem Raj
parent
5b680652b7
commit
08d4c28d16
@ -1,6 +1,6 @@
|
||||
From d0dead0478a070b96f37bd3b310443eaa8c93a25 Mon Sep 17 00:00:00 2001
|
||||
From: Vinicius Aquino <voa.aquino@gmail.com>
|
||||
Date: Thu, 1 Apr 2021 14:13:07 -0300
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 5 Jul 2021 00:42:23 +0200
|
||||
Subject: [PATCH] Do not create settings settings/property documentation
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -15,34 +15,35 @@ Upstream-Status: Inappropriate [OE specific]
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com>
|
||||
---
|
||||
Makefile.am | 4 ----
|
||||
Makefile.am | 5 -----
|
||||
configure.ac | 5 -----
|
||||
2 files changed, 9 deletions(-)
|
||||
2 files changed, 10 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 9279672c1..2e52acbb2 100644
|
||||
index 5a62070..3d0ebcd 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1686,14 +1686,10 @@ libnm/libnm.typelib: libnm/libnm.gir
|
||||
INTROSPECTION_GIRS += libnm/NM-1.0.gir
|
||||
@@ -1860,15 +1860,10 @@ src/libnm-client-impl/libnm.typelib: src/libnm-client-impl/libnm.gir
|
||||
INTROSPECTION_GIRS += src/libnm-client-impl/NM-1.0.gir
|
||||
|
||||
libnm_noinst_data = \
|
||||
- clients/cli/generate-docs-nm-settings-nmcli.xml \
|
||||
libnm/nm-property-infos-dbus.xml \
|
||||
libnm/nm-property-infos-ifcfg-rh.xml \
|
||||
libnm/nm-property-infos-keyfile.xml \
|
||||
libnm/nm-property-infos-nmcli.xml \
|
||||
- libnm/nm-settings-docs-gir.xml \
|
||||
- src/nmcli/generate-docs-nm-settings-nmcli.xml \
|
||||
- man/nm-settings-docs-dbus.xml \
|
||||
- man/nm-settings-docs-nmcli.xml \
|
||||
src/libnm-client-impl/nm-property-infos-dbus.xml \
|
||||
src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml \
|
||||
src/libnm-client-impl/nm-property-infos-keyfile.xml \
|
||||
src/libnm-client-impl/nm-property-infos-nmcli.xml \
|
||||
- src/libnm-client-impl/nm-settings-docs-gir.xml \
|
||||
- src/libnmc-setting/settings-docs-input.xml \
|
||||
$(NULL)
|
||||
|
||||
noinst_DATA += $(libnm_noinst_data)
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 784ac4695..681e6cb32 100644
|
||||
index 8fe23de..dc24850 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1241,11 +1241,6 @@ GTK_DOC_CHECK(1.0)
|
||||
@@ -1258,11 +1258,6 @@ GTK_DOC_CHECK(1.0)
|
||||
# check if we can build setting property documentation
|
||||
build_docs=no
|
||||
if test -n "$INTROSPECTION_MAKEFILE"; then
|
||||
@ -55,5 +56,5 @@ index 784ac4695..681e6cb32 100644
|
||||
if test -z "$PERL"; then
|
||||
AC_MSG_ERROR([--enable-introspection requires perl])
|
||||
--
|
||||
2.20.1
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -1,154 +0,0 @@
|
||||
From 44884c7e7655b889f41cb02ffc8ab72a29b52ebf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Tue, 2 Apr 2019 01:34:35 +0200
|
||||
Subject: [PATCH 1/2] Fix build with musl - systemd specific
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Networkmanager imported some code from systemd. This requires some adjustments
|
||||
for musl.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com>
|
||||
---
|
||||
shared/systemd/src/basic/in-addr-util.c | 1 +
|
||||
shared/systemd/src/basic/process-util.c | 9 +++++++++
|
||||
shared/systemd/src/basic/socket-util.h | 6 ++++++
|
||||
shared/systemd/src/basic/sort-util.h | 13 ++++---------
|
||||
shared/systemd/src/basic/stdio-util.h | 2 ++
|
||||
shared/systemd/src/basic/string-util.h | 5 +++++
|
||||
6 files changed, 27 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c
|
||||
index c315dcbb8..5b7e04eb7 100644
|
||||
--- a/shared/systemd/src/basic/in-addr-util.c
|
||||
+++ b/shared/systemd/src/basic/in-addr-util.c
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "in-addr-util.h"
|
||||
#include "macro.h"
|
||||
#include "parse-util.h"
|
||||
+#include "string-util.h"
|
||||
#include "random-util.h"
|
||||
#include "string-util.h"
|
||||
#include "strxcpyx.h"
|
||||
diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c
|
||||
index 0e25b0200..ea2c0fbb4 100644
|
||||
--- a/shared/systemd/src/basic/process-util.c
|
||||
+++ b/shared/systemd/src/basic/process-util.c
|
||||
@@ -17,6 +17,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>
|
||||
@@ -1152,11 +1155,13 @@ 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 _weak_;
|
||||
+#endif
|
||||
|
||||
pid_t getpid_cached(void) {
|
||||
static bool installed = false;
|
||||
@@ -1185,7 +1190,11 @@ pid_t getpid_cached(void) {
|
||||
* only half-documented (glibc doesn't document it but LSB does — though only superficially)
|
||||
* we'll check for errors only in the most generic fashion possible. */
|
||||
|
||||
+#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;
|
||||
diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h
|
||||
index 1de069476..f6834fbd2 100644
|
||||
--- a/shared/systemd/src/basic/socket-util.h
|
||||
+++ b/shared/systemd/src/basic/socket-util.h
|
||||
@@ -14,6 +14,12 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/un.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_network.h"
|
||||
#include "missing_socket.h"
|
||||
diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h
|
||||
index a8984fc16..5fb90f8c5 100644
|
||||
--- a/shared/systemd/src/basic/sort-util.h
|
||||
+++ b/shared/systemd/src/basic/sort-util.h
|
||||
@@ -5,15 +5,10 @@
|
||||
|
||||
#include "macro.h"
|
||||
|
||||
-void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
|
||||
- __compar_d_fn_t compar, void *arg);
|
||||
-
|
||||
-#define typesafe_bsearch_r(k, b, n, func, userdata) \
|
||||
- ({ \
|
||||
- const typeof(b[0]) *_k = k; \
|
||||
- int (*_func_)(const typeof(b[0])*, const typeof(b[0])*, typeof(userdata)) = func; \
|
||||
- xbsearch_r((const void*) _k, (b), (n), sizeof((b)[0]), (__compar_d_fn_t) _func_, userdata); \
|
||||
- })
|
||||
+#if !defined(__GLIBC__)
|
||||
+typedef int (*__compar_fn_t) (const void*, const void*);
|
||||
+typedef __compar_fn_t comparison_fn_t;
|
||||
+#endif
|
||||
|
||||
/**
|
||||
* Normal bsearch requires base to be nonnull. Here were require
|
||||
diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h
|
||||
index d45d3c1a6..fee1a57ca 100644
|
||||
--- a/shared/systemd/src/basic/stdio-util.h
|
||||
+++ b/shared/systemd/src/basic/stdio-util.h
|
||||
@@ -2,7 +2,9 @@
|
||||
#pragma once
|
||||
|
||||
#if 0 /* NM_IGNORED */
|
||||
+#if defined(__GLIBC__)
|
||||
#include <printf.h>
|
||||
+#endif
|
||||
#endif /* NM_IGNORED */
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h
|
||||
index 593cf04ae..541c393f6 100644
|
||||
--- a/shared/systemd/src/basic/string-util.h
|
||||
+++ b/shared/systemd/src/basic/string-util.h
|
||||
@@ -26,6 +26,11 @@
|
||||
#define strcaseeq(a,b) (strcasecmp((a),(b)) == 0)
|
||||
#define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0)
|
||||
|
||||
+/* musl does not know strndupa */
|
||||
+#if !defined(__GLIBC__)
|
||||
+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s)
|
||||
+#endif
|
||||
+
|
||||
int strcmp_ptr(const char *a, const char *b) _pure_;
|
||||
int strcasecmp_ptr(const char *a, const char *b) _pure_;
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 7d9a11a17da425d106791ada7100d7a6559e6065 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Freihofer <adrian.freihofer@siemens.com>
|
||||
Date: Sat, 7 Mar 2020 14:24:01 +0100
|
||||
Subject: [PATCH 2/2] Fix build with musl - systemd specific
|
||||
|
||||
---
|
||||
src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
|
||||
index 3fafd3c0e..79d6096c2 100644
|
||||
--- a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
|
||||
+++ b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
|
||||
@@ -8,7 +8,9 @@
|
||||
#include <errno.h>
|
||||
#include <sys/ioctl.h>
|
||||
#if 0 /* NM_IGNORED */
|
||||
+#ifdef __GLIBC__ /* musl supplies full set of userspace headers */
|
||||
#include <linux/if_arp.h>
|
||||
+#endif
|
||||
#else /* NM_IGNORED */
|
||||
#include <net/if_arp.h>
|
||||
#endif /* NM_IGNORED */
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -27,11 +27,7 @@ SRC_URI = " \
|
||||
file://0002-Do-not-create-settings-settings-property-documentati.patch \
|
||||
file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \
|
||||
"
|
||||
SRC_URI_append_libc-musl = " \
|
||||
file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
|
||||
file://musl/0002-Fix-build-with-musl-systemd-specific.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "6050b724212ea3ce7386113359bea9afa1f679a54f60d999a5999892e672c190"
|
||||
SRC_URI[sha256sum] = "701d511067f757d0f92f412c98cdb49a74a6ba69448aabb1beadacbc171e3873"
|
||||
|
||||
S = "${WORKDIR}/NetworkManager-${PV}"
|
||||
|
||||
@ -56,7 +52,7 @@ CFLAGS_append_libc-musl = " \
|
||||
"
|
||||
|
||||
do_compile_prepend() {
|
||||
export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs"
|
||||
export GIR_EXTRA_LIBS_PATH="${B}/src/libnm-client-impl/.libs"
|
||||
}
|
||||
|
||||
PACKAGECONFIG ??= "nss ifupdown dnsmasq nmcli \
|
||||
Loading…
x
Reference in New Issue
Block a user