Merge pull request #10738 from jia200x/pkg/wakaaama_bump

pkg/wakaama: bump version

Merge pull request #10738 from jia200x/pkg/wakaaama_bump
3e7b3d38 · Leandro Lanzieri · GitHub · ca9c4419 · 82c7eac0 · 3e7b3d38
Unverified Commit 3e7b3d38 authored 6 years ago by Leandro Lanzieri Committed by GitHub 6 years ago
--- a/pkg/wakaama/Makefile
+++ b/pkg/wakaama/Makefile
 PKG_NAME=wakaama
 PKG_URL=https://github.com/eclipse/wakaama.git
-PKG_VERSION=ee80c224622684ee47c17c57918904cffd00c4d2
+PKG_VERSION=da74b3c91570b9716fbb424e90935806b2b29814
 PKG_LICENSE=EDL-1.0,EPL-1.0

 .PHONY: all
@@ -12,6 +12,9 @@ patch: git-download
 	mkdir -p "$(PKG_BUILDDIR)/riotbuild"
 	cp $(PKG_BUILDDIR)/core/*.c $(PKG_BUILDDIR)/core/*.h $(PKG_BUILDDIR)/riotbuild
 	cp $(PKG_BUILDDIR)/core/er-coap-13/*.c $(PKG_BUILDDIR)/core/er-coap-13/*.h $(PKG_BUILDDIR)/riotbuild
+	cp $(PKG_BUILDDIR)/examples/client/object_server.c $(PKG_BUILDDIR)/riotbuild
+	cp $(PKG_BUILDDIR)/examples/client/object_security.c $(PKG_BUILDDIR)/riotbuild
+	cp $(PKG_BUILDDIR)/examples/client/object_access_control.c $(PKG_BUILDDIR)/riotbuild

 	echo 'MODULE:=wakaama' > $(PKG_BUILDDIR)/riotbuild/Makefile
 	echo 'include $$(RIOTBASE)/Makefile.base' >> $(PKG_BUILDDIR)/riotbuild/Makefile

--- a/pkg/wakaama/Makefile.include
+++ b/pkg/wakaama/Makefile.include
-INCLUDES += -I$(RIOTPKG)/wakaama/wakaama
+INCLUDES += -I$(PKGDIRBASE)/wakaama/riotbuild
--- a/pkg/wakaama/patches/0009-fixed-warnings-in-observe.c.patch
+++ b/pkg/wakaama/patches/0009-fixed-warnings-in-observe.c.patch
--- a/pkg/wakaama/patches/0013-fixed-warnings-in-example-objects.patch
+++ b/pkg/wakaama/patches/0013-fixed-warnings-in-example-objects.patch
--- a/pkg/wakaama/patches/0014-Use-lwm2m_strdup-instead-of-strdup.patch
+++ b/pkg/wakaama/patches/0014-Use-lwm2m_strdup-instead-of-strdup.patch
--- a/pkg/wakaama/patches/0015-fixed-alignment-problem-in-lwm2m_data_t.patch
+++ b/pkg/wakaama/patches/0015-fixed-alignment-problem-in-lwm2m_data_t.patch
--- a/pkg/wakaama/patches/0016-change-liblwm2m-include.patch
+++ b/pkg/wakaama/patches/0016-change-liblwm2m-include.patch
--- a/pkg/wakaama/patches/0017-fix-access-control-object-read.patch
+++ b/pkg/wakaama/patches/0017-fix-access-control-object-read.patch