Commit d641258c authored by Petr Vorel's avatar Petr Vorel Committed by Thomas Petazzoni
Browse files

network-manager: bump version to 1.0.0



Dropped 0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch
(accepted upstream).

Signed-off-by: default avatarPetr Vorel <petr.vorel@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent cef6a787
Loading
Loading
Loading
Loading
+0 −38
Original line number Diff line number Diff line
From b8241447e2a910dde57bf5a44a4464d80c87ebca Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 11 Aug 2014 09:37:05 +0200
Subject: [PATCH] NetworkManagerUtils: fix build with toolchains not exporting
 CLOCK_BOOTTIME

E.G. uClibc 0.9.33 and earlier.

Submitted upstream: https://bugzilla.gnome.org/show_bug.cgi?id=734599

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 src/NetworkManagerUtils.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index aa689ce..fc85b00 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -45,6 +45,15 @@
 #include "nm-posix-signals.h"
 
 /*
+ * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export
+ * CLOCK_BOOTTIME even though the kernel supports it, so provide a
+ * local definition
+ */
+#ifndef CLOCK_BOOTTIME
+#define CLOCK_BOOTTIME 7
+#endif
+
+/*
  * nm_ethernet_address_is_valid
  *
  * Compares an Ethernet address against known invalid addresses.
-- 
2.0.0
+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@
#
################################################################################

NETWORK_MANAGER_VERSION_MAJOR = 0.9
NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10.0
NETWORK_MANAGER_VERSION_MAJOR = 1.0
NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0
NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
NETWORK_MANAGER_INSTALL_STAGING = YES