From f2791dcec5efab5180b74d7948a50f82c99623df Mon Sep 17 00:00:00 2001 From: Koen Zandberg Date: Mon, 16 Jul 2018 10:53:49 +0200 Subject: [PATCH] pkg/emb6: Rebuild patches for consistency --- pkg/emb6/patches/0001-Add-RIOT-Makefiles.patch | 6 +++--- .../patches/0002-Rename-colliding-files-and-functions.patch | 2 +- ...> 0003-Provide-event-type-for-RIOT-s-sock_.-_send.patch} | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename pkg/emb6/patches/{0004-Provide-event-type-for-RIOT-s-sock_.-_send.patch => 0003-Provide-event-type-for-RIOT-s-sock_.-_send.patch} (92%) diff --git a/pkg/emb6/patches/0001-Add-RIOT-Makefiles.patch b/pkg/emb6/patches/0001-Add-RIOT-Makefiles.patch index 7b6c38794a..6854487410 100644 --- a/pkg/emb6/patches/0001-Add-RIOT-Makefiles.patch +++ b/pkg/emb6/patches/0001-Add-RIOT-Makefiles.patch @@ -1,7 +1,7 @@ -From 5322d1d2280283f108f27a1720cbf6b4f958d21c Mon Sep 17 00:00:00 2001 +From 5854e2307826af0800e64c916160cb7fe94aadbb Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Mon, 11 Jan 2016 15:09:34 +0100 -Subject: [PATCH 1/4] Add RIOT Makefiles +Subject: [PATCH 1/3] Add RIOT Makefiles --- Makefile | 1 + @@ -126,5 +126,5 @@ index 00000000..c9aa8979 + +include $(RIOTBASE)/Makefile.base -- -2.16.1 +2.16.4 diff --git a/pkg/emb6/patches/0002-Rename-colliding-files-and-functions.patch b/pkg/emb6/patches/0002-Rename-colliding-files-and-functions.patch index b919fc9b85..24eaef3e6a 100644 --- a/pkg/emb6/patches/0002-Rename-colliding-files-and-functions.patch +++ b/pkg/emb6/patches/0002-Rename-colliding-files-and-functions.patch @@ -1,7 +1,7 @@ From 4e6d1640adde2828f10320d39f8996c6e89f82ac Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Thu, 4 Feb 2016 22:15:23 +0100 -Subject: [PATCH 2/2] Rename colliding files and functions +Subject: [PATCH 2/3] Rename colliding files and functions Co-authored-by: Koen Zandberg --- diff --git a/pkg/emb6/patches/0004-Provide-event-type-for-RIOT-s-sock_.-_send.patch b/pkg/emb6/patches/0003-Provide-event-type-for-RIOT-s-sock_.-_send.patch similarity index 92% rename from pkg/emb6/patches/0004-Provide-event-type-for-RIOT-s-sock_.-_send.patch rename to pkg/emb6/patches/0003-Provide-event-type-for-RIOT-s-sock_.-_send.patch index 4b903eb72d..552871c820 100644 --- a/pkg/emb6/patches/0004-Provide-event-type-for-RIOT-s-sock_.-_send.patch +++ b/pkg/emb6/patches/0003-Provide-event-type-for-RIOT-s-sock_.-_send.patch @@ -1,7 +1,7 @@ -From 0e12b41bfc8283be079ce2bb9469713932eeacb7 Mon Sep 17 00:00:00 2001 +From e10a97a564b639294005ed931d4270e5e8d89e7e Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Fri, 26 Feb 2016 12:35:52 +0100 -Subject: [PATCH 4/4] Provide event type for RIOT's sock_.*_send +Subject: [PATCH 3/3] Provide event type for RIOT's sock_.*_send --- utils/inc/evproc.h | 4 +++- @@ -34,5 +34,5 @@ index 5316a67e..883a1366 100644 #define EVPROC_QUEUE_SIZE 20 ///< Maximal amount of events in /ref pst_evList queue /*============================================================================= -- -2.16.1 +2.16.4