diff mbox

network-manager: bump version to 1.0.0

Message ID 1425894890-31411-1-git-send-email-vorel@jablocom.com
State Accepted
Headers show

Commit Message

Petr Vorel March 9, 2015, 9:54 a.m. UTC 
From: Petr Vorel <petr.vorel@gmail.com>

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

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
 ...gerUtils-fix-build-with-toolchains-not-ex.patch | 38 ----------------------
 package/network-manager/network-manager.mk         |  4 +--
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 package/network-manager/0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch

Comments

Yegor Yefremov March 9, 2015, 10:16 a.m. UTC | #1 
On Mon, Mar 9, 2015 at 10:54 AM, Petr Vorel <petr.vorel@gmail.com> wrote:
> From: Petr Vorel <petr.vorel@gmail.com>
>
> Dropped 0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch
> (accepted upstream).
>
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> ---
>  ...gerUtils-fix-build-with-toolchains-not-ex.patch | 38 ----------------------
>  package/network-manager/network-manager.mk         |  4 +--
>  2 files changed, 2 insertions(+), 40 deletions(-)
>  delete mode 100644 package/network-manager/0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch

Could you also provide a hash file?

Thanks.

Yegor

> diff --git a/package/network-manager/0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch b/package/network-manager/0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch
> deleted file mode 100644
> index 9286daa..0000000
> --- a/package/network-manager/0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -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
> -
> diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
> index 5540bc4..3615c89 100644
> --- a/package/network-manager/network-manager.mk
> +++ b/package/network-manager/network-manager.mk
> @@ -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
> --
> 1.8.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni March 9, 2015, 1:07 p.m. UTC | #2 
Dear Petr Vorel,

On Mon,  9 Mar 2015 10:54:50 +0100, Petr Vorel wrote:
> From: Petr Vorel <petr.vorel@gmail.com>
> 
> Dropped 0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch
> (accepted upstream).
> 
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>

Applied, thanks.

You can send a follow-up patch to add the hash file if you want, as
suggested by Yegor.

Thanks!

Thomas
diff mbox

Patch

diff --git a/package/network-manager/0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch b/package/network-manager/0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch
deleted file mode 100644
index 9286daa..0000000
--- a/package/network-manager/0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch
+++ /dev/null
@@ -1,38 +0,0 @@ 
-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
-
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 5540bc4..3615c89 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -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