mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2025-12-25 14:33:52 +01:00
pkg/ccn-lite: bump version
This commit is contained in:
parent
0da0f3a32f
commit
0d2c73d82c
@ -1,6 +1,6 @@
|
||||
PKG_NAME=ccn-lite
|
||||
PKG_URL=https://github.com/cn-uofbasel/ccn-lite/
|
||||
PKG_VERSION=ee0bff932b5ee3f1c7835e787b2d47d2b26e18c7
|
||||
PKG_VERSION=b3d692674be8739c2b1bb2984f86c6be308542a5
|
||||
PKG_LICENSE=ISC
|
||||
|
||||
include $(RIOTBASE)/pkg/pkg.mk
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 7b4f637281287d0f145fea5f4376189015d86f20 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Abadie <alexandre.abadie@inria.fr>
|
||||
Date: Thu, 4 Jun 2020 22:28:03 +0200
|
||||
Subject: [PATCH 1/1] ccnl-riot: fix build on stm32 cpus
|
||||
|
||||
---
|
||||
src/ccnl-riot/include/ccnl-riot-logging.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/ccnl-riot/include/ccnl-riot-logging.h b/src/ccnl-riot/include/ccnl-riot-logging.h
|
||||
index 373f121a..96a4bb19 100644
|
||||
--- a/src/ccnl-riot/include/ccnl-riot-logging.h
|
||||
+++ b/src/ccnl-riot/include/ccnl-riot-logging.h
|
||||
@@ -24,6 +24,10 @@
|
||||
#define LOG_LEVEL LOG_DEBUG
|
||||
#endif
|
||||
|
||||
+#if defined(CPU_STM32)
|
||||
+#include "cpu.h"
|
||||
+#endif
|
||||
+
|
||||
#include "log.h"
|
||||
|
||||
/**
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 50b6cbc4acc9715626b55e838c3b317f6a891286 Mon Sep 17 00:00:00 2001
|
||||
From: Jose Alamos <jose.alamos@haw-hamburg.de>
|
||||
Date: Wed, 25 Mar 2020 11:07:29 +0100
|
||||
Subject: [PATCH] ccnl_core: add MAX_GNRC_NETIFS macro
|
||||
|
||||
---
|
||||
src/ccnl-core/include/ccnl-defs.h | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/ccnl-core/include/ccnl-defs.h b/src/ccnl-core/include/ccnl-defs.h
|
||||
index 879bbcfb..93d5af4b 100644
|
||||
--- a/src/ccnl-core/include/ccnl-defs.h
|
||||
+++ b/src/ccnl-core/include/ccnl-defs.h
|
||||
@@ -36,10 +36,15 @@
|
||||
/* assuming that all broadcast addresses consist of a sequence of equal octets */
|
||||
#define CCNL_BROADCAST_OCTET 0xFF
|
||||
|
||||
+/* By default use only one GNRC interface */
|
||||
+#ifndef MAX_GNRC_NETIFS
|
||||
+#define MAX_GNRC_NETIFS (1)
|
||||
+#endif
|
||||
+
|
||||
#if defined(CCNL_ARDUINO) || defined(CCNL_RIOT)
|
||||
# if defined(CCNL_RIOT)
|
||||
# include "net/gnrc/netif.h"
|
||||
-# define CCNL_MAX_INTERFACES GNRC_NETIF_NUMOF
|
||||
+# define CCNL_MAX_INTERFACES MAX_GNRC_NETIFS
|
||||
# else
|
||||
# define CCNL_MAX_INTERFACES 1
|
||||
# endif
|
||||
--
|
||||
2.25.0
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From 33251cb1c9cb2a4ef910c5d20dbe12373e3a2264 Mon Sep 17 00:00:00 2001
|
||||
From: Kaspar Schleiser <kaspar@schleiser.de>
|
||||
Date: Wed, 25 Nov 2020 13:58:42 +0100
|
||||
Subject: [PATCH] riot: adapt to changed kernel_types.h -> sched.h
|
||||
|
||||
---
|
||||
src/ccnl-core/include/ccnl-if.h | 2 +-
|
||||
src/ccnl-riot/include/ccn-lite-riot.h | 2 +-
|
||||
src/ccnl-riot/src/ccn-lite-riot.c | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/ccnl-core/include/ccnl-if.h b/src/ccnl-core/include/ccnl-if.h
|
||||
index cf90dcf9c3..40d461a55e 100644
|
||||
--- a/src/ccnl-core/include/ccnl-if.h
|
||||
+++ b/src/ccnl-core/include/ccnl-if.h
|
||||
@@ -24,7 +24,7 @@
|
||||
#define CCNL_IF_H
|
||||
|
||||
#if defined(CCNL_RIOT)
|
||||
-#include "kernel_types.h"
|
||||
+#include "sched.h"
|
||||
#endif
|
||||
|
||||
#include "ccnl-sched.h"
|
||||
diff --git a/src/ccnl-riot/include/ccn-lite-riot.h b/src/ccnl-riot/include/ccn-lite-riot.h
|
||||
index 99fa01af79..10682a801a 100644
|
||||
--- a/src/ccnl-riot/include/ccn-lite-riot.h
|
||||
+++ b/src/ccnl-riot/include/ccn-lite-riot.h
|
||||
@@ -21,7 +21,7 @@
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
-#include "kernel_types.h"
|
||||
+#include "sched.h"
|
||||
#include "arpa/inet.h"
|
||||
#include "net/packet.h"
|
||||
#include "net/ethernet/hdr.h"
|
||||
diff --git a/src/ccnl-riot/src/ccn-lite-riot.c b/src/ccnl-riot/src/ccn-lite-riot.c
|
||||
index 101273754b..e7b7f14944 100644
|
||||
--- a/src/ccnl-riot/src/ccn-lite-riot.c
|
||||
+++ b/src/ccnl-riot/src/ccn-lite-riot.c
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <time.h>
|
||||
|
||||
/* RIOT specific includes */
|
||||
-#include "kernel_types.h"
|
||||
+#include "sched.h"
|
||||
#include "random.h"
|
||||
#include "timex.h"
|
||||
#include "xtimer.h"
|
||||
--
|
||||
2.29.2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user