projects / feed / packages.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #4872 from champtar/sha256
[feed/packages.git] / net / iotivity / Makefile
diff --git a/net/iotivity/Makefile b/net/iotivity/Makefile
index 3c09998642e48fdd0c08cd7df166ef12b269a3fb..f31adbd9c3bb93381bbf68af211cfb9aac12f5d2 100644 (file)
--- a/net/iotivity/Makefile
+++ b/net/iotivity/Makefile
@@ -8,21 +8,33 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iotivity
-PKG_VERSION:=0.9.2
+PKG_VERSION:=1.2.1
 PKG_RELEASE=1
 
 PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_SOURCE_URL:=https://downloads.iotivity.org/${PKG_VERSION}/ \
-       http://mirrors.kernel.org/${PKG_NAME}/${PKG_VERSION}/
-PKG_MD5SUM:=cf32e10a8f355fe1327db98ffc9a6173
+PKG_SOURCE_URL:=http://mirrors.kernel.org/${PKG_NAME}/${PKG_VERSION}/
+PKG_HASH:=7dcd9f0f48263c6b27a2c3d085dd7278b5c0feed1dfec8872a04899707fa23d8
 PKG_USE_MIPS16:=0
 
-PKG_MAINTAINER:=Hauke Mehrtens <hauke.mehrtens@lantiq.com>
+PKG_BUILD_DEPENDS:=boost
+
+PKG_MAINTAINER:=Hauke Mehrtens <hauke.mehrtens@intel.com>
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE.md
 
-PKG_BUILD_DEPENDS:= +boost +libexpat
+PKG_CONFIG_DEPENDS := \
+       CONFIG_PACKAGE_iotivity \
+       CONFIG_PACKAGE_iotivity-cpp \
+       CONFIG_PACKAGE_iotivity-resource-directory-lib \
+       CONFIG_PACKAGE_iotivity-oic-middle \
+       CONFIG_PACKAGE_iotivity-resource-container-lib \
+       CONFIG_PACKAGE_iotivity-resource-container-sample \
+       CONFIG_PACKAGE_iotivity-resource-container-hue \
+       CONFIG_PACKAGE_iotivity-example-garage \
+       CONFIG_PACKAGE_iotivity-example-simple \
+       CONFIG_PACKAGE_iotivity_DEBUG \
+       CONFIG_PACKAGE_iotivity_SECURE
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/scons.mk
@@ -31,9 +43,10 @@ include $(INCLUDE_DIR)/scons.mk
 define Package/iotivity
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=@!USE_UCLIBC +libpthread +librt +libuuid
+  DEPENDS:=@!USE_UCLIBC +libpthread +librt +libuuid +libsqlite3 +PACKAGE_iotivity_SECURE:libmbedtls
   TITLE:=IoTivity C Library
   URL:=https://www.iotivity.org
+  MENU:=1
 endef
 
 define Package/iotivity/description
@@ -41,11 +54,32 @@ define Package/iotivity/description
     Open Interconnect Consortium Specification.
 endef
 
+define Package/iotivity/config
+  if PACKAGE_iotivity
+       config PACKAGE_iotivity_DEBUG
+               bool "IoTivity with debug support"
+               help
+                 Build IoTivity with debuging support.
+
+       config PACKAGE_iotivity_SECURE
+               bool "IoTivity with security support"
+               help
+                 Activate security support.
+
+       config PACKAGE_iotivity_LOGGING
+               bool "IoTivity with logging support"
+               default y
+               help
+                 Activate logging support.
+                 This will make IoTivity write a lot of log messages to stdout.
+  endif
+endef
+
 
 define Package/iotivity-cpp
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=iotivity +libpthread +libstdcpp
+  DEPENDS:=+iotivity +libpthread +libstdcpp
   TITLE:=IoTivity C++ Library
   URL:=https://www.iotivity.org
 endef
@@ -55,76 +89,55 @@ define Package/iotivity-cpp/description
     Open Interconnect Consortium Specification.
 endef
 
-
-define Package/iotivity-things-manager-lib
+define Package/iotivity-resource-directory-lib
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=iotivity +iotivity-cpp +libstdcpp
-  TITLE:=IoTivity things manager lib
+  DEPENDS:=+iotivity +iotivity-cpp
+  TITLE:=IoTivity Resource Directory library
   URL:=https://www.iotivity.org
 endef
 
-define Package/iotivity-things-manager-lib/description
-    IoTivity things-manager lib
-endef
-
 
-define Package/iotivity-plugin-manager-lib
+define Package/iotivity-oic-middle
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=iotivity +iotivity-cpp +libexpat +boost +boost-system
-  TITLE:=IoTivity plugin manager lib
+  DEPENDS:=+iotivity +iotivity-cpp +iotivity-resource-directory-lib
+  TITLE:=IoTivity OIC Middle
   URL:=https://www.iotivity.org
 endef
 
-define Package/iotivity-plugin-manager-lib/description
-    IoTivity plugin manager lib
+define Package/iotivity-oic-middle/description
+    IoTivity OIC Middle
 endef
 
-
-define Package/iotivity-mqttclient
+define Package/iotivity-resource-container-lib
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=iotivity +iotivity-cpp +iotivity-plugin-manager-lib +boost +boost-system
-  TITLE:=IoTivity mqtt Client
+  DEPENDS:=+iotivity +iotivity-cpp +boost +boost-system +boost-thread +boost-date_time
+  TITLE:=IoTivity Resource Container library
   URL:=https://www.iotivity.org
 endef
 
-define Package/iotivity-mqttclient/description
-    IoTivity mqtt Client
-endef
-
-
-define Package/iotivity-oic-middle
+define Package/iotivity-resource-container-sample
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=iotivity +iotivity-cpp
-  TITLE:=IoTivity OIC Middle
+  DEPENDS:=+iotivity +iotivity-resource-container-lib
+  TITLE:=IoTivity Resource Container sample Application
   URL:=https://www.iotivity.org
 endef
 
-define Package/iotivity-oic-middle/description
-    IoTivity OIC Middle
-endef
-
-
-define Package/iotivity-things-manager
+define Package/iotivity-resource-container-hue
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=iotivity +iotivity-cpp +iotivity-things-manager-lib
-  TITLE:=IoTivity things manager
+  DEPENDS:=+iotivity +iotivity-resource-container-lib +libcurl
+  TITLE:=IoTivity Resource Container Hue Bundle
   URL:=https://www.iotivity.org
 endef
 
-define Package/iotivity-things-manager/description
-    IoTivity things manager
-endef
-
-
 define Package/iotivity-example-garage
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=iotivity +iotivity-cpp
+  DEPENDS:=+iotivity +iotivity-cpp +iotivity-resource-directory-lib
   TITLE:=IoTivity Garage example
   URL:=https://www.iotivity.org
 endef
@@ -133,34 +146,73 @@ define Package/iotivity-example-garage/description
     An IoTivity example application
 endef
 
+define Package/iotivity-example-simple
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+iotivity +iotivity-cpp +iotivity-resource-directory-lib
+  TITLE:=IoTivity simple client + server
+  URL:=https://www.iotivity.org
+endef
+
+define Package/iotivity-example-simple/description
+    The IoTivity simple client and simple server exmaple
+endef
+
 
 PKG_TINYCBOR_NAME:=tinycbor
-PKG_TINYCBOR_VERSION:=3e83c0dc6e55bc73e9a4a7343ab8e06c43127efa
-PKG_TINYCBOR_SOURCE:=$(PKG_TINYCBOR_NAME)-$(PKG_TINYCBOR_VERSION).tar.bz2
 PKG_TINYCBOR_PROTO:=git
+PKG_TINYCBOR_VERSION:=0.4
+PKG_TINYCBOR_SOURCE_VERSION:=a088996aa5f59b4f27f20fadad053d88bee357d4
+PKG_TINYCBOR_MIRROR_HASH:=77c600bd7362df8291148fa3d94ca780815ea2b74b817dca7565310ea0abff96
+PKG_TINYCBOR_SOURCE:=$(PKG_TINYCBOR_NAME)-$(PKG_TINYCBOR_VERSION).tar.bz2
 PKG_TINYCBOR_SOURCE_URL:=https://github.com/01org/tinycbor.git
 PKG_TINYCBOR_SUBDIR:=$(PKG_TINYCBOR_NAME)
-#PKG_TINYCBOR_MIRROR_MD5SUM:=?
 
 define Download/iotivity-tinycbor
   FILE:=$(PKG_TINYCBOR_SOURCE)
   URL:=$(PKG_TINYCBOR_SOURCE_URL)
+  MIRROR_HASH:=$(PKG_TINYCBOR_MIRROR_HASH)
   PROTO:=$(PKG_TINYCBOR_PROTO)
-  VERSION:=$(PKG_TINYCBOR_VERSION)
+  VERSION:=$(PKG_TINYCBOR_SOURCE_VERSION)
   SUBDIR:=$(PKG_TINYCBOR_SUBDIR)
-  #MIRROR_MD5SUM:=$(PKG_TINYCBOR_MIRROR_MD5SUM)
 endef
 $(eval $(call Download,iotivity-tinycbor))
 
 
+EXTRA_CXXFLAGS += -std=gnu++11
+
 SCONS_OPTIONS += \
        TARGET_OS=linux \
-       TARGET_TRANSPORT=ALL \
+       TARGET_TRANSPORT=IP \
        TARGET_ARCH=$(ARCH) \
        STAGING_DIR=$(STAGING_DIR) \
-       LOGGING=true \
-       SECURED=1 \
-       mqttclient examples samples libTGMSDK ConServerApp ConClientApp BootstrapServerApp
+       WITH_ENV=true \
+       octbstack oc \
+       $(if $(CONFIG_PACKAGE_iotivity-oic-middle),examples) \
+       $(if $(CONFIG_PACKAGE_iotivity-resource-container-lib),libResContainer) \
+       $(if $(CONFIG_PACKAGE_iotivity-resource-container-sample),containersample) \
+       $(if $(CONFIG_PACKAGE_iotivity-resource-container-hue),libHueBundle) \
+       $(if $(CONFIG_PACKAGE_iotivity-example-garage),examples) \
+       $(if $(CONFIG_PACKAGE_iotivity-example-simple),examples) \
+       install
+
+ifeq ($(CONFIG_PACKAGE_iotivity_DEBUG),y)
+  SCONS_OPTIONS += RELEASE=false
+  APP_OPTIM:=debug
+else
+  SCONS_OPTIONS += RELEASE=true
+  APP_OPTIM:=release
+endif
+
+ifeq ($(CONFIG_PACKAGE_iotivity_SECURE),y)
+  SCONS_OPTIONS += SECURED=1
+else
+  SCONS_OPTIONS += SECURED=0
+endif
+
+ifeq ($(CONFIG_PACKAGE_iotivity_LOGGING),y)
+  SCONS_OPTIONS += LOGGING=true
+endif
 
 ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
   SCONS_OPTIONS += VERBOSE=true
@@ -183,54 +235,79 @@ endef
 
 define Package/iotivity/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/liboctbstack.so $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/libconnectivity_abstraction.so $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/liboctbstack.so $(1)/usr/lib/
+ifeq ($(CONFIG_PACKAGE_iotivity_SECURE),y)
+       $(INSTALL_DIR) $(1)/etc/iotivity/
+       $(INSTALL_DATA) ./files/etc/iotivity/oic_svr_db.cbor $(1)/etc/iotivity/
+endif
 endef
 
 define Package/iotivity-cpp/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/liboc.so $(1)/usr/lib/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/liboc_logger.so $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/liboc.so $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/liboc_logger.so $(1)/usr/lib/
 endef
 
-define Package/iotivity-things-manager-lib/install
+define Package/iotivity-resource-directory-lib/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/libTGMSDKLibrary.so $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/libresource_directory.so $(1)/usr/lib/
 endef
 
-define Package/iotivity-plugin-manager-lib/install
+define Package/iotivity-oic-middle/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/examples/OICMiddle/OICMiddle $(1)/usr/bin/
+endef
+
+define Package/iotivity-resource-container-lib/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/libpmimpl.so $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/librcs_common.so $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/librcs_client.so $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/librcs_server.so $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/librcs_container.so $(1)/usr/lib/
 endef
 
-define Package/iotivity-mqttclient/install
+define Package/iotivity-resource-container-sample/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/service/protocol-plugin/sample-app/linux/mqtt/mqttclient $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/service/resource-container/ContainerSample  $(1)/usr/bin/
 endef
 
-define Package/iotivity-oic-middle/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/examples/OICMiddle/OICMiddle $(1)/usr/bin/
+define Package/iotivity-resource-container-hue/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/libHueBundle.so $(1)/usr/lib/
 endef
 
-define Package/iotivity-things-manager/install
+define Package/iotivity-example-garage/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/service/things-manager/sampleapp/linux/configuration/bootstrapserver $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/service/things-manager/sampleapp/linux/configuration/con-server $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/service/things-manager/sampleapp/linux/configuration/con-client $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/resource/examples/garageclient $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/resource/examples/garageserver $(1)/usr/bin/
 endef
 
-define Package/iotivity-example-garage/install
+define Package/iotivity-example-simple/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/resource/examples/garageclient $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/release/resource/examples/garageserver $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/resource/examples/simpleclient $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/resource/examples/simpleserver $(1)/usr/bin/
 endef
 
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/include $(1)/usr/include/iotivity
+
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/libconnectivity_abstraction.so $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/liboctbstack.so $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/liboc.so $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/liboc_logger.so $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/out/linux/$(ARCH)/$(APP_OPTIM)/libresource_directory.so $(1)/usr/lib/
+endef
+       
 
 $(eval $(call BuildPackage,iotivity))
 $(eval $(call BuildPackage,iotivity-cpp))
-$(eval $(call BuildPackage,iotivity-things-manager-lib))
-$(eval $(call BuildPackage,iotivity-plugin-manager-lib))
-$(eval $(call BuildPackage,iotivity-mqttclient))
+$(eval $(call BuildPackage,iotivity-resource-directory-lib))
 $(eval $(call BuildPackage,iotivity-oic-middle))
-$(eval $(call BuildPackage,iotivity-things-manager))
+$(eval $(call BuildPackage,iotivity-resource-container-lib))
+$(eval $(call BuildPackage,iotivity-resource-container-sample))
+$(eval $(call BuildPackage,iotivity-resource-container-hue))
 $(eval $(call BuildPackage,iotivity-example-garage))
+$(eval $(call BuildPackage,iotivity-example-simple))
Mirror of packages feed