52282828f0
+ lower kernel headers dependency According to upstream [1], there is no known minimal kernel-version, nor minimal required feature-set. Experimentally tested, that 1.0.2 is works with 3.2 kernel headers, even some features will be missing [2]. [1] https://mail.gnome.org/archives/networkmanager-list/2015-April/msg00039.html [2] https://mail.gnome.org/archives/networkmanager-list/2015-April/msg00041.html [Thomas: add comment in Config.in to indicate that it may work with earlier kernel versions.] Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 7f84150e9f6aa7e900d70178e0fc0acc6cfba651 Mon Sep 17 00:00:00 2001
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
Date: Fri, 15 May 2015 16:38:10 +0200
|
|
Subject: [PATCH] systemd-dhcp: fix build with Linux 3.2.0 headers
|
|
|
|
Fixes build on Ubuntu 12.04.
|
|
|
|
systemd/src/libsystemd-network/dhcp-network.c: In function '_bind_raw_socket':
|
|
systemd/src/libsystemd-network/dhcp-network.c:75:17: error: 'BPF_XOR' undeclared (first use in this function)
|
|
systemd/src/libsystemd-network/dhcp-network.c:75:17: note: each undeclared identifier is reported only once for each function it appears in
|
|
make[4]: *** [libsystemd_nm_la-dhcp-network.lo] Error 1
|
|
|
|
(cherry picked from commit 3811a68389b9277533f2eee8372927ca6238653e)
|
|
|
|
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
|
---
|
|
src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h b/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h
|
|
index 6d500f4..f8856a1 100644
|
|
--- a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h
|
|
+++ b/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h
|
|
@@ -38,6 +38,11 @@
|
|
|
|
#include "nm-logging.h"
|
|
|
|
+/* Missing in Linux 3.2.0, in Ubuntu 12.04 */
|
|
+#ifndef BPF_XOR
|
|
+#define BPF_XOR 0xa0
|
|
+#endif
|
|
+
|
|
static inline guint32
|
|
_slog_level_to_nm (int slevel)
|
|
{
|
|
--
|
|
2.1.4
|