questd: set PKG_SOURCE_VERSION to qualcomm branch

to avoid patching the binaries downloaded when building open builds

bbf/Config_bbfdm.in

@@ -16,6 +16,10 @@ config BBF_TR143
 	bool "Compile with tr143 diagnostics features"
 	default y
 
+config BBF_TR157
+	bool "Compile with tr157 bulkdata collector features"
+	default y
+	
 config BBF_TR064
 	bool "Compile with tr064 features"
 	default n

bbf/Makefile

@@ -5,16 +5,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=1.0-2019-09-18
+PKG_VERSION:=1.0-2019-10-01
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4be7fe3c202e221c4d094de36c8a88126cc47bdf
+PKG_SOURCE_VERSION:=b3bae9df19df35075ac52f53758288d8e0573790
 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)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=LICENSE
@@ -56,6 +56,11 @@ CONFIGURE_ARGS += \
 	--enable-tr143
 endif
 
+ifeq ($(CONFIG_BBF_TR157),y)
+CONFIGURE_ARGS += \
+	--enable-tr157
+endif
+
 ifeq ($(CONFIG_BBF_TR064),y)
 CONFIGURE_ARGS += \
 	--enable-tr064

easy-soc-libs.deprecated/Makefile

@@ -60,6 +60,9 @@ else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
 else ifeq ($(CONFIG_TARGET_intel_mips),y)
   TARGET_PLATFORM=INTEL
   TARGET_CFLAGS +=-DIOPSYS_INTEL
+else ifeq ($(CONFIG_TARGET_ipq),y)
+  TARGET_PLATFORM=QCA
+  TARGET_CFLAGS +=-DIOPSYS_QCA
 else
   $(info Unexpected CONFIG_TARGET)
 endif

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=2.4.0
+PKG_VERSION:=2.4.1
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=30f5527ae724d54537c803127e11992d1a5ae154
+PKG_SOURCE_VERSION:=1b6234d2dad694ace8af50956cd66f1c96f2255f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -82,7 +82,7 @@ endif
 define Package/libdsl
   $(call Package/easy-soc-libs)
   TITLE:= XDSL library (libdsl)
-  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi
+  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi +TARGET_intel_mips:kmod-ppa-drv
 endef
 
 subdirs := \

endptmngr/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=631e61b7ab5d86f2f4c86756a117badff9fb0f2c
+PKG_SOURCE_VERSION:=ef49d57c3824df4dfb4921d39461e2bd14f918a7
 
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)
@@ -16,6 +16,7 @@ BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
 PKG_NAME:=endptmngr-open
+PATCH_DIR:=
 else
 PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/endptmngr
 PKG_SOURCE_PROTO:=git

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-09-15
+PKG_VERSION:=4.0-2019-10-01
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=89564260af83117243b57dcc00a441f25225cb98
+PKG_SOURCE_VERSION:=ed781436f96f2dc3cf58b35adc640c6f9f6783d1
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -60,11 +60,18 @@ define Package/icwmp_udpechoserver
 	DEPENDS:=+libuci
 endef
 
+define Package/icwmp_bulkdata
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=TR-069 BulkData Collection
+ DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm
+endef
+
 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 +libbbfdm
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm +(PACKAGE_libtr098):libtr098
 endef
 
 define Package/icwmp/description
@@ -151,10 +158,21 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
+ifeq ($(CONFIG_PACKAGE_libtr098),y)
+CONFIGURE_ARGS += \
+	--enable-tr098
+endif
+
+CONFIGURE_ARGS += \
+	--enable-tr181
+
 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
+ifeq ($(CONFIG_PACKAGE_libtr098),y)
+	$(CP) $(PKG_BUILD_DIR)/bin/icwmp_tr098d $(1)/usr/sbin
+endif
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
@@ -209,6 +227,15 @@ define Package/icwmp_twamp/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_twamp $(1)/etc/config
 endef
 
+define Package/icwmp_bulkdata/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_bulkdatad $(1)/usr/sbin/icwmp_bulkdatad
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_bulkdatad $(1)/etc/init.d/icwmp_bulkdatad
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_bulkdata $(1)/etc/config
+endef
+
 define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
 	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
@@ -233,4 +260,5 @@ $(eval $(call BuildPackage,icwmp_stun))
 $(eval $(call BuildPackage,icwmp_xmpp))
 $(eval $(call BuildPackage,icwmp_udpechoserver))
 $(eval $(call BuildPackage,icwmp_twamp))
+$(eval $(call BuildPackage,icwmp_bulkdata))
 $(eval $(call BuildPackage,icwmp-zstream))

iop/scripts/cve-check.sh

@@ -0,0 +1,36 @@
+#!/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"

iop/scripts/genconfig.sh

@@ -18,6 +18,7 @@ function genconfig {
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
 	intel_mips="target/linux/intel_mips"
+	qca_ipq="target/linux/ipq"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -90,9 +91,11 @@ function genconfig {
 			iopsys_ramips=$(cd $ramips; ./genconfig)
 		[ -e $intel_mips/genconfig ] &&
 			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
+		[ -e $qca_ipq/genconfig ] &&
+			iopsys_qca_ipq=$(cd $qca_ipq; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips; do
+			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_qca_ipq; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -133,6 +136,14 @@ function genconfig {
 		fi
 	    done
 
+	    for p in $iopsys_qca_ipq; do
+		if [ $p == $profile ]; then
+		    target="ipq"
+		    config_path="$qca_ipq/config"
+		    return
+		fi
+	    done
+
 	}
 
 	git remote -v | grep -q http || {
@@ -307,6 +318,8 @@ function genconfig {
 			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			device=$(echo $BOARDTYPE | tr a-z A-Z)
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
+		elif [ "$target" = "ipq" ]; then
+			:
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -437,10 +450,6 @@ function genconfig {
 
 		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
 
-		# git ls-remote is used for testing access rights so do not ask for password
-		# if the user has access the ssh key is used not password
-		export GIT_SSH_COMMAND="ssh -oBatchMode=yes"
-
 		setup_dirs
 		create_and_copy_files "$@"
 	fi

obuspa/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=obuspa
 PKG_VERSION:=1.0.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e2816ff39f654a191afd49c90a05f70e99259d8e
+PKG_SOURCE_VERSION:=f362163d5a660a18081ec8665851c8db90d6f238
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 

obuspa/files/etc/config/obuspa

@@ -11,4 +11,5 @@ config connection
 	option username 'username'
 	option password 'password'
 	option encryption 'false'
+	option interface 'wan'
 

obuspa/files/etc/init.d/obuspa

@@ -16,7 +16,7 @@ log() {
 
 db_set() {
 	log "DBSET param|${1}| value|${2}|"
-	USP_BOARD_IFNAME=${l3device} ${PROG} -c dbset ${1} ${2}
+	${PROG} -c dbset ${1} ${2}
 }
 
 validate_controller_section()
@@ -39,7 +39,8 @@ validate_connection_section()
 		'host:string:"usp-controller.com"' \
 		'username:string:username' \
 		'password:string:password' \
-		'encryption:bool:true'
+		'encryption:bool:true' \
+		'interface:string:wan'
 }
 
 configure_controller() {
@@ -65,12 +66,22 @@ configure_mtp() {
 }
 
 configure_connection() {
-	local host username password encryption
+	local host username password encryption interface
 
 	validate_connection_section "${1}" || {
 		log "Validation of section failed"
 		return 1;
 	}
+
+	# Get wan L3 interface
+	json_load "$(ubus call network.interface.${interface} status)"
+	json_get_var l3device l3_device
+	echo "l3device ${l3device}">/dev/console
+	export USP_BOARD_IFNAME=${l3device}
+
+	# Set this variable for root user
+	echo "export USP_BOARD_IFNAME=${l3device}">/root/.profile
+
 	db_set "${CONN_PATH}Host" ${host}
 	db_set "${CONN_PATH}Username" ${username}
 	db_set "${CONN_PATH}Password" ${password}
@@ -81,14 +92,11 @@ db_init() {
 	[ -f /tmp/usp.db ] && rm -f /tmp/usp.db
 
 	config_load obuspa
+	config_foreach configure_connection connection
 	config_foreach configure_controller controller
 	config_foreach configure_mtp mtp
-	config_foreach configure_connection connection
 }
 start_service() {
-	# Get wan L3 interface
-	json_load "$(ubus call network.interface.wan status)"
-	json_get_var l3device l3_device
 	db_init
 	procd_open_instance
 	procd_set_param env USP_BOARD_IFNAME=${l3device}
@@ -110,4 +118,3 @@ reload_service() {
 service_triggers() {
 	procd_add_config_trigger "config.change" "obuspa"  /etc/init.d/obuspa restart
 }
-

owsd/Makefile

@@ -10,7 +10,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=8a2b9ba61be4f13111b32dbef9e97eb40aea5866
+PKG_SOURCE_VERSION:=a83448ed65e1c76411b9c6553d64b5d623b8bcd7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1

questd/Makefile

@@ -8,7 +8,9 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=4.1.1
 
-PKG_SOURCE_VERSION:=b1e1d6218a90b533a3492fd93b0e2b256bc23cf6
+#PKG_SOURCE_VERSION:=04eb78c28d96801951b204bc434f84d43d4a0d03
+# FIXME
+PKG_SOURCE_VERSION:=qcom
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 
@@ -36,6 +38,8 @@ QUESTD_TARGET:=-DIOPSYS_MEDIATEK
 QUESTD_CFLAGS:=\
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl-tiny
+else ifeq ($(CONFIG_TARGET_ipq),y)
+QUESTD_TARGET:=-DIOPSYS_QCA
 else
 $(info (UNEXPECTED CONFIG TARGET))
 endif

tr098/Config.in

@@ -0,0 +1,11 @@
+if PACKAGE_libtr098
+
+config LIBTR098_VENDOR_PREFIX
+    string "TR-098 Vendor Prefix"
+    default "X_IOPSYS_EU_"
+
+config UPNP_TR064
+	bool "Compile with tr064 features"
+	default n
+	
+endif

tr098/Makefile

@@ -0,0 +1,71 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libtr098
+PKG_VERSION:=1.0-2019-09-25
+PKG_FIXUP:=autoreconf
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/tr-098
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=c2de93e288907da239652bd137f2ddee389b5042
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libtr098
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace
+endef
+
+define Package/libtr098/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Package/libtr098/description
+ Test description will update later.
+endef
+
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
+define Build/Prepare
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBTR098_VENDOR_PREFIX)\\\"
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE -D_AADJ
+
+ifeq ($(CONFIG_UPNP_TR064),y)
+CONFIGURE_ARGS += \
+	--enable-tr064
+endif
+
+define Package/libtr098/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libtr098.so* $(1)/lib/
+	$(INSTALL_DIR) $(1)/etc/tr098
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/tr098
+	$(INSTALL_DIR) $(1)/usr/share/tr098
+	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/tr098
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/libtr098
+	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libtr098/
+	$(CP) $(PKG_BUILD_DIR)/tr098/*.h $(1)/usr/include/libtr098/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libtr098.{a,so*} $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libtr098))

uspd/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=uspd
 PKG_VERSION:=1.0.3
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=eeb458e2f5b309ec9290388863d73d8bdf176484
+PKG_SOURCE_VERSION:=e570b892c5ff57c908ca36b86dc3cd75c0acea0f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -20,7 +20,7 @@ define Package/uspd
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=USP ubus backend
-  DEPENDS:=+libubox +ubus +icwmp-curl
+  DEPENDS:=+libubox +ubus +libbbfdm
 endef
 
 define Package/uspd/description

wifilife/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=wifilife
 PKG_VERSION:=2.5.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=9b9a787120743d121ce867251af45da076fe7cce
+PKG_SOURCE_VERSION:=e875c8060eae9d83d4dc35aea2c9dde7c80df0df
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 ifeq ($(CONFIG_WIFILIFE_OPEN),y)