diff --git a/pkg/wakaama/Makefile b/pkg/wakaama/Makefile index 2079cf4e5a635243d496f25e2ffff623e3b82ae8..a49bb8d815cac8cb33ba666708078b387b17c5fd 100644 --- a/pkg/wakaama/Makefile +++ b/pkg/wakaama/Makefile @@ -1,6 +1,6 @@ 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 diff --git a/pkg/wakaama/Makefile.include b/pkg/wakaama/Makefile.include index 1bfb90a6553b07248f6c2adf38150d5bac470713..7c3de093bbfa41bdde60b088e4b468398a5e0862 100644 --- a/pkg/wakaama/Makefile.include +++ b/pkg/wakaama/Makefile.include @@ -1 +1 @@ -INCLUDES += -I$(RIOTPKG)/wakaama/wakaama +INCLUDES += -I$(PKGDIRBASE)/wakaama/riotbuild diff --git a/pkg/wakaama/patches/0009-fixed-warnings-in-observe.c.patch b/pkg/wakaama/patches/0009-fixed-warnings-in-observe.c.patch index 177220af93168fd7cd94cdf30614bd9e2b58a4b8..8e39b6f6fe1fc6b31dbf58f73fbb896aab3a4b86 100644 Binary files a/pkg/wakaama/patches/0009-fixed-warnings-in-observe.c.patch and b/pkg/wakaama/patches/0009-fixed-warnings-in-observe.c.patch differ diff --git a/pkg/wakaama/patches/0013-fixed-warnings-in-example-objects.patch b/pkg/wakaama/patches/0013-fixed-warnings-in-example-objects.patch new file mode 100644 index 0000000000000000000000000000000000000000..280f6e6c2fb77a4988eaaf900e88292c921b0fc1 Binary files /dev/null and b/pkg/wakaama/patches/0013-fixed-warnings-in-example-objects.patch differ diff --git a/pkg/wakaama/patches/0014-Use-lwm2m_strdup-instead-of-strdup.patch b/pkg/wakaama/patches/0014-Use-lwm2m_strdup-instead-of-strdup.patch new file mode 100644 index 0000000000000000000000000000000000000000..ca125ed85443aa2dda14e847188ba3878254bf98 Binary files /dev/null and b/pkg/wakaama/patches/0014-Use-lwm2m_strdup-instead-of-strdup.patch differ diff --git 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 new file mode 100644 index 0000000000000000000000000000000000000000..f2006b1c7119ded27b6fa74c9d41bccc7291d908 Binary files /dev/null and b/pkg/wakaama/patches/0015-fixed-alignment-problem-in-lwm2m_data_t.patch differ diff --git a/pkg/wakaama/patches/0016-change-liblwm2m-include.patch b/pkg/wakaama/patches/0016-change-liblwm2m-include.patch new file mode 100644 index 0000000000000000000000000000000000000000..671f570c41978643b7f76a7388b1806e211d681a Binary files /dev/null and b/pkg/wakaama/patches/0016-change-liblwm2m-include.patch differ diff --git a/pkg/wakaama/patches/0017-fix-access-control-object-read.patch b/pkg/wakaama/patches/0017-fix-access-control-object-read.patch new file mode 100644 index 0000000000000000000000000000000000000000..69ff6dfce6d476b9446f37f50d404dce8ca289b5 Binary files /dev/null and b/pkg/wakaama/patches/0017-fix-access-control-object-read.patch differ