riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8537 from smlng/pkg/emb6/fix_patching

Browse Source 
pkg/emb6: fix patching with newer git version
This commit is contained in:
Martine Lenders 2018-02-15 14:40:04 +01:00 committed by GitHub
commit 16c3961377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 196 additions and 943 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/emb6/patches/0001-Add-RIOT-Makefiles.patch
View File

@ -1,4 +1,4 @@
From 4b417436908a6823e631519f794a20644a467f19 Mon Sep 17 00:00:00 2001 From 5322d1d2280283f108f27a1720cbf6b4f958d21c Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu> From: Martine Lenders <mail@martine-lenders.eu>
Date: Mon, 11 Jan 2016 15:09:34 +0100 Date: Mon, 11 Jan 2016 15:09:34 +0100
Subject: [PATCH 1/4] Add RIOT Makefiles Subject: [PATCH 1/4] Add RIOT Makefiles
@ -30,14 +30,14 @@ Subject: [PATCH 1/4] Add RIOT Makefiles
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
new file mode 100644 new file mode 100644
index 0000000..48422e9 index 00000000..48422e90
--- /dev/null --- /dev/null
+++ b/Makefile +++ b/Makefile
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
diff --git a/emb6/Makefile b/emb6/Makefile diff --git a/emb6/Makefile b/emb6/Makefile
new file mode 100644 new file mode 100644
index 0000000..c2ec39f index 00000000..c2ec39f3
--- /dev/null --- /dev/null
+++ b/emb6/Makefile +++ b/emb6/Makefile
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
@ -46,7 +46,7 @@ index 0000000..c2ec39f
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/mac/Makefile b/emb6/src/mac/Makefile diff --git a/emb6/src/mac/Makefile b/emb6/src/mac/Makefile
new file mode 100644 new file mode 100644
index 0000000..d0472d8 index 00000000..d0472d85
--- /dev/null --- /dev/null
+++ b/emb6/src/mac/Makefile +++ b/emb6/src/mac/Makefile
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
@ -55,7 +55,7 @@ index 0000000..d0472d8
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/mac/llsec/Makefile b/emb6/src/mac/llsec/Makefile diff --git a/emb6/src/mac/llsec/Makefile b/emb6/src/mac/llsec/Makefile
new file mode 100644 new file mode 100644
index 0000000..e13ee7f index 00000000..e13ee7f1
--- /dev/null --- /dev/null
+++ b/emb6/src/mac/llsec/Makefile +++ b/emb6/src/mac/llsec/Makefile
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
@ -64,7 +64,7 @@ index 0000000..e13ee7f
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/ipv6/Makefile b/emb6/src/net/ipv6/Makefile diff --git a/emb6/src/net/ipv6/Makefile b/emb6/src/net/ipv6/Makefile
new file mode 100644 new file mode 100644
index 0000000..844e39c index 00000000..844e39cd
--- /dev/null --- /dev/null
+++ b/emb6/src/net/ipv6/Makefile +++ b/emb6/src/net/ipv6/Makefile
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
@ -73,7 +73,7 @@ index 0000000..844e39c
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/ipv6/multicast/Makefile b/emb6/src/net/ipv6/multicast/Makefile diff --git a/emb6/src/net/ipv6/multicast/Makefile b/emb6/src/net/ipv6/multicast/Makefile
new file mode 100644 new file mode 100644
index 0000000..f1c3f1e index 00000000..f1c3f1e0
--- /dev/null --- /dev/null
+++ b/emb6/src/net/ipv6/multicast/Makefile +++ b/emb6/src/net/ipv6/multicast/Makefile
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
@ -82,7 +82,7 @@ index 0000000..f1c3f1e
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/rpl/Makefile b/emb6/src/net/rpl/Makefile diff --git a/emb6/src/net/rpl/Makefile b/emb6/src/net/rpl/Makefile
new file mode 100644 new file mode 100644
index 0000000..2fd941c index 00000000..2fd941c7
--- /dev/null --- /dev/null
+++ b/emb6/src/net/rpl/Makefile +++ b/emb6/src/net/rpl/Makefile
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
@ -91,7 +91,7 @@ index 0000000..2fd941c
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/sicslowpan/Makefile b/emb6/src/net/sicslowpan/Makefile diff --git a/emb6/src/net/sicslowpan/Makefile b/emb6/src/net/sicslowpan/Makefile
new file mode 100644 new file mode 100644
index 0000000..9e14df3 index 00000000..9e14df33
--- /dev/null --- /dev/null
+++ b/emb6/src/net/sicslowpan/Makefile +++ b/emb6/src/net/sicslowpan/Makefile
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
@ -100,7 +100,7 @@ index 0000000..9e14df3
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/tport/Makefile b/emb6/src/tport/Makefile diff --git a/emb6/src/tport/Makefile b/emb6/src/tport/Makefile
new file mode 100644 new file mode 100644
index 0000000..1b0ca7c index 00000000..1b0ca7c2
--- /dev/null --- /dev/null
+++ b/emb6/src/tport/Makefile +++ b/emb6/src/tport/Makefile
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
@ -109,7 +109,7 @@ index 0000000..1b0ca7c
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
diff --git a/target/bsp/Makefile b/target/bsp/Makefile diff --git a/target/bsp/Makefile b/target/bsp/Makefile
new file mode 100644 new file mode 100644
index 0000000..ce548bd index 00000000..ce548bd1
--- /dev/null --- /dev/null
+++ b/target/bsp/Makefile +++ b/target/bsp/Makefile
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
@ -118,7 +118,7 @@ index 0000000..ce548bd
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
diff --git a/utils/src/Makefile b/utils/src/Makefile diff --git a/utils/src/Makefile b/utils/src/Makefile
new file mode 100644 new file mode 100644
index 0000000..c9aa897 index 00000000..c9aa8979
--- /dev/null --- /dev/null
+++ b/utils/src/Makefile +++ b/utils/src/Makefile
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
@ -126,5 +126,5 @@ index 0000000..c9aa897
+ +
+include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base
-- --
1.9.1 2.16.1

973
pkg/emb6/patches/0002-Rename-colliding-files-and-functions.patch
View File

File diff suppressed because it is too large Load Diff

26
pkg/emb6/patches/0003-Fix-warnings.patch
View File

@ -1,4 +1,4 @@
From cb47e0b69b747833322a83b7396878a631add116 Mon Sep 17 00:00:00 2001 From 47663dee3ce27b96a9556e710c973a8fb0990b3b Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu> From: Martine Lenders <mail@martine-lenders.eu>
Date: Fri, 5 Feb 2016 00:46:31 +0100 Date: Fri, 5 Feb 2016 00:46:31 +0100
Subject: [PATCH 3/4] Fix warnings Subject: [PATCH 3/4] Fix warnings
@ -18,7 +18,7 @@ Subject: [PATCH 3/4] Fix warnings
11 files changed, 365 insertions(+), 77 deletions(-) 11 files changed, 365 insertions(+), 77 deletions(-)
diff --git a/emb6/src/net/ipv6/multicast/roll-tm.c b/emb6/src/net/ipv6/multicast/roll-tm.c diff --git a/emb6/src/net/ipv6/multicast/roll-tm.c b/emb6/src/net/ipv6/multicast/roll-tm.c
index 8b36300..96f4f47 100644 index 8b363009..96f4f473 100644
--- a/emb6/src/net/ipv6/multicast/roll-tm.c --- a/emb6/src/net/ipv6/multicast/roll-tm.c
+++ b/emb6/src/net/ipv6/multicast/roll-tm.c +++ b/emb6/src/net/ipv6/multicast/roll-tm.c
@@ -290,12 +290,17 @@ struct mcast_packet { @@ -290,12 +290,17 @@ struct mcast_packet {
@ -186,7 +186,7 @@ index 8b36300..96f4f47 100644
/* /*
* We call accept() which will sort out caching and forwarding. Depending * We call accept() which will sort out caching and forwarding. Depending
diff --git a/emb6/src/net/ipv6/multicast/smrf.c b/emb6/src/net/ipv6/multicast/smrf.c diff --git a/emb6/src/net/ipv6/multicast/smrf.c b/emb6/src/net/ipv6/multicast/smrf.c
index 9b4a3a5..38d31cd 100644 index 9b4a3a51..38d31cd2 100644
--- a/emb6/src/net/ipv6/multicast/smrf.c --- a/emb6/src/net/ipv6/multicast/smrf.c
+++ b/emb6/src/net/ipv6/multicast/smrf.c +++ b/emb6/src/net/ipv6/multicast/smrf.c
@@ -77,7 +77,13 @@ static uint8_t fwd_spread; @@ -77,7 +77,13 @@ static uint8_t fwd_spread;
@ -223,7 +223,7 @@ index 9b4a3a5..38d31cd 100644
return; return;
} }
diff --git a/emb6/src/net/ipv6/multicast/uip-mcast6-route.c b/emb6/src/net/ipv6/multicast/uip-mcast6-route.c diff --git a/emb6/src/net/ipv6/multicast/uip-mcast6-route.c b/emb6/src/net/ipv6/multicast/uip-mcast6-route.c
index 55d245d..75443a5 100644 index 995ff0c9..a397a675 100644
--- a/emb6/src/net/ipv6/multicast/uip-mcast6-route.c --- a/emb6/src/net/ipv6/multicast/uip-mcast6-route.c
+++ b/emb6/src/net/ipv6/multicast/uip-mcast6-route.c +++ b/emb6/src/net/ipv6/multicast/uip-mcast6-route.c
@@ -126,7 +126,7 @@ uip_mcast6_route_count(void) @@ -126,7 +126,7 @@ uip_mcast6_route_count(void)
@ -236,7 +236,7 @@ index 55d245d..75443a5 100644
memb_init(&mcast_route_memb); memb_init(&mcast_route_memb);
list_init(mcast_route_list); list_init(mcast_route_list);
diff --git a/emb6/src/net/ipv6/tcpip.c b/emb6/src/net/ipv6/tcpip.c diff --git a/emb6/src/net/ipv6/tcpip.c b/emb6/src/net/ipv6/tcpip.c
index 9c76bed..1901d9e 100644 index 9c76bed9..1901d9eb 100644
--- a/emb6/src/net/ipv6/tcpip.c --- a/emb6/src/net/ipv6/tcpip.c
+++ b/emb6/src/net/ipv6/tcpip.c +++ b/emb6/src/net/ipv6/tcpip.c
@@ -72,9 +72,24 @@ void uip_log(char *msg); @@ -72,9 +72,24 @@ void uip_log(char *msg);
@ -286,7 +286,7 @@ index 9c76bed..1901d9e 100644
static void static void
check_for_tcp_syn(void) check_for_tcp_syn(void)
diff --git a/emb6/src/net/ipv6/uip-icmp6.c b/emb6/src/net/ipv6/uip-icmp6.c diff --git a/emb6/src/net/ipv6/uip-icmp6.c b/emb6/src/net/ipv6/uip-icmp6.c
index 484d0bf..6f53d12 100644 index 2d8b4858..3fbe9f81 100644
--- a/emb6/src/net/ipv6/uip-icmp6.c --- a/emb6/src/net/ipv6/uip-icmp6.c
+++ b/emb6/src/net/ipv6/uip-icmp6.c +++ b/emb6/src/net/ipv6/uip-icmp6.c
@@ -59,11 +59,34 @@ @@ -59,11 +59,34 @@
@ -339,7 +339,7 @@ index 484d0bf..6f53d12 100644
/* Register Echo Request and Reply handlers */ /* Register Echo Request and Reply handlers */
uip_icmp6_register_input_handler(&echo_request_handler); uip_icmp6_register_input_handler(&echo_request_handler);
diff --git a/emb6/src/net/ipv6/uip-nd6.c b/emb6/src/net/ipv6/uip-nd6.c diff --git a/emb6/src/net/ipv6/uip-nd6.c b/emb6/src/net/ipv6/uip-nd6.c
index f04b6b3..26ed214 100644 index f04b6b34..26ed2146 100644
--- a/emb6/src/net/ipv6/uip-nd6.c --- a/emb6/src/net/ipv6/uip-nd6.c
+++ b/emb6/src/net/ipv6/uip-nd6.c +++ b/emb6/src/net/ipv6/uip-nd6.c
@@ -93,6 +93,37 @@ void uip_log(char *msg); @@ -93,6 +93,37 @@ void uip_log(char *msg);
@ -448,7 +448,7 @@ index f04b6b3..26ed214 100644
#if UIP_ND6_SEND_NA #if UIP_ND6_SEND_NA
diff --git a/emb6/src/net/ipv6/uip6.c b/emb6/src/net/ipv6/uip6.c diff --git a/emb6/src/net/ipv6/uip6.c b/emb6/src/net/ipv6/uip6.c
index 89edb73..281c8d9 100644 index 89edb739..281c8d93 100644
--- a/emb6/src/net/ipv6/uip6.c --- a/emb6/src/net/ipv6/uip6.c
+++ b/emb6/src/net/ipv6/uip6.c +++ b/emb6/src/net/ipv6/uip6.c
@@ -152,6 +152,61 @@ uint8_t uip_ext_len = 0; @@ -152,6 +152,61 @@ uint8_t uip_ext_len = 0;
@ -561,7 +561,7 @@ index 89edb73..281c8d9 100644
/* /*
* See RFC 2460 for a description of fragmentation in IPv6 * See RFC 2460 for a description of fragmentation in IPv6
diff --git a/emb6/src/net/rpl/rpl-ext-header.c b/emb6/src/net/rpl/rpl-ext-header.c diff --git a/emb6/src/net/rpl/rpl-ext-header.c b/emb6/src/net/rpl/rpl-ext-header.c
index 8bf1fe1..a680d52 100644 index 8bf1fe19..a680d521 100644
--- a/emb6/src/net/rpl/rpl-ext-header.c --- a/emb6/src/net/rpl/rpl-ext-header.c
+++ b/emb6/src/net/rpl/rpl-ext-header.c +++ b/emb6/src/net/rpl/rpl-ext-header.c
@@ -56,13 +56,49 @@ @@ -56,13 +56,49 @@
@ -622,7 +622,7 @@ index 8bf1fe1..a680d52 100644
int int
rpl_verify_header(int uip_ext_opt_offset) rpl_verify_header(int uip_ext_opt_offset)
diff --git a/emb6/src/net/rpl/rpl-icmp6.c b/emb6/src/net/rpl/rpl-icmp6.c diff --git a/emb6/src/net/rpl/rpl-icmp6.c b/emb6/src/net/rpl/rpl-icmp6.c
index 0675e63..84eb5bd 100644 index 0675e632..84eb5bde 100644
--- a/emb6/src/net/rpl/rpl-icmp6.c --- a/emb6/src/net/rpl/rpl-icmp6.c
+++ b/emb6/src/net/rpl/rpl-icmp6.c +++ b/emb6/src/net/rpl/rpl-icmp6.c
@@ -68,9 +68,25 @@ @@ -68,9 +68,25 @@
@ -664,7 +664,7 @@ index 0675e63..84eb5bd 100644
uip_icmp6_register_input_handler(&dis_handler); uip_icmp6_register_input_handler(&dis_handler);
uip_icmp6_register_input_handler(&dio_handler); uip_icmp6_register_input_handler(&dio_handler);
diff --git a/emb6/src/net/sicslowpan/sicslowpan.c b/emb6/src/net/sicslowpan/sicslowpan.c diff --git a/emb6/src/net/sicslowpan/sicslowpan.c b/emb6/src/net/sicslowpan/sicslowpan.c
index 79afefe..529c6f4 100644 index 79afefed..529c6f45 100644
--- a/emb6/src/net/sicslowpan/sicslowpan.c --- a/emb6/src/net/sicslowpan/sicslowpan.c
+++ b/emb6/src/net/sicslowpan/sicslowpan.c +++ b/emb6/src/net/sicslowpan/sicslowpan.c
@@ -161,13 +161,34 @@ void uip_log(char *msg); @@ -161,13 +161,34 @@ void uip_log(char *msg);
@ -735,7 +735,7 @@ index 79afefe..529c6f4 100644
int c = 0; int c = 0;
/* set protocol in NETWORK_ID */ /* set protocol in NETWORK_ID */
diff --git a/emb6/src/tport/udp-socket.c b/emb6/src/tport/udp-socket.c diff --git a/emb6/src/tport/udp-socket.c b/emb6/src/tport/udp-socket.c
index 545f6bd..3980716 100644 index 545f6bde..39807169 100644
--- a/emb6/src/tport/udp-socket.c --- a/emb6/src/tport/udp-socket.c
+++ b/emb6/src/tport/udp-socket.c +++ b/emb6/src/tport/udp-socket.c
@@ -44,7 +44,12 @@ void _udp_sock_callback(c_event_t c_event, p_data_t p_data); @@ -44,7 +44,12 @@ void _udp_sock_callback(c_event_t c_event, p_data_t p_data);
@ -753,5 +753,5 @@ index 545f6bd..3980716 100644
#define LOGGER_ENABLE LOGGER_CORE #define LOGGER_ENABLE LOGGER_CORE
#if LOGGER_ENABLE == TRUE #if LOGGER_ENABLE == TRUE
-- --
1.9.1 2.16.1

6
pkg/emb6/patches/0004-Provide-event-type-for-RIOT-s-conn_.-_send.patch → pkg/emb6/patches/0004-Provide-event-type-for-RIOT-s-sock_.-_send.patch
View File

@ -1,4 +1,4 @@
From 6b0721c0d546652238c139f0d41790cb77996442 Mon Sep 17 00:00:00 2001 From 0e12b41bfc8283be079ce2bb9469713932eeacb7 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu> From: Martine Lenders <mail@martine-lenders.eu>
Date: Fri, 26 Feb 2016 12:35:52 +0100 Date: Fri, 26 Feb 2016 12:35:52 +0100
Subject: [PATCH 4/4] Provide event type for RIOT's sock_.*_send Subject: [PATCH 4/4] Provide event type for RIOT's sock_.*_send
@ -8,7 +8,7 @@ Subject: [PATCH 4/4] Provide event type for RIOT's sock_.*_send
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/utils/inc/evproc.h b/utils/inc/evproc.h diff --git a/utils/inc/evproc.h b/utils/inc/evproc.h
index 5316a67..78153be 100644 index 5316a67e..883a1366 100644
--- a/utils/inc/evproc.h --- a/utils/inc/evproc.h
+++ b/utils/inc/evproc.h +++ b/utils/inc/evproc.h
@@ -79,6 +79,7 @@ @@ -79,6 +79,7 @@
@ -34,5 +34,5 @@ index 5316a67..78153be 100644
#define EVPROC_QUEUE_SIZE 20 ///< Maximal amount of events in /ref pst_evList queue #define EVPROC_QUEUE_SIZE 20 ///< Maximal amount of events in /ref pst_evList queue
/*============================================================================= /*=============================================================================
-- --
1.9.1 2.16.1