genconfig: do not ask for password.

Access right is done with ssh keys not password so do not ask for them.
2025-12-26 20:14:11 +08:00 · 2019-09-25 23:20:42 +02:00
11 changed files with 21 additions and 179 deletions
--- a/bbf/Config_bbfdm.in
+++ b/bbf/Config_bbfdm.in
@@ -16,10 +16,6 @@ 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
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -5,16 +5,16 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libbbfdm
-PKG_VERSION:=1.0-2019-10-01
+PKG_VERSION:=1.0-2019-09-18
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b3bae9df19df35075ac52f53758288d8e0573790
+PKG_SOURCE_VERSION:=4be7fe3c202e221c4d094de36c8a88126cc47bdf
 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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=LICENSE
@@ -56,11 +56,6 @@ CONFIGURE_ARGS += \
 	--enable-tr143
 endif

-ifeq ($(CONFIG_BBF_TR157),y)
-CONFIGURE_ARGS += \
-	--enable-tr157
-endif
-
 ifeq ($(CONFIG_BBF_TR064),y)
 CONFIGURE_ARGS += \
 	--enable-tr064
--- a/easy-soc-libs/Makefile
+++ b/easy-soc-libs/Makefile
@@ -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 +TARGET_intel_mips:kmod-ppa-drv
+  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi
 endef

 subdirs := \
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-10-01
+PKG_VERSION:=4.0-2019-09-15
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ed781436f96f2dc3cf58b35adc640c6f9f6783d1
+PKG_SOURCE_VERSION:=89564260af83117243b57dcc00a441f25225cb98
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -60,18 +60,11 @@ 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 +(PACKAGE_libtr098):libtr098
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm
 endef

 define Package/icwmp/description
@@ -158,21 +151,10 @@ 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
@@ -227,15 +209,6 @@ 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
@@ -260,5 +233,4 @@ $(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))
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -437,6 +437,10 @@ 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
--- a/json-editor/Makefile
+++ b/json-editor/Makefile
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2008-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=json-editor
-PKG_RELEASE:=1.0.0
-
-PKG_SOURCE_VERSION:=44b32937a062ec4ffc9f7355841dc94ab6efa50f
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/json-editor.git
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/json-editor
-  SECTION:=base
-  CATEGORY:=Libraries
-  DEPENDS:=+libjson-c +libblobmsg_json
-  TITLE:=JSON-editor
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/src/json-editor.h $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libjson-editor.so $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,json-editor))
--- a/obuspa/files/etc/config/obuspa
+++ b/obuspa/files/etc/config/obuspa
@@ -11,5 +11,4 @@ config connection
 	option username 'username'
 	option password 'password'
 	option encryption 'false'
-	option interface 'wan'

--- a/obuspa/files/etc/init.d/obuspa
+++ b/obuspa/files/etc/init.d/obuspa
@@ -16,7 +16,7 @@ log() {

 db_set() {
 	log "DBSET param|${1}| value|${2}|"
-	${PROG} -c dbset ${1} ${2}
+	USP_BOARD_IFNAME=${l3device} ${PROG} -c dbset ${1} ${2}
 }

 validate_controller_section()
@@ -39,8 +39,7 @@ validate_connection_section()
 		'host:string:"usp-controller.com"' \
 		'username:string:username' \
 		'password:string:password' \
-		'encryption:bool:true' \
-		'interface:string:wan'
+		'encryption:bool:true'
 }

 configure_controller() {
@@ -66,22 +65,12 @@ configure_mtp() {
 }

 configure_connection() {
-	local host username password encryption interface
+	local host username password encryption

 	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}
@@ -92,11 +81,14 @@ 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}
@@ -118,3 +110,4 @@ reload_service() {
 service_triggers() {
 	procd_add_config_trigger "config.change" "obuspa"  /etc/init.d/obuspa restart
 }
+
--- a/tr098/Config.in
+++ b/tr098/Config.in
@@ -1,11 +0,0 @@
-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
--- a/tr098/Makefile
+++ b/tr098/Makefile
@@ -1,71 +0,0 @@
-#
-# 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))
--- a/uspd/Makefile
+++ b/uspd/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=uspd
 PKG_VERSION:=1.0.3

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=19ac73922e57d10c13e1bc2eb5ac653953804087
+PKG_SOURCE_VERSION:=eeb458e2f5b309ec9290388863d73d8bdf176484
 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 +libbbfdm
+  DEPENDS:=+libubox +ubus +icwmp-curl
 endef

 define Package/uspd/description