questd: upgrade to version 5.0.0

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

bbf/Makefile

@@ -16,7 +16,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk

easy-soc-libs/Makefile

@@ -39,12 +39,6 @@ define Package/libwifi/config
   source "$(SOURCE)/Config.in"
 endef
 
-define Package/libeasy
-  $(call Package/easy-soc-libs)
-  TITLE:= Helper and utility functions library (libeasy)
-  DEPENDS+=+libnl +libnl-route
-endef
-
 define Package/libwifi
   $(call Package/easy-soc-libs)
   TITLE:= WiFi library (libwifi)
@@ -94,8 +88,7 @@ endef
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
-	$(if $(CONFIG_PACKAGE_libeasy),libeasy)
+	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
@@ -115,13 +108,6 @@ define Build/Prepare
 endef
 endif
 
-define Build/InstallDev/libeasy
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/easy.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy.so* $(1)/usr/lib/
-endef
-
 define Build/InstallDev/libwifi
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
@@ -154,11 +140,6 @@ define Build/InstallDev
 	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef
 
-define Package/libeasy/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy.so* $(1)/usr/lib/
-endef
-
 define Package/libwifi/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
@@ -181,4 +162,3 @@ endef
 $(eval $(call BuildPackage,libwifi))
 $(eval $(call BuildPackage,libdsl))
 $(eval $(call BuildPackage,libethernet))
-$(eval $(call BuildPackage,libeasy))

icwmp/Makefile

@@ -8,17 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-12-11
+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:=3fdaca7e3463d46a52f31496b0f84deb6b21eaf8
+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)
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=LICENSE
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
@@ -113,11 +113,6 @@ endif
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
-ifeq ($(CONFIG_PACKAGE_icwmp-tr098),y)
-CONFIGURE_ARGS += \
-	--enable-icwmp_tr098
-endif
-
 ifneq ($(CWMP_REVISION)_,_)
 ifneq ($(CWMP_REVISION),exported)
 ifneq ($(CWMP_REVISION),Unversioned directory)

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))

tr098/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtr098
-PKG_VERSION:=1.0-2019-12-11
+PKG_VERSION:=1.0-2019-12-09
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/tr-098
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ce93aebda4c14cfc43a7a60d67d4716a576171fd
+PKG_SOURCE_VERSION:=691722e112cc8c858a4dd777a1c972c90ad32189
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)