From 50e53a5b15a0bd12fc6cfddd4fb1a0d381284201 Mon Sep 17 00:00:00 2001 From: Jakob Olsson Date: Wed, 18 Sep 2024 11:14:00 +0200 Subject: [PATCH 01/21] Revert "mapagent: qualcomm: disable hidden bh" This reverts commit 5fd9145a277be5775bfab62c04200dc6d4ec9910. --- map-agent/files/lib/multiap/map_genconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/map-agent/files/lib/multiap/map_genconfig b/map-agent/files/lib/multiap/map_genconfig index d8d02f3c2..eed0296a2 100644 --- a/map-agent/files/lib/multiap/map_genconfig +++ b/map-agent/files/lib/multiap/map_genconfig @@ -90,7 +90,6 @@ generate_multiap_config() { # Disable for MLD/MLO uci set mapagent.agent.island_prevention="0" - uci set mapagent.agent.hide_backhaul_bss="0" uci commit mapagent } else From aec10de11f7d23205f88dd3fcf8fda6781bb24df Mon Sep 17 00:00:00 2001 From: Jakob Olsson Date: Wed, 18 Sep 2024 12:41:14 +0200 Subject: [PATCH 02/21] map-agent: 6.2.0.1 --- map-agent/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/map-agent/Makefile b/map-agent/Makefile index dfa4e3a0f..25073cbf8 100644 --- a/map-agent/Makefile +++ b/map-agent/Makefile @@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=map-agent -PKG_VERSION:=6.2.0.0 +PKG_VERSION:=6.2.0.1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=187c39efe41dfcab6d9351841b9bebb45b318430 +PKG_SOURCE_VERSION:=d6cba9f1d50f4220da57c14f0fc0fa05e9322ff6 PKG_MAINTAINER:=Jakob Olsson PKG_LICENSE:=BSD-3-Clause From 2abd075e59b34233668b5d36a6b9afe02eb3bde8 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Wed, 18 Sep 2024 18:57:43 +0530 Subject: [PATCH 03/21] obuspa: Fix probable segfault --- obuspa/Makefile | 4 ++-- obuspa/files/etc/config/obuspa | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/obuspa/Makefile b/obuspa/Makefile index aa0618e9e..8764aa756 100644 --- a/obuspa/Makefile +++ b/obuspa/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=obuspa -PKG_VERSION:=8.0.8.6 +PKG_VERSION:=8.0.8.7 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git -PKG_SOURCE_VERSION:=0eaf2364f13c71dad053a90eacba77830f724ca3 +PKG_SOURCE_VERSION:=5ed4564c606e28aa995da1a39c85389707d73ab2 PKG_MAINTAINER:=Vivek Dutta PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip diff --git a/obuspa/files/etc/config/obuspa b/obuspa/files/etc/config/obuspa index 14e01c1f6..bc3f6844e 100644 --- a/obuspa/files/etc/config/obuspa +++ b/obuspa/files/etc/config/obuspa @@ -2,7 +2,7 @@ config obuspa 'global' option enabled '1' option debug '1' option dhcp_discovery '1' - option log_level '2' + option log_level '3' option prototrace '0' option db_file '/etc/obuspa/usp.db' option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json' From 4a30355aab7e976c9519eddd9a9387e9d36e3f84 Mon Sep 17 00:00:00 2001 From: Jakob Olsson Date: Wed, 18 Sep 2024 16:30:19 +0200 Subject: [PATCH 04/21] decollector: 6.0.1.2 --- decollector/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/decollector/Makefile b/decollector/Makefile index 7bd8a49c8..c1d8294c7 100644 --- a/decollector/Makefile +++ b/decollector/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=decollector -PKG_VERSION:=6.0.1.1 +PKG_VERSION:=6.0.1.2 LOCAL_DEV=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=64b16101bd349eeda573094109402b885543c94e +PKG_SOURCE_VERSION:=705dd20b661164a81dd9c664ae39c46ac914c390 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip From eaaf653b0f3d7f3962697d2fb6217a5484fa15af Mon Sep 17 00:00:00 2001 From: Jakob Olsson Date: Wed, 18 Sep 2024 17:20:06 +0200 Subject: [PATCH 05/21] map-agent: 6.2.0.2 --- map-agent/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/map-agent/Makefile b/map-agent/Makefile index 25073cbf8..8423b3708 100644 --- a/map-agent/Makefile +++ b/map-agent/Makefile @@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=map-agent -PKG_VERSION:=6.2.0.1 +PKG_VERSION:=6.2.0.2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=d6cba9f1d50f4220da57c14f0fc0fa05e9322ff6 +PKG_SOURCE_VERSION:=6648c77a3d6a2f0d89c56e1486ceb59dcf2f4ef4 PKG_MAINTAINER:=Jakob Olsson PKG_LICENSE:=BSD-3-Clause From f250bc3c79ae1cc898937e9b06757700b502487e Mon Sep 17 00:00:00 2001 From: Jakob Olsson Date: Thu, 19 Sep 2024 15:03:56 +0200 Subject: [PATCH 06/21] decollector: 6.1.0.0 --- decollector/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/decollector/Makefile b/decollector/Makefile index c1d8294c7..88180b800 100644 --- a/decollector/Makefile +++ b/decollector/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=decollector -PKG_VERSION:=6.0.1.2 +PKG_VERSION:=6.1.0.0 LOCAL_DEV=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=705dd20b661164a81dd9c664ae39c46ac914c390 +PKG_SOURCE_VERSION:=2efa50c2bb5b8d5ed3e72c27395a7f2516bcbd44 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip From eadb87d369fabdfec1a5bffa3689d66c4e496317 Mon Sep 17 00:00:00 2001 From: Janusz Dziedzic Date: Fri, 20 Sep 2024 08:33:26 +0000 Subject: [PATCH 07/21] libwifi: 7.6.2 --- libwifi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libwifi/Makefile b/libwifi/Makefile index 0caa24f01..2a6f9b66f 100644 --- a/libwifi/Makefile +++ b/libwifi/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwifi -PKG_VERSION:=7.6.1 +PKG_VERSION:=7.6.2 LOCAL_DEV=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=7f4dc9fee2f8fc5fb0fdd1483c7104e683034f08 +PKG_SOURCE_VERSION:=a4bdcac7e16ba5e387cad218c24115ebe6fbb490 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git PKG_MAINTAINER:=Anjan Chanda PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz From 13aa279c391949c8ff230cd893e1ebefdfccc798 Mon Sep 17 00:00:00 2001 From: Yalu Zhang Date: Fri, 20 Sep 2024 14:08:23 +0200 Subject: [PATCH 08/21] dectmngr-3.6.9: Send flash hook event before receiving the called number for the second outgoing call libvoice-d2-1.1.14: Don't report DTMF events detected by DSP for DECT --- dectmngr/Makefile | 2 +- libvoice-d2/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dectmngr/Makefile b/dectmngr/Makefile index 8671bc004..1b686c081 100644 --- a/dectmngr/Makefile +++ b/dectmngr/Makefile @@ -8,7 +8,7 @@ LOCAL_DEV=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=82d5bae7ef1d54b41029c9f87e8c821cde38a28e +PKG_SOURCE_VERSION:=c5254120c2c8b43936e2f9f4f9a3827784d60a43 PKG_MIRROR_HASH:=skip endif diff --git a/libvoice-d2/Makefile b/libvoice-d2/Makefile index 412ee794f..aedd38ea3 100644 --- a/libvoice-d2/Makefile +++ b/libvoice-d2/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libvoice-d2 PKG_RELEASE:=1 -PKG_VERSION:=1.1.13 +PKG_VERSION:=1.1.14 PKG_LICENSE:=PROPRIETARY PKG_LICENSE_FILES:=LICENSE @@ -17,7 +17,7 @@ LOCAL_DEV=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git -PKG_SOURCE_VERSION:=0b00d6e2772bf31e696fc974df071e6fcf972fa3 +PKG_SOURCE_VERSION:=0b2bef862fb5aea0b285e339459f46779224e2d0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif From 91ef8ff9a28af1a072dcdf46af8d514c15513ecd Mon Sep 17 00:00:00 2001 From: Jakob Olsson Date: Fri, 20 Sep 2024 15:00:50 +0200 Subject: [PATCH 09/21] map-agent: 6.2.0.3 --- map-agent/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/map-agent/Makefile b/map-agent/Makefile index 8423b3708..55d789362 100644 --- a/map-agent/Makefile +++ b/map-agent/Makefile @@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=map-agent -PKG_VERSION:=6.2.0.2 +PKG_VERSION:=6.2.0.3 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=6648c77a3d6a2f0d89c56e1486ceb59dcf2f4ef4 +PKG_SOURCE_VERSION:=efec53aa8f997cb19941debe7d6a7ab5cf404610 PKG_MAINTAINER:=Jakob Olsson PKG_LICENSE:=BSD-3-Clause From 85542591d0afd9c1e123166760e156d0b1d5f290 Mon Sep 17 00:00:00 2001 From: Jakob Olsson Date: Fri, 20 Sep 2024 15:30:01 +0200 Subject: [PATCH 10/21] ieee1905: 8.5.7 --- ieee1905/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ieee1905/Makefile b/ieee1905/Makefile index f103435e2..7f5b28683 100644 --- a/ieee1905/Makefile +++ b/ieee1905/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ieee1905 -PKG_VERSION:=8.5.6 +PKG_VERSION:=8.5.7 LOCAL_DEV=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=25925684c21de7494d4973b1799f5bd121014518 +PKG_SOURCE_VERSION:=171fa1b3886547765b2c223edfe195c26fcda28d PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz PKG_MIRROR_HASH:=skip From 4ea26f9bec5191b7a06e58469f8c874efc060076 Mon Sep 17 00:00:00 2001 From: Amin Ben Romdhane Date: Fri, 20 Sep 2024 15:47:43 +0200 Subject: [PATCH 11/21] bbfdm: 1.12.5 --- bbfdm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bbfdm/Makefile b/bbfdm/Makefile index 9f4e9de06..53e30050b 100644 --- a/bbfdm/Makefile +++ b/bbfdm/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bbfdm -PKG_VERSION:=1.12.4 +PKG_VERSION:=1.12.5 USE_LOCAL:=0 ifneq ($(USE_LOCAL),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git -PKG_SOURCE_VERSION:=2a9743509407210d719888eeaae3ed0f414cc42b +PKG_SOURCE_VERSION:=5de763328893e43ea16965c80af01c34a47d7c26 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif From 0a8879332835282ddc8d38c260b0b8d8236bc5ac Mon Sep 17 00:00:00 2001 From: Amin Ben Romdhane Date: Fri, 20 Sep 2024 15:48:51 +0200 Subject: [PATCH 12/21] timemngr: 1.1.2 --- timemngr/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/timemngr/Makefile b/timemngr/Makefile index e4ef6919c..80c1fd4f3 100644 --- a/timemngr/Makefile +++ b/timemngr/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=timemngr -PKG_VERSION:=1.1.1 +PKG_VERSION:=1.1.2 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git -PKG_SOURCE_VERSION:=524495fc46987eab80eacdd5f2349b2fbd5efb23 +PKG_SOURCE_VERSION:=a6c3926d7d1bb4031d3bc9865d4648abe173ad93 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif From 5c4f3150834f8b47b8e66d0c86f32f8447d67bce Mon Sep 17 00:00:00 2001 From: Amin Ben Romdhane Date: Fri, 20 Sep 2024 15:49:51 +0200 Subject: [PATCH 13/21] tr143: 1.0.7 --- tr143/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr143/Makefile b/tr143/Makefile index 74838efab..5bad97bec 100644 --- a/tr143/Makefile +++ b/tr143/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tr143 -PKG_VERSION:=1.0.6 +PKG_VERSION:=1.0.7 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/tr143d.git -PKG_SOURCE_VERSION:=06fde10941edcf57fa93c39fbe5268687e4cbe87 +PKG_SOURCE_VERSION:=71d6f4d3b3ba1a3d771b99cc39cdb41e1c197d02 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif From 12449bf47152cf9b169df919ffde53eeb328a7d3 Mon Sep 17 00:00:00 2001 From: Amin Ben Romdhane Date: Fri, 20 Sep 2024 15:51:18 +0200 Subject: [PATCH 14/21] tr471: 1.0.6 --- tr471/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr471/Makefile b/tr471/Makefile index 3ea58e6b9..da9c79061 100644 --- a/tr471/Makefile +++ b/tr471/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tr471 -PKG_VERSION:=1.0.5 +PKG_VERSION:=1.0.6 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/tr471d.git -PKG_SOURCE_VERSION:=69b4d324f2b2c78d858b0446dcb90dba9d5f60c3 +PKG_SOURCE_VERSION:=589c71e07a5e8044bdd03d3d5b161d9ef1270a6d PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif From 66bed5a044e6a79b58012618e7b1e3fcc1f635bb Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Fri, 20 Sep 2024 19:39:53 +0530 Subject: [PATCH 15/21] netmngr: 1.0.4 --- netmngr/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/netmngr/Makefile b/netmngr/Makefile index b5f1007b2..513752999 100644 --- a/netmngr/Makefile +++ b/netmngr/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netmngr -PKG_VERSION:=1.0.3 +PKG_VERSION:=1.0.4 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/network/netmngr.git -PKG_SOURCE_VERSION:=eaa72adeab3acab147eb1a0bf376a499b734d6c2 +PKG_SOURCE_VERSION:=ad4825bc6349d1cd68680aaaa6c5b217227c90fe PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif @@ -34,6 +34,8 @@ endef MAKE_PATH:=src +TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=$(CONFIG_BBF_VENDOR_PREFIX) + define Package/netmngr/install $(BBFDM_INSTALL_MS_DM) -u Network $(PKG_BUILD_DIR)/src/libnetmngr.so $(1) $(PKG_NAME) $(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/src/libinterface_stack.so $(1) From 82eb62a9e17ac5f67faa1bb70589d285dfb36bc8 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Mon, 23 Sep 2024 10:26:28 +0530 Subject: [PATCH 16/21] icwmp: Fix static analysis errors --- icwmp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index 1b01adeb7..b24c4f443 100755 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icwmp -PKG_VERSION:=9.8.12 +PKG_VERSION:=9.8.13 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git -PKG_SOURCE_VERSION:=75b3e8ccb66851b9dce3c93f48c112a8fbfe9286 +PKG_SOURCE_VERSION:=14f3375ab8f1a586da7c9fd94c46bd16e3ae0ac6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif From 757ab29b578ffea3ae38de6b72f516ffab264b05 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Mon, 23 Sep 2024 10:52:36 +0530 Subject: [PATCH 17/21] twamp: 1.4.7 --- twamp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/twamp/Makefile b/twamp/Makefile index de9cfcc0d..281f5ba38 100755 --- a/twamp/Makefile +++ b/twamp/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=twamp -PKG_VERSION:=1.4.6 +PKG_VERSION:=1.4.7 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/twamp-light.git -PKG_SOURCE_VERSION:=678a980b9433e34c3ea24af003e6ee987f2bce75 +PKG_SOURCE_VERSION:=26950dd25b8091f0da40c177ebb89976be69f9cf PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif From b0a854945357ab22bcab9e40d35ef6e20fae5058 Mon Sep 17 00:00:00 2001 From: Piotr Kubik Date: Fri, 20 Sep 2024 19:01:43 +0200 Subject: [PATCH 18/21] iop: ssh_upgrade: Move script to main repo --- iop/scripts/iopupgrade.sh | 283 -------------------------------------- 1 file changed, 283 deletions(-) delete mode 100644 iop/scripts/iopupgrade.sh diff --git a/iop/scripts/iopupgrade.sh b/iop/scripts/iopupgrade.sh deleted file mode 100644 index 87b5c256b..000000000 --- a/iop/scripts/iopupgrade.sh +++ /dev/null @@ -1,283 +0,0 @@ -# this is a developer helper script to install firmware on a remote host with SSH - -function upd_usage { - echo "usage: $0 ssh_upgrade [-t ] [-f ] [opts] " - echo "" - echo " Default host is 192.168.1.1" - echo " Default firmware file is the latest one (last.{itb,pkgtb})" - echo " Default is to not keep configuration" - echo "opts:" - echo "" - echo " -i Interactive use, allows to select firmware file" - echo " -n Do not do the final reboot of the target board" - echo " -c Keep configuration" - echo " -x Force install even if firmware is not for this board" - echo " -b Force install of bootloader regardless of version installed" -} - -function set_config_string { - eval $(grep $1 .config) -} - -function upd_ask_ok { - echo "Will continue with the following settings:" - echo "-----------------------------------------" - printf "%20s: %s\n" "Firmware file" "$upd_fw_base" - printf "%20s: %s\n" "Host IP" "$upd_host" - printf "%20s: " "Reboot" - if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi - printf "%20s: " "Keep config" - if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi - printf "%20s: " "Force bootloader" - if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi - printf "%20s: " "Force image upgrade" - if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi - echo "-----------------------------------------" - - echo -n "Continue? [Y/n/q]:" - read answer - - case $answer in - n | N) - return 1 - ;; - q | Q) - exit 1 - ;; - y | Y | *) - return 0 - ;; - esac -} - -function upd_select_file { - dialog --keep-tite --title "To select a file, use TAB/ARROW to highlight then press SPACEBAR -> RETURN" \ - --fselect "${upd_fw:-bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/}" \ - $((lines - 10)) $((cols - 5)) \ - 2>$tempfile - - new_file=$(cat $tempfile) - if [ -n "$new_file" ]; then - upd_fw="$new_file" - upd_fw_base=$(basename $upd_fw) - fi -} - -function upd_select_target { - dialog --keep-tite --title "Input the hostname/IP of the target board" \ - --inputbox "Name/IP" \ - $((lines - 10)) $((cols - 5)) \ - "$upd_host" \ - 2>$tempfile - - new_file=$(cat $tempfile) - if [ -n "$new_file" ]; then - upd_host="$new_file" - fi -} - -function upd_select_reboot { - dialog --keep-tite --radiolist "Should the board reboot after download finished" \ - $((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \ - "Reboot" "Restart board after done" $(if [ "$upd_noreboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \ - "No reboot" "Continue running old system" $(if [ "$upd_noreboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \ - 2>$tempfile - - res=$(cat $tempfile) - case $res in - "No reboot") - upd_noreboot=1 - ;; - "Reboot") - upd_noreboot=0 - ;; - esac -} - -function upd_select_config { - dialog --keep-tite --radiolist "Should the configuration be kept" \ - $((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \ - "Keep" "Keep the config from old system" $(if [ "$upd_keepconf" == "1" ]; then echo "ON"; else echo "OFF"; fi) \ - "Default" "Use default config for new system" $(if [ "$upd_keepconf" == "0" ]; then echo "ON"; else echo "OFF"; fi) \ - 2>$tempfile - - res=$(cat $tempfile) - case $res in - "Keep") - upd_keepconf=1 - ;; - "Default") - upd_keepconf=0 - ;; - esac -} - -function upd_select_forceboot { - dialog --keep-tite --radiolist "Should the boot loader be updated regardless of the version installed" \ - $((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \ - "Force" "Always update boot loader" $(if [ "$upd_forceboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \ - "Version check" "Only upgrade if version is newer" $(if [ "$upd_forceboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \ - 2>$tempfile - - res=$(cat $tempfile) - case $res in - "Force") - upd_forceboot=1 - ;; - "Version check") - upd_forceboot=0 - ;; - esac -} - -function upd_select_forceimage { - dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \ - $((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \ - "Force" "Disable sanity check and force use of image (dangerous)" $(if [ "$upd_forceimage" == "1" ]; then echo "ON"; else echo "OFF"; fi) \ - "Only compatible" "Normal checks apply" $(if [ "$upd_forceimage" == "0" ]; then echo "ON"; else echo "OFF"; fi) \ - 2>$tempfile - - res=$(cat $tempfile) - case $res in - "Force") - upd_forceimage=1 - ;; - "Only compatible") - upd_forceimage=0 - ;; - esac -} - -function upd_select { - dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select item to change" \ - $((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \ - "Firmware file" "$upd_fw_base" \ - "Host IP" "$upd_host" \ - "Reboot" $(if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi) \ - "Keep config" $(if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \ - "Force bootloader" $(if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \ - "Force image upgrade" $(if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \ - 2>$tempfile - - case $(cat $tempfile) in - "Firmware file") - upd_select_file - ;; - "Host IP") - upd_select_target - ;; - "Reboot") - upd_select_reboot - ;; - "Keep config") - upd_select_config - ;; - "Force bootloader") - upd_select_forceboot - ;; - "Force image upgrade") - upd_select_forceimage - ;; - *) - return - ;; - esac - upd_select -} -function upd_select_start { - lines=$(tput lines) - cols=$(tput cols) - tempfile="$(mktemp)" - trap "rm -f $tempfile" 0 1 2 5 15 - upd_select - -} - -function ssh_upgrade { - upd_noreboot=0 - upd_forceboot=0 - upd_keepconf=0 - upd_forceimage=0 - upd_fw_base="" - upd_fw="" - upd_host="192.168.1.1" - do_dialog=0 - - while getopts "f:hnxt:icb" opt; do - case $opt in - n) - upd_noreboot=1 - ;; - x) - upd_forceimage=1 - ;; - b) - upd_forceboot=1 - ;; - c) - upd_keepconf=1 - ;; - v) - verbose=$OPTARG - ;; - f) - upd_fw=$OPTARG - ;; - t) - upd_host=$OPTARG - ;; - i) - do_dialog=1 - ;; - h) - upd_usage - exit 1 - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - exit 1 - ;; - esac - done - - if [ -z "$upd_fw" ]; then - set_config_string CONFIG_TARGET_BOARD - set_config_string CONFIG_TARGET_SUBTARGET - upd_fw="$(realpath -q --canonicalize-existing --relative-to=. "bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/"last.{pkgtb,itb})" - if [ -z "$upd_fw" ] && [ $do_dialog -eq 0 ]; then - echo "Could not find image. Check that last.{itb,pkgtb} exists or specify an image using -f or -i (interactive)." >&2 - return 1 - fi - fi - upd_fw_base="$(basename "$upd_fw")" - - [ $do_dialog -eq 1 ] && upd_select_start - - if ! upd_ask_ok; then - upd_select_start - if ! upd_ask_ok; then - exit 1 - fi - fi - - if [ ! -f $upd_fw ]; then - echo "Firmware file $firmware does not exist." - exit 1 - fi - - extra_args="" - [ $upd_noreboot -eq 1 ] && extra_args="$extra_args --no-reboot" - [ $upd_forceimage -eq 1 ] && extra_args="$extra_args --force" - [ $upd_keepconf -eq 0 ] && extra_args="$extra_args -n" - [ $upd_forceboot -eq 1 ] && extra_args="$extra_args --force-loader-upgrade" - - pv "$upd_fw" | - ssh \ - -o ConnectTimeout=60 \ - -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ - root@"$upd_host" \ - sh -c "cat > '/tmp/$upd_fw_base' && (set -x && sysupgrade -v $extra_args /tmp/$upd_fw_base)" || - echo "Sysupgrade failed" >&2 && return 1 -} - -register_command "ssh_upgrade" "-t -f [opts] Install firmware on remote host with SSH" From 62cbccd274921aaf64583bdbd00d69f5d47fffe6 Mon Sep 17 00:00:00 2001 From: Jakob Olsson Date: Mon, 23 Sep 2024 14:52:23 +0200 Subject: [PATCH 19/21] map-controller: 6.1.2.1 --- map-controller/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/map-controller/Makefile b/map-controller/Makefile index 1221b3262..cc381c870 100644 --- a/map-controller/Makefile +++ b/map-controller/Makefile @@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=map-controller -PKG_VERSION:=6.1.2.0 +PKG_VERSION:=6.1.2.1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=68112d3322451dbb414bc34c71083559bbf9e495 +PKG_SOURCE_VERSION:=3251215d020cb27ab86504d847b3b45900582b57 PKG_MAINTAINER:=Jakob Olsson LOCAL_DEV=0 From 086763919a86edc673fb93f0e42d775e61f8dc5e Mon Sep 17 00:00:00 2001 From: Jakob Olsson Date: Mon, 23 Sep 2024 14:55:12 +0200 Subject: [PATCH 20/21] map-agent: 6.2.1.0 --- map-agent/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/map-agent/Makefile b/map-agent/Makefile index 55d789362..218d5fd0c 100644 --- a/map-agent/Makefile +++ b/map-agent/Makefile @@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=map-agent -PKG_VERSION:=6.2.0.3 +PKG_VERSION:=6.2.1.0 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=efec53aa8f997cb19941debe7d6a7ab5cf404610 +PKG_SOURCE_VERSION:=f02e84b263659cf1cdd377597f976abe151bc5cd PKG_MAINTAINER:=Jakob Olsson PKG_LICENSE:=BSD-3-Clause From cbfc98d85e1da4b601993c1321a34fdc34f9e063 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Mon, 23 Sep 2024 19:35:24 +0530 Subject: [PATCH 21/21] obuspa: Integrate v9.0.0 Ibis release --- obuspa/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/obuspa/Makefile b/obuspa/Makefile index 8764aa756..b16e3abbf 100644 --- a/obuspa/Makefile +++ b/obuspa/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=obuspa -PKG_VERSION:=8.0.8.7 +PKG_VERSION:=9.0.0.1 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git -PKG_SOURCE_VERSION:=5ed4564c606e28aa995da1a39c85389707d73ab2 +PKG_SOURCE_VERSION:=b56fa3b8ce8d33239cbda3156d936a8d6f73cd0b PKG_MAINTAINER:=Vivek Dutta PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip