questd: upgrade to version 5.0.0

- use cmake
- implement feature #1535: system object model redesign

bbf/Config_bbfdm.in

@@ -1,26 +1,26 @@
-if PACKAGE_libodm
+if PACKAGE_libbbfdm
 
-config LIBODM_VENDOR_PREFIX
+config LIBBBFDM_VENDOR_PREFIX
     string "Vendor Prefix"
     default "X_IOPSYS_EU_"
 
-config ODM_TR181
+config BBF_TR181
 	bool "Compile with tr181 device features"
 	default y
 
-config ODM_TR104
+config BBF_TR104
 	bool "Compile with tr104 voice features"
 	default y
 
-config ODM_TR143
+config BBF_TR143
 	bool "Compile with tr143 diagnostics features"
 	default y
 
-config ODM_TR157
+config BBF_TR157
 	bool "Compile with tr157 bulkdata collector features"
 	default y
 	
-config ODM_TR064
+config BBF_TR064
 	bool "Compile with tr064 features"
 	default n
 

bbf/Makefile

@@ -0,0 +1,89 @@
+#
+# Copyright (C) 2019 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libbbfdm
+PKG_VERSION:=1.0-2019-12-10
+PKG_FIXUP:=autoreconf
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=0ea0b2c89a51ad56ca76d171b7fd5dcf38e102cd
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libbbfdm
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace
+endef
+
+define Package/libbbfdm/config
+	source "$(SOURCE)/Config_bbfdm.in"
+endef
+
+define Package/libbbfdm/description
+ Test description will update later.
+endef
+
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBBBFDM_VENDOR_PREFIX)\\\"
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE -D_AADJ
+
+ifeq ($(CONFIG_BBF_TR181),y)
+CONFIGURE_ARGS += \
+	--enable-tr181
+endif
+
+ifeq ($(CONFIG_BBF_TR104),y)
+CONFIGURE_ARGS += \
+	--enable-tr104
+endif
+
+ifeq ($(CONFIG_BBF_TR143),y)
+CONFIGURE_ARGS += \
+	--enable-tr143
+endif
+
+ifeq ($(CONFIG_BBF_TR157),y)
+CONFIGURE_ARGS += \
+	--enable-tr157
+endif
+
+ifeq ($(CONFIG_BBF_TR064),y)
+CONFIGURE_ARGS += \
+	--enable-tr064
+endif
+
+define Package/libbbfdm/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
+	$(INSTALL_DIR) $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
+	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/bbfdm
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
+	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
+	$(CP) $(PKG_BUILD_DIR)/dmtree/tr181/*.h $(1)/usr/include/libbbfdm/
+	$(CP) $(PKG_BUILD_DIR)/dmtree/tr157/*.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libbbfdm))

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-12-09
+PKG_VERSION:=4.0-2019-12-07
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9a81f5e09fa5481d998bbffd431480bb30aaed4c
+PKG_SOURCE_VERSION:=33eb15471d8f40aab139ac3cdb1b4f6d0f3bb6df
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -64,7 +64,7 @@ define Package/icwmp_bulkdata
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=TR-069 BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libodm
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm
 endef
 
 define Package/icwmp-tr098
@@ -78,7 +78,7 @@ define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libodm
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm
 endef
 
 define Package/icwmp/description
@@ -259,4 +259,4 @@ $(eval $(call BuildPackage,icwmp_udpechoserver))
 $(eval $(call BuildPackage,icwmp_twamp))
 $(eval $(call BuildPackage,icwmp_bulkdata))
 $(eval $(call BuildPackage,icwmp-tr098))
-$(eval $(call BuildPackage,icwmp-zstream))
+$(eval $(call BuildPackage,icwmp-zstream))

iop/scripts/cve-check.sh

@@ -1,36 +0,0 @@
-#!/bin/sh
-function cvecheck {
-    CVEDIR="/tmp/cve-indicator/"
-    CVEBIN="${CVEDIR}/bin"
-    REPORTS="reports"
-    mkdir -p $REPORTS
-
-    dpkg -s python3 python3-requests python3-yaml python3-mako python3-six &> /dev/null
-    if [ $? -ne 0 ]
-        then
-            echo "Missing dependencies"
-            sudo apt-get update
-            sudo apt-get install python3 python3-requests python3-yaml python3-mako python3-six
-
-        else
-            echo    "Dependecy check passed"
-    fi
-
-
-if [ -d "$CVEDIR" ]; then
-  ### Take action if $DIR exists ###
-  echo "${CVEDIR} exists running cvecheck"
-else
-  ###  Control will jump here if $DIR does NOT exists ###
-  echo "Error: cvecheck not found. getting from iopsys repo"
-  git clone git@dev.iopsys.eu:iopsys/cve-indicator.git /tmp/cve-indicator
-fi
-  CVEGENLIST=`${CVEBIN}/cve-indicator gen-list openwrt bin`
-  CVEGETCVES=`${CVEBIN}/cve-indicator get-cves $CVEGENLIST --api_url http://cve.circl.lu/api/cvefor/`
-  CVEGETRPRT=`${CVEBIN}/cve-indicator gen-rprt $CVEGETCVES`
-exit 0
-
-}
-
-
-register_command "cvecheck" "Generate a CVE report on latest build"

open-data-models/Makefile

@@ -1,89 +0,0 @@
-#
-# Copyright (C) 2019 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libodm
-PKG_VERSION:=1.0-2019-12-09
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/open-data-models.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c41dea12db770a0203ae22ef86dcc796f3a4b713
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libodm
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace
-endef
-
-define Package/libodm/config
-	source "$(SOURCE)/Config_odm.in"
-endef
-
-define Package/libodm/description
- Test description will update later.
-endef
-
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBODM_VENDOR_PREFIX)\\\"
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE -D_AADJ
-
-ifeq ($(CONFIG_ODM_TR181),y)
-CONFIGURE_ARGS += \
-	--enable-tr181
-endif
-
-ifeq ($(CONFIG_ODM_TR104),y)
-CONFIGURE_ARGS += \
-	--enable-tr104
-endif
-
-ifeq ($(CONFIG_ODM_TR143),y)
-CONFIGURE_ARGS += \
-	--enable-tr143
-endif
-
-ifeq ($(CONFIG_ODM_TR157),y)
-CONFIGURE_ARGS += \
-	--enable-tr157
-endif
-
-ifeq ($(CONFIG_ODM_TR064),y)
-CONFIGURE_ARGS += \
-	--enable-tr064
-endif
-
-define Package/libodm/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libodm_tr.so* $(1)/lib/
-	$(INSTALL_DIR) $(1)/etc/odm
-	$(INSTALL_DIR) $(1)/etc/odm/json
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/odm
-	$(INSTALL_DIR) $(1)/usr/share/odm
-	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/odm
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libodm
-	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libodm/
-	$(CP) $(PKG_BUILD_DIR)/dmtree/tr181/*.h $(1)/usr/include/libodm/
-	$(CP) $(PKG_BUILD_DIR)/dmtree/tr157/*.h $(1)/usr/include/libodm/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libodm_tr.{a,so*} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libodm))

questd/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=4.1.1
+PKG_VERSION:=5.0.0
 
-PKG_SOURCE_VERSION:=89619c1ae8243812a71cdc0ae31491e74866f4be
+PKG_SOURCE_VERSION:=31aa9027062bd61776ca74f7b4043ce5416ded66
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 
@@ -20,30 +20,11 @@ PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-QUESTD_TARGET:=-DIOPSYS_BROADCOM
-KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-QUESTD_TARGET:=-DIOPSYS_BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-QUESTD_TARGET:=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-# BUG FIXME the Intel mips target is not handled in questd this is just to get it to compile
-QUESTD_TARGET:=-DIOPSYS_INTEL
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-QUESTD_TARGET:=-DIOPSYS_MEDIATEK
-QUESTD_CFLAGS:=\
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl-tiny
-else
-$(info (UNEXPECTED CONFIG TARGET))
-endif
-QUESTD_CFLAGS:=$(QUESTD_CFLAGS) $(QUESTD_TARGET)
-
-export QUESTD_TARGET
-export KERNEL_DIR
-export QUESTD_CFLAGS
+PKG_INSTALL:=
+# FIXME: to be removed as soon as the issue fixed in the application
+#TARGET_CFLAGS+=-Wno-error=format-security
 
 define Package/questd
 	CATEGORY:=Utilities
@@ -60,10 +41,6 @@ define Package/questd/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wificontrol $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/graphd $(1)/sbin/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netcheck $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,questd))