diff options
| author |   Vinicius Aquino <voa.aquino@gmail.com> | 2021-04-07 16:25:00 -0300 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-04-08 09:25:33 -0700 |
| commit | 12a241278aec8893d65dc6fa8d045b0bac0220ea (patch) | |
| tree | d4e9ef36e5fa195b81872b9ae0897f9a3afa5e59 /meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch | |
| parent | 92926a3e45dadb55cfcacb892c01d512c42d53c4 (diff) | |
| download | meta-openembedded-contrib-12a241278aec8893d65dc6fa8d045b0bac0220ea.tar.gz | |
networkmanager: upgrade 1.28.0 -> 1.30.2
Upgrade to release 1.30.2:
- 0004-fix_reallocarray_check.patch removed because the current
version of nm already includes boths malloc.h and stdlib.h
- musl/0002-Fix-build-with-musl.patch removed because the commit
c50da167bc of nm solves the build issue with musl
- musl/0001-Fix-build-with-musl-systemd-specific.patch modified
to avoid conflicts when applied to current version of nm
- musl/0003-Fix-build-with-musl-systemd-specific.patch renamed
to musl/0002-Fix-build-with-musl-systemd-specific.patch and
modified to avoid conflicts when applied to current version of nm
Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch')
| -rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch new file mode 100644 index 0000000000..d83efd39e4 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch @@ -0,0 +1,26 @@ +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 + |