oonf_api: adapt for new sockets

3536c848 · Martine Lenders · 320aa472 · 3536c848 · 3536c848 · 3536c848
Commit 3536c848 authored 9 years ago by Martine Lenders
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -5,7 +5,6 @@ endif
 ifneq (,$(filter nhdp,$(USEMODULE)))
  USEMODULE += conn_udp
  USEMODULE += vtimer
-  USEMODULE += oonf_common
  USEMODULE += oonf_rfc5444
 endif

@@ -307,9 +306,13 @@ ifneq (,$(filter fib,$(USEMODULE)))
  USEMODULE += xtimer
 endif

+ifneq (,$(filter oonf_rfc5444,$(USEMODULE)))
+  USEMODULE += oonf_common
+endif
+
 ifneq (,$(filter oonf_common,$(USEMODULE)))
  USEPKG += oonf_api
-  USEMODULE += socket_base
+  USEMODULE += posix_sockets
 endif

 ifneq (,$(filter %_conn_ip,$(USEMODULE)))

--- a/pkg/oonf_api/0001-add-RIOT-support.patch
+++ b/pkg/oonf_api/0001-add-RIOT-support.patch
--- a/pkg/oonf_api/0002-port-tests-to-riot.patch
+++ b/pkg/oonf_api/0002-port-tests-to-riot.patch
--- a/pkg/oonf_api/0003-port-example-to-riot.patch
+++ b/pkg/oonf_api/0003-port-example-to-riot.patch
--- a/pkg/oonf_api/0004-fix-conflicting-types.patch
+++ b/pkg/oonf_api/0004-fix-conflicting-types.patch
--- a/pkg/oonf_api/0005-only-define-container_of-when-necessary.patch
+++ b/pkg/oonf_api/0005-only-define-container_of-when-necessary.patch
--- a/pkg/oonf_api/0006-if_index-is-not-used.patch
+++ b/pkg/oonf_api/0006-if_index-is-not-used.patch
--- a/pkg/oonf_api/0007-Use-RIOT-s-container_of-implementation.patch
+++ b/pkg/oonf_api/0007-Use-RIOT-s-container_of-implementation.patch
--- a/pkg/oonf_api/0008-Dissolve-enum-into-single-defines.patch
+++ b/pkg/oonf_api/0008-Dissolve-enum-into-single-defines.patch
--- a/pkg/oonf_api/0009-Add-missing-include.patch
+++ b/pkg/oonf_api/0009-Add-missing-include.patch
--- a/pkg/oonf_api/0010-Change-index-of-array-from-0-to-1.patch
+++ b/pkg/oonf_api/0010-Change-index-of-array-from-0-to-1.patch