2ac369ed8f
Fork from Alpine to apply Martijn's patch: https://github.com/alpinelinux/aports/pull/9894 "This makes wpa_supplicant run in dbus mode if no config file has been created for it, fixing the networkmanager integration. This config has been used for a long time in postmarketOS and works fine. It also removes the iwd dependency from networkmanager again so wpa_supplicant is used because iwd doesn't support as many chipsets as wpa_supplicant and it doesn't run on older kernels." [ci:skip-build]: already built successfully in CI for x86_64, I've tested that it builds for armhf and aarch64 too.
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
--- 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"
|
|
--- a/src/platform/wifi/nm-wifi-utils.h
|
|
+++ b/src/platform/wifi/nm-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"
|
|
|
|
--- a/shared/systemd/src/basic/socket-util.h 2019-03-16 15:41:33.287235649 +0100
|
|
+++ b/shared/systemd/src/basic/socket-util.h 2019-03-16 15:42:24.273912106 +0100
|
|
@@ -12,6 +12,11 @@
|
|
#include <sys/socket.h>
|
|
#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_socket.h"
|