Rename auto_feeds_conf to auto_feeds_conf.sh

Create iop plugin auto_feeds_conf
Update feed [ iopsys ] package [ imonitor ]
2025-12-29 15:49:30 +08:00 · 2019-08-21 13:23:31 +02:00 · 2019-08-20 16:34:07 +02:00 · 2019-05-23 15:05:57 +02:00 · 2019-05-23 14:12:00 +02:00
12 changed files with 29 additions and 91 deletions
--- a/easy-soc-libs/Makefile
+++ b/easy-soc-libs/Makefile
@@ -9,7 +9,7 @@ PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1a0785622639938e6587961c17a4317b856dfc00
+PKG_SOURCE_VERSION:=6a311af7cd17fc410c27de3cfae33b658195fd0b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>

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

 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-04-25
+PKG_VERSION:=4.0-2019-04-01
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5f69d0a9034b053512cb41ea72b98cbff7320cad
+PKG_SOURCE_VERSION:=7faa875dcb825869c6bd942e140d2200e5e0dc0e
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/icwmp/README
+++ b/icwmp/README
@@ -9,7 +9,7 @@
 	- libz.so
 	- libcrypto.so
 	the librairies should be present in the "staging_dir/target-i386_uClibc-0.9.30.1/usr/lib/"  or "staging_dir/toolchain-mips_gcc-4.3.3+cs_uClibc-0.9.30.1/usr/lib"
-	
+
 	header files and folders:
 	- expat.h
 	- expat_external.h
@@ -33,7 +33,7 @@ this software is composed of 3 packages:
 - cwmp kernel package: contains cwmp kernel module. This module could be used by other kernel modules to notify the icwmpd daemon  when kernel parameter changes

 The three packages should be selected in the make menu config in order to get the three packages compiled.
-To compile the three packages: $ make package/cwmpd/compile 
+To compile the three packages: $ make package/cwmpd/compile

 3) OpenWRT settings
 in the  OpenWRT, Add the following lines in the /usr/share/udhcpc/default.script file:
@@ -49,7 +49,7 @@ in the  OpenWRT, Add the following lines in the /usr/share/udhcpc/default.script
 	- libopenssl package should be installed
 	- libz package should be installed
 	- libcrypto package should be installed
-    
+
    Configure the acs url in the /etc/config/icwmp
    and then start the cwmpd service: /etc/init.d/icwmpd start
    for the help: /etc/init.d/icwmpd
--- a/imonitor/Makefile
+++ b/imonitor/Makefile
@@ -12,7 +12,7 @@ PKG_INSTALL:=1

 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
-PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
+PKG_SOURCE_VERSION:=cea60630cfac1d3c70f486acea6663d339b7d444
 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>
--- a/iop/config
+++ b/iop/config
@@ -155,7 +155,7 @@ CONFIG_PACKAGE_wifimngr=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
-CONFIG_TARGET_CUSTOMER="IOPSYS"
+CONFIG_TARGET_CUSTOMER="INT"
 CONFIG_TARGET_ROOTFS_TARGZ=y
 # CONFIG_USE_SSTRIP is not set
 CONFIG_USE_STRIP=y
--- a/iop/scripts/auto_feeds_conf.sh
+++ b/iop/scripts/auto_feeds_conf.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+declare -a feed_list
+function list_feeds {
+    jq '.feed[] | .name' feeds.conf
+}
+
+# Exported interface
+function auto_feeds_conf {
+    echo "Function auto feeds conf"
+    echo "feed list:"
+    list_feeds
+}
+
+register_command "auto_feeds_conf" "Automatically update feeds"
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -176,7 +176,7 @@ function genconfig {

 	setup_dirs()
 	{
-		if ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null  | git ls-remote $CUSTREPO -q 2>/dev/null; then
+		if ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null  | grep -qw ${CUSTREPO:22}; then
 			if [ ! -d "$CUSTPATH" ]; then
 				git clone "$CUSTREPO" "$CUSTPATH"
 			elif [ $IMPORT -eq 1 ]; then
--- a/netmode/files/usr/libexec/rpcd/repeater
+++ b/netmode/files/usr/libexec/rpcd/repeater
@@ -3,10 +3,6 @@
 . /usr/share/libubox/jshn.sh
 . /lib/functions.sh

-WIFISTA=0
-STACONF="/etc/Wireless/iNIC/iNIC_ap.dat"
-[ -f $STACONF ] && WIFISTA=1
-
 get_if_creds() {
 	local section=$1
 	local network=$2
@@ -88,22 +84,9 @@ duplicate_if_single_radio() {
 	done
 }

-get_wifi_iface_cfgstr() {
-	get_cfgno() {
-		config_get ifname "$1" ifname
-		[ "$ifname" == "$2" ] && echo "wireless.$1"
-	}
-	config_load wireless
-	config_foreach get_cfgno wifi-iface $1
-}
-
 case "$1" in
 	list)
-		if [ $WIFISTA -eq 1 ]; then
-			echo '{ "get_creds": { "network": "str", "file": "str" }, "set_creds": { "file": "str", "from_gui": "str" }, "connect": { "ssid": "str", "key": "str" }, "forget_network": {} }'
-		else
-			echo '{ "get_creds": { "network": "str", "file": "str" }, "set_creds": { "file": "str", "from_gui": "str" } }'
-		fi
+		echo '{ "get_creds": { "network": "str", "file": "str" }, "set_creds": { "file": "str", "from_gui": "str" } }'
 	;;
 	call)
 		case "$2" in
@@ -153,64 +136,6 @@ case "$1" in
 				json_dump

 			;;
-			connect)
-				local ssid key enc auth wetif wetcfg wetssid wetkey code
-				read input
-				json_load "$input"
-				json_get_var ssid ssid
-				json_get_var key key
-				code=1
-				[ $WIFISTA -eq 1 ] && wetif="$(uci -q get wireless.$(uci show wireless | grep 'mode=.*wet.*' | cut -d'.' -f2 | head -1).ifname)"
-				if [ -s /sys/class/net/$wetif/operstate ]; then
-					wetcfg="$(get_wifi_iface_cfgstr $wetif)"
-					wetssid="$(uci -q get $wetcfg.ssid)"
-					wetkey="$(uci -q get $wetcfg.key)"
-					ssid="${ssid:-$wetssid}"
-					key="${key:-$wetkey}"
-					if [ -n "$key" ]; then
-						auth="WPA2PSK"
-						enc="AES"
-					else
-						auth="OPEN"
-						enc="NONE"
-					fi
-					iwpriv $wetif set ApCliEnable=0
-					iwpriv $wetif set ApCliSsid="$ssid"
-					iwpriv $wetif set ApCliAuthMode="$auth"
-					iwpriv $wetif set ApCliEncrypType="$enc"
-					iwpriv $wetif set ApCliWPAPSK="$key"
-					iwpriv $wetif set ApCliEnable=1
-					iwpriv $wetif set ApCliAutoConnect=1
-					code=0
-				fi
-				json_init
-				json_add_int "code" $code
-				json_dump
-			;;
-			forget_network)
-				local wetif wetcfg code
-				code=1
-				[ $WIFISTA -eq 1 ] && wetif="$(uci -q get wireless.$(uci show wireless | grep 'mode=.*wet.*' | cut -d'.' -f2 | head -1).ifname)"
-				if [ -s /sys/class/net/$wetif/operstate ]; then
-					wetcfg="$(get_wifi_iface_cfgstr $wetif)"
-					uci -q set $wetcfg.ssid=""
-					uci -q set $wetcfg.key=""
-					uci -q commit wireless
-
-					sed -i "s/ApCliSsid=.*/ApCliSsid=/g" $STACONF
-					sed -i "s/ApCliAuthMode=.*/ApCliAuthMode=/g" $STACONF
-					sed -i "s/ApCliEncrypType=.*/ApCliEncrypType=/g" $STACONF
-					sed -i "s/ApCliWPAPSK=.*/ApCliWPAPSK=/g" $STACONF
-
-					ifconfig $wetif down
-					ifconfig $wetif up
-
-					code=0
-				fi
-				json_init
-				json_add_int "code" $code
-				json_dump
-			;;
 		esac
 	;;
 esac
--- a/owsd/Makefile
+++ b/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:=c20818beea7ae114c9201d69f701b712d94d75f2
+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>
--- a/wifilife/Makefile
+++ b/wifilife/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wifilife
-PKG_VERSION:=1.4.2
+PKG_VERSION:=1.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=57c17d9c28081f50837dfd14d0376d0aa0f9bd7e
+PKG_SOURCE_VERSION:=9a75b717d3cd95d88e394f5bcd8b4006dfa450ba
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

 ifeq ($(CONFIG_WIFILIFE_OPEN),y)
--- a/wifilife/files/wifilife.init
+++ b/wifilife/files/wifilife.init
@@ -9,8 +9,6 @@ EXTRA_COMMANDS="enable_check"


 start_service() {
-	[ "$(uci -q get wifilife.@wifilife[0].enabled)" == "0" ] && return
-
 	procd_open_instance
 	procd_set_param command ${PROG} -d -l -f -o /tmp/wifiagent.log
 	procd_set_param respawn
--- a/wifimngr/Makefile
+++ b/wifimngr/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=wifimngr
 PKG_VERSION:=1.0.2

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9667ad3aba3f1e9dad597d3644c9701f9e8d834a
+PKG_SOURCE_VERSION:=c7228ea031f407580ff8e4801e0ba544aeadd050
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
Author	SHA1	Message	Date
Philippe Blavier	70f0315d8d	Rename auto_feeds_conf to auto_feeds_conf.sh	2019-08-21 13:23:31 +02:00
Philippe Blavier	f3f3f69789	Create iop plugin auto_feeds_conf	2019-08-20 16:34:07 +02:00
Philippe Blavier	cf2c8972b3	Update feed [ iopsys ] package [ imonitor ] ------------------------------------------------------------------------------- * cea6063 Update copyright year ------------------------------------------------------------------------------- commit cea60630cfac1d3c70f486acea6663d339b7d444 Author: Philippe Blavier <philippe@southpole.se> Date: 2019-05-23 15:03:28 +0200 Update copyright year Base directory -> / src/main.c \| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -------------------------------------------------------------------------------	2019-05-23 15:05:57 +02:00
Philippe Blavier	5d8dcb76df	Remove trailing white spaces	2019-05-23 14:12:00 +02:00