questd: fix makefile

This reverts commit a2aa796cda.

easy-soc-libs/Makefile

@@ -9,7 +9,7 @@ PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7f884592aa42cc627542589d5b77cf4a50567536
+PKG_SOURCE_VERSION:=87ad01a06b7898ae45e94444e0caa7e2cc264cc8
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
 
@@ -60,9 +60,9 @@ else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
   TARGET_PLATFORM=MARVELL
   TARGET_CFLAGS +=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_lantiq_xrx500),y)
-  TARGET_PLATFORM=LANTIQ
-  TARGET_CFLAGS +=-DIOPSYS_LANTIQ
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+  TARGET_PLATFORM=INTEL
+  TARGET_CFLAGS +=-DIOPSYS_INTEL
 else
   $(info (UNEXPECTED CONFIG TARGET))
 endif

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-01-17
+PKG_VERSION:=4.0-2019-01-28
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=88edf3d3c6d6d115425f312e36cbb731cd8fe863
+PKG_SOURCE_VERSION:=e00dfdf152a85035d411332b7a81d31853dbe61d
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

iop/configs/luci.diff

@@ -1,38 +0,0 @@
-CONFIG_PACKAGE_luci=y
-CONFIG_PACKAGE_luci-mod-admin-core=y
-CONFIG_PACKAGE_luci-mod-admin-full=y
-CONFIG_PACKAGE_luci-app-ddns=y
-CONFIG_PACKAGE_luci-app-dslstats=y
-CONFIG_PACKAGE_luci-app-firewall=y
-CONFIG_PACKAGE_luci-app-iup=y
-CONFIG_PACKAGE_luci-app-mcpd=y
-CONFIG_PACKAGE_luci-app-minidlna=y
-CONFIG_PACKAGE_luci-app-multiwan=y
-CONFIG_PACKAGE_luci-app-p910nd=y
-CONFIG_PACKAGE_luci-app-parental-control=y
-CONFIG_PACKAGE_luci-app-port-management=y
-CONFIG_PACKAGE_luci-app-power-mgmt=y
-CONFIG_PACKAGE_luci-app-samba=y
-CONFIG_PACKAGE_luci-app-sfp=y
-CONFIG_PACKAGE_luci-app-snmp=y
-CONFIG_PACKAGE_luci-app-speedtest=y
-CONFIG_PACKAGE_luci-app-upnp=y
-CONFIG_PACKAGE_luci-app-voice=y
-CONFIG_PACKAGE_luci-theme-base=y
-CONFIG_PACKAGE_luci-theme-bootstrap=y
-CONFIG_PACKAGE_luci-i18n-english=y
-CONFIG_PACKAGE_luci-proto-3g=y
-CONFIG_PACKAGE_luci-proto-4g=y
-CONFIG_PACKAGE_luci-proto-core=y
-CONFIG_PACKAGE_luci-proto-ipv6=y
-CONFIG_PACKAGE_luci-proto-ppp=y
-CONFIG_PACKAGE_luci-sgi-cgi=y
-CONFIG_PACKAGE_luci-lib-core=y
-CONFIG_PACKAGE_luci-lib-core_source=y
-CONFIG_PACKAGE_luci-lib-ipkg=y
-CONFIG_PACKAGE_luci-lib-json=y
-CONFIG_PACKAGE_luci-lib-nixio=y
-CONFIG_PACKAGE_luci-lib-nixio_notls=y
-CONFIG_PACKAGE_luci-lib-sys=y
-CONFIG_PACKAGE_luci-lib-web=y
-

iop/configs/target/intel_mips/config

@@ -1,97 +0,0 @@
-# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
-CONFIG_GCC_VERSION="6.3.0"
-CONFIG_TOOLCHAINOPTS=y
-# CONFIG_BINUTILS_USE_VERSION_2_27 is not set
-CONFIG_BINUTILS_USE_VERSION_2_28=y
-# CONFIG_BINUTILS_USE_VERSION_2_29_1 is not set
-# CONFIG_GCC_USE_GRAPHITE is not set
-# CONFIG_GCC_USE_VERSION_5 is not set
-CONFIG_GCC_USE_VERSION_6=y
-# CONFIG_GCC_USE_VERSION_7 is not set
-# CONFIG_LIBC_USE_GLIBC is not set
-CONFIG_LIBC_USE_MUSL=y
-
-
-# CONFIG_PACKAGE_ppp-mod-pppoa is not set
-
-#################### switch related
-CONFIG_PACKAGE_switch_cli_ugw8=y
-
-#################### ppa related
-#CONFIG_PACKAGE_ppacmd=y
-# CONFIG_PACKAGE_kmod-ppa-drv-gre is not set
-# CONFIG_PACKAGE_kmod-ppa-drv-grx500-eth-bond is not set
-# CONFIG_PACKAGE_kmod-ppa-drv-grx500-mpe is not set
-# CONFIG_PACKAGE_kmod-ppa-drv-mpe-ip97 is not set
-CONFIG_PACKAGE_mcast-pa=y
-
-#################### DSL related
-CONFIG_PACKAGE_dsl-cpe-control-vrx=y
-CONFIG_dsl-cpe-mei-vrx_DEVICE_VR11=y
-CONFIG_dsl-cpe-mei-vrx_IRQ_POLLING_ACTIVE=y
-CONFIG_PACKAGE_kmod-dsl-cpe-mei-vrx=y
-CONFIG_PACKAGE_ifxos=y
-CONFIG_PACKAGE_kmod-directconnect-dp=y
-CONFIG_PACKAGE_kmod-vrx518_tc_drv=y
-CONFIG_PACKAGE_vrx518_aca_fw=y
-CONFIG_PACKAGE_vrx518_ppe_fw=y
-CONFIG_dsl-cpe-api-vrx_MODEL_DEBUG=y
-CONFIG_dsl-cpe-control-vrx_DTI=y
-CONFIG_dsl-cpe-control-vrx_MODEL_DEBUG=y
-# yes intel dsl script need this.
-CONFIG_BUSYBOX_CONFIG_USLEEP=y
-#################### DSL related end
-
-#################### WIFI related
-CONFIG_PACKAGE_kmod-lantiq-wlan-wave-support_5_x=y
-CONFIG_PACKAGE_ltq-wlan-wave_5_x=y
-CONFIG_FEATURE_LTQ_WAVE_500_PCIE=y
-# CONFIG_FEATURE_LTQ_WAVE_500 is not set
-CONFIG_FEATURE_LTQ_WAVE_AR10_SUPPORT=y
-# CONFIG_FEATURE_LTQ_WAVE_STA is not set
-# CONFIG_FEATURE_LTQ_WAVE_DEBUG_TFTP_BINS is not set
-# CONFIG_FEATURE_LTQ_WAVE_FGPA_DUMMY_PHY is not set
-CONFIG_FEATURE_LTQ_WAVE_500B=y
-# WifiLife not yet available for Intel
-CONFIG_PACKAGE_juci-wifilife=n
-CONFIG_PACKAGE_wifilife=n
-####################
-
-#################### VoIP related
-CONFIG_PACKAGE_ltq-voice-tapi=y
-CONFIG_PACKAGE_ltq-voice-vmmc-xrx500=y
-CONFIG_PACKAGE_asterisk13=y
-CONFIG_PACKAGE_asterisk13-app-confbridge=y
-CONFIG_PACKAGE_asterisk13-app-playtones=y
-CONFIG_PACKAGE_asterisk13-app-read=y
-CONFIG_PACKAGE_asterisk13-app-record=y
-CONFIG_PACKAGE_asterisk13-app-system=y
-CONFIG_PACKAGE_asterisk13-bridge-builtin-features=y
-CONFIG_PACKAGE_asterisk13-bridge-simple=y
-CONFIG_PACKAGE_asterisk13-bridge-softmix=y
-CONFIG_PACKAGE_asterisk13-cdr=y
-CONFIG_PACKAGE_asterisk13-cdr-csv=y
-CONFIG_PACKAGE_asterisk13-chan-lantiq=y
-CONFIG_PACKAGE_asterisk13-chan-sip=y
-CONFIG_PACKAGE_asterisk13-format-g726=y
-CONFIG_PACKAGE_asterisk13-format-g729=y
-CONFIG_PACKAGE_asterisk13-format-gsm=y
-CONFIG_PACKAGE_asterisk13-format-sln=y
-CONFIG_PACKAGE_asterisk13-func-channel=y
-CONFIG_PACKAGE_asterisk13-func-db=y
-CONFIG_PACKAGE_asterisk13-func-shell=y
-CONFIG_PACKAGE_asterisk13-pbx-spool=y
-CONFIG_PACKAGE_asterisk13-res-musiconhold=y
-CONFIG_PACKAGE_asterisk13-res-rtp-asterisk=y
-CONFIG_PACKAGE_asterisk13-sounds=y
-CONFIG_PACKAGE_voice-client=y
-#################### VoIP related end
-
-# the options below this point is wrong but packages wont compile
-
-# CONFIG_PACKAGE_libcgroup is not set
-# CONFIG_PACKAGE_libcgroup-daemon is not set
-
-# CONFIG_TARGET_ROOTFS_INITRAMFS is not set
-# CONFIG_TARGET_ROOTFS_SQUASHFS is not set
-

iop/configs/target/intel_mips/easy550/config

@@ -1,2 +0,0 @@
-CONFIG_LTQ_VOICE_VMMC_WITH_SLIC100=n
-CONFIG_LTQ_VOICE_VMMC_WITH_SLIC200=y

iop/configs/target/intel_mips/speedport_smart3/config

@@ -1,3 +0,0 @@
-# temporary solution for kernel
-CONFIG_KERNEL_GIT_BRANCH="speedport_smart3"
-CONFIG_KERNEL_GIT_COMMIT="fef58dd6628c4b8b9c921fae473874fcda6361bf"

iop/configs/target/iopsys_brcm63xx_arm/config

@@ -1,15 +0,0 @@
-# CONFIG_PACKAGE_libcgroup-daemon is not set
-# CONFIG_PACKAGE_libcgroup is not set
-
-# CONFIG_PACKAGE_juci-broadcom-wl is not set
-# CONFIG_PACKAGE_juci-minisnmpd is not set
-# CONFIG_PACKAGE_juci-router-openwrt is not set
-# CONFIG_PACKAGE_speedsvc is not set
-
-# CONFIG_juci_broadcom_wl is not set
-# CONFIG_juci_minisnmpd is not set
-# CONFIG_juci_router_openwrt is not set
-
-# CONFIG_PACKAGE_brcminfo is not set
-CONFIG_PACKAGE_brcm_fw_tool=y
-

iop/configs/target/iopsys_brcm63xx_arm/dg400/config

@@ -1,4 +0,0 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-

iop/configs/target/iopsys_brcm63xx_arm/dg400prime/config

@@ -1,4 +0,0 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-

iop/configs/target/iopsys_brcm63xx_arm/eg400/config

@@ -1,7 +0,0 @@
-CONFIG_BCM_I2C=y
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-
-CONFIG_TARGET_NO_DSL=y
-

iop/configs/target/iopsys_brcm63xx_arm/f104/config

@@ -1,6 +0,0 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-
-CONFIG_USE_DSL=y
-CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/f104w/config

@@ -1,6 +0,0 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-
-CONFIG_USE_DSL=y
-CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/sdx810_rg/config

@@ -1,5 +0,0 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-
-CONFIG_TARGET_NO_DSL=y

iop/configs/target/iopsys_brcm63xx_mips/cg300/config

@@ -1,3 +0,0 @@
-CONFIG_TARGET_NO_DSL=y
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_brcm63xx_mips/config

@@ -1,15 +0,0 @@
-# CONFIG_PACKAGE_libcgroup-daemon is not set
-# CONFIG_PACKAGE_libcgroup is not set
-
-# CONFIG_PACKAGE_juci-broadcom-wl is not set
-# CONFIG_PACKAGE_juci-minisnmpd is not set
-# CONFIG_PACKAGE_juci-router-openwrt is not set
-# CONFIG_PACKAGE_speedsvc is not set
-
-# CONFIG_juci_broadcom_wl is not set
-# CONFIG_juci_minisnmpd is not set
-# CONFIG_juci_router_openwrt is not set
-
-# CONFIG_PACKAGE_brcminfo is not set
-CONFIG_PACKAGE_brcm_fw_tool=y
-

iop/configs/target/iopsys_brcm63xx_mips/dg200/config

@@ -1,3 +0,0 @@
-CONFIG_BCM_I2C=y
-CONFIG_TARGET_NO_DECT=y
-

iop/configs/target/iopsys_brcm63xx_mips/dg200al/config

@@ -1,3 +0,0 @@
-CONFIG_TARGET_NO_VOICE=y
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_brcm63xx_mips/dg301/config

@@ -1,2 +0,0 @@
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_brcm63xx_mips/dg301al/config

@@ -1,3 +0,0 @@
-CONFIG_TARGET_NO_VOICE=y
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_brcm63xx_mips/eg200/config

@@ -1,5 +0,0 @@
-CONFIG_BCM_I2C=y
-CONFIG_TARGET_NO_DECT=y
-CONFIG_TARGET_NO_DSL=y
-CONFIG_BCM_ENDPOINT_MODULE=y
-

iop/configs/target/iopsys_brcm63xx_mips/eg300/config

@@ -1,3 +0,0 @@
-CONFIG_TARGET_NO_DSL=y
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_brcm63xx_mips/vg50/config

@@ -1,4 +0,0 @@
-CONFIG_TARGET_NO_DHD=y
-CONFIG_TARGET_NO_VOICE=y
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_ramips/config

@@ -1,14 +0,0 @@
-# CONFIG_PACKAGE_libcgroup-daemon is not set
-# CONFIG_PACKAGE_libcgroup is not set
-# CONFIG_PACKAGE_power-management is not set
-# CONFIG_PACKAGE_qos-scripts is not set
-# CONFIG_PACKAGE_mtd-utils-deubinize is not set
-# CONFIG_PACKAGE_mtd-utils-imagewrite is not set
-# CONFIG_PACKAGE_mtd-utils-mkfs.jffs2 is not set
-# CONFIG_PACKAGE_mtd-utils-nanddump is not set
-CONFIG_PACKAGE_mtd-utils-nandwrite=y
-CONFIG_PACKAGE_mtk-bndstrg=y
-CONFIG_PACKAGE_igmpproxy=y
-CONFIG_PACKAGE_kmod-nf-nathelper=y
-CONFIG_PACKAGE_kmod-nf-nathelper-extra=y
-# CONFIG_PACKAGE_endptmngr is not set

iop/scripts/genconfig.sh

@@ -7,7 +7,7 @@ function genconfig {
 	export FILEDIR="files/"
 	export THEMEDIR="themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/iopsys/iop/configs"
+	export CONFIGPATH="package/feeds/iopsys/iop"
 	CUSTPATH="customerconfigs"
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
@@ -15,17 +15,16 @@ function genconfig {
 	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
 
 	target="bogus"
-	masterconfig=1
+	config_path=""
 
 	# Takes a board name and returns the target name in global var $target
 	set_target() {
 	    local profile=$1
 
-	    local iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02 eg200"
-	    local iopsys_brcm63xx_arm="dg400 eg400 sdx810_rg f104w f104 dg400prime dg400primeb 963138REF_P502"
-	    local iopsys_ramips="ex400 sdx810_ap"
-	    local intel_mips="easy550 easy350 norrland speedport_smart3"
-	    local ramips="mt7621"
+	    local iopsys_brcm63xx_mips=$(cd target/linux/iopsys-brcm63xx-mips; ./genconfig)
+	    local iopsys_brcm63xx_arm=$(cd target/linux/iopsys-brcm63xx-arm; ./genconfig)
+	    local iopsys_ramips=$(cd target/linux/iopsys-ramips; ./genconfig)
+	    local intel_mips=$(cd target/linux/intel_mips; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]
 	    then
@@ -39,13 +38,13 @@ function genconfig {
 		done
 		return
 	    fi
-	    
-	    
+
 	    local targets
 
 	    for p in $iopsys_brcm63xx_mips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_mips"
+			config_path="target/linux/iopsys-brcm63xx-mips/config"
 		    return
 		fi
 	    done
@@ -53,6 +52,7 @@ function genconfig {
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
+			config_path="target/linux/iopsys-brcm63xx-arm/config"
 		    return
 		fi
 	    done
@@ -60,14 +60,7 @@ function genconfig {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-		    return
-		fi
-	    done
-
-	    for p in $ramips; do
-		if [ $p == $profile ]; then
-		    target="ramips"
-		    masterconfig=0
+			config_path="target/linux/iopsys-ramips/config"
 		    return
 		fi
 	    done
@@ -75,6 +68,7 @@ function genconfig {
 	    for p in $intel_mips; do
 		if [ $p == $profile ]; then
 		    target="intel_mips"
+			config_path="target/linux/intel_mips/config"
 		    return
 		fi
 	    done
@@ -115,12 +109,11 @@ function genconfig {
 		echo -e "  -c|--clean\tRemove all files under ./files and import from config "
 		echo -e "  -v|--verbose\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
-		echo -e "  -p|--profile\tSet profile (if exists) default juci"
 		echo -e "  -s|--override\tEnable 'Package source tree override'"
 		echo -e "  -h|--help\tShow this message"
 		echo -e "  -l|--list [customer]\tList all Customers or all boards for one customer"
 		echo -e "  -a|--list-all\tList all Customers and their board types"
-		echo -e "  -b|--boards\tList all board types"		
+		echo -e "  -b|--boards\tList all board types"
 		echo
 		echo "Example ./iop genconfig vg50 TELIA"
 		echo "(if no customerconfig is chosen the Inteno Config will be used)"
@@ -239,40 +232,17 @@ function genconfig {
 		fi
 
 		# Generate base config
-		# Used only for iopsys targets, not openwrt targets
 		rm -f .config
-		if [ $masterconfig -eq 1 ]; then
-			v "Config $BOARDTYPE selected"
-			v "cp $CONFIGPATH/config .config"
-			cp $CONFIGPATH/config .config
-		fi
+		v "Config $BOARDTYPE selected"
+		v "cp $CONFIGPATH/config .config"
+		cp $CONFIGPATH/config .config
 
-		# Add target (soc/board specific )
-		if [ -f $CONFIGPATH/target/config ]; then
-		    cat $CONFIGPATH/target/config >> .config
+		if [ -f $config_path/config ]; then
+		    cat $config_path/config >> .config
 		fi
-		if [ -f $CONFIGPATH/target/$target/config ]; then
-		    cat $CONFIGPATH/target/$target/config >> .config
+		if [ -f $config_path/$BOARDTYPE/config ]; then
+		    cat $config_path/$BOARDTYPE/config >> .config
 		fi
-		if [ -f $CONFIGPATH/target/$target/$BOARDTYPE/config ]; then
-		    cat $CONFIGPATH/target/$target/$BOARDTYPE/config >> .config
-		fi
-
-		# Apply profile diff to master config if selected
-		if [ -n "$PROFILE" ]; then
-			if [ -e "$CONFIGPATH/$PROFILE.diff" ]; then
-				cat $CONFIGPATH/$PROFILE.diff >> .config
-			elif [ "$PROFILE" == "juci" ]; then
-				v "Default profile (juci) is selected."
-			else
-				echo "ERROR: profile $PROFILE does not exist!"
-				exit 1
-			fi
-		else
-			v "No profile selected! Using default."
-		fi
-
-		# Set target and profile
 
 		#special handling for intel_mips which use TARGET_DEVICES
 		if [ "$target" = "intel_mips" ]; then
@@ -356,20 +326,11 @@ function genconfig {
 		# currently boardparms.c and boardparms_voice.c is the only place that is depending on inteno boardid name
 		# so just touch that file.
 		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
-				
+
 		# Set default values based on selected parameters
 		v "$(make defconfig 2>&1)"
 
-		# Temporary fixup for juci/luci profile
-		if [ "$PROFILE" == "luci" ]; then
-			sed -i '/CONFIG_DEFAULT_juci/d' .config
-			sed -i '/CONFIG_PACKAGE_juci/d' .config
-			sed -i '/CONFIG_PACKAGE_uhttpd/d' .config
-		fi
-
-		if [ $masterconfig -eq 1 ]; then
-			echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
-		fi
+		echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
 
 		# Clean base-file package to force rebuild when changing profile
 		v "$(make package/base-files/clean 2>&1)"

mqtt-ciotc/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mqtt-ciotc
 PKG_VERSION:=0.1
 
-PKG_SOURCE_VERSION:=eda5bc711c215cbfe50ddd0e8725b69d4a3cff4f
+PKG_SOURCE_VERSION:=00da3fb1f1691d836037dc4d93e38d0835ba46a4
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifilife-testbed.git
 
@@ -29,6 +29,7 @@ define Package/mqtt-ciotc/description
 endef
 
 define Package/mqtt-ciotc/install
+	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mqtt_ciotc $(1)/sbin/
 endef

mqtt-ciotc/files/etc/config/mqtt-ciotc

@@ -1,3 +0,0 @@
-config mqtt-ciotc mqtt-ciotc
-	option private-cert '/etc/mqtt-ciotc/rsa_private.pem'
-	option root-cert '/etc/mqtt-ciotc/roots.pem'

mqtt-ciotc/files/etc/config/mqtt_ciotc

@@ -0,0 +1,3 @@
+config certs 'certs'
+	option private '/etc/mqtt-ciotc/rsa_private.pem'
+	option root '/etc/mqtt-ciotc/roots.pem'

mqtt-ciotc/files/etc/init.d/mqtt-ciotc

@@ -1,35 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=96
-STOP=10
-PROG=/sbin/mqtt-ciotc
-
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-	procd_set_param command ${PROG}
-	config_load mqtt-ciotc
-	config_get private-cert mqtt-ciotc private-cert
-	config_get root-cert mqtt-ciotc root-cert
-
-	[ -n $private-cert ] && procd_append_param command --private-cert $private-cert
-	[ -n $root-cert ] && procd_append_param command --root-cert $root-cert
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop_service()
-{
-	service_stop ${PROG}
-}
-
-reload_service() {
-#	procd_send_signal wifilife # use SIGHUP
-	stop
-	start
-}
-
-service_triggers() {
-        procd_add_reload_trigger "mqtt-ciotc"
-}

mqtt-ciotc/files/etc/init.d/mqtt_ciotc

@@ -0,0 +1,35 @@
+#!/bin/sh /etc/rc.common
+
+START=96
+STOP=10
+PROG=/sbin/mqtt_ciotc
+
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+	config_load mqtt_ciotc
+	config_get private certs private
+	config_get root certs root
+
+	[ -n $private ] && procd_append_param command --private-cert $private
+	[ -n $root ] && procd_append_param command --root-cert $root
+	procd_set_param respawn
+	procd_close_instance
+}
+
+stop_service()
+{
+	service_stop ${PROG}
+}
+
+reload_service() {
+#	procd_send_signal wifilife # use SIGHUP
+	stop
+	start
+}
+
+service_triggers() {
+        procd_add_reload_trigger "mqtt_ciotc"
+}

netmode/Makefile

@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=netmode
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=278605190c77695edb0d67b970b691cba0a1e75a
+PKG_SOURCE_VERSION:=39998ad3e859a790cadcd921ff1c0e2d125528f5
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
 

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:=541e0b5ff85395799c3b27c513172db2592935bb
+PKG_SOURCE_VERSION:=f0eedeb6fd061edf3784d6bf86fa60b176bf3fe7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=0ee8f66b6ac1a87687b8a1e5fcd6694e2f9d8cae
+PKG_SOURCE_VERSION:=dfbb6b5bb496ed4dda569c836a74e1993dc72501
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 
@@ -26,8 +26,7 @@ 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_BROADCOM
+QUESTD_TARGET:=-DIOPSYS_INTEL
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 QUESTD_TARGET:=-DIOPSYS_MEDIATEK
 QUESTD_CFLAGS:=\
@@ -44,7 +43,7 @@ export QUESTD_CFLAGS
 
 define Package/questd
 	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +ubus +libpthread +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_ramips:libnl-tiny +libopenssl
+	DEPENDS:=+libuci +libubox +ubus +libpthread +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_ramips:libnl-tiny +libopenssl +TARGET_intel_mips:iwinfo_wave
 	TITLE:=router info daemon
 endef
 
@@ -53,15 +52,21 @@ define Package/questd/description
 	this information via ubus
 endef
 
+ifeq ($(CONFIG_TARGET_intel_mips),y)
+define Build/Configure
+	cp $(PKG_BUILD_DIR)/intel/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 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)/wificontrol $(1)/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/graphd $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uproxyd $(1)/sbin/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netcheck $(1)/usr/bin/
+	#$(INSTALL_BIN) $(PKG_BUILD_DIR)/uproxyd $(1)/sbin/
+	#$(INSTALL_DIR) $(1)/usr/bin
+	#$(INSTALL_BIN) $(PKG_BUILD_DIR)/netcheck $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,questd))

uboot/Makefile

@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 
 ifdef CONFIG_TARGET_intel_mips
 PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/uboot.git
-PKG_SOURCE_VERSION:=34dbb562011f85227b541d2b9b6f9f36b62ec692
+PKG_SOURCE_VERSION:=a6292375108a6d5f200f234f5eef3fe17f427092
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_VERSION:=3ef2ba866a99205496e0ce01935c89a1778d9b85