icwmp: 9.0.5

Makefile update for ABI version dependency of libbbf_api

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.33
+PKG_VERSION:=6.9.3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=9bdcb1ac188c44fc2274bf01dd9dce46f572b967
+PKG_SOURCE_VERSION:=afec1eba79cbe70192a066f4ac007d3a071a14c9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -25,7 +25,8 @@ define Package/libbbf_api
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Library for libbbfdm API
+  TITLE:=BBF datamodel library, provides API to extend datamodel using DotSO plugins
+  ABI_VERSION:=1.0
 endef
 
 define Package/libbbfdm/default
@@ -33,7 +34,7 @@ define Package/libbbfdm/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl +libbbf_api
 endef
 
 define Package/libbbfdm
@@ -169,7 +170,6 @@ define Build/InstallDev
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/usr/lib/
-	touch $(1)/usr/lib/libbbf_api.so
 endef
 
 $(eval $(call BuildPackage,libbbf_api))

bulkdata/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.5
+PKG_VERSION:=2.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=33a6648de9ee0af33c44518656b56b0a30b6c1ab
+PKG_SOURCE_VERSION:=b6e731bcaa7b3b41d5565c4d9c54d3ef9e315084
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -25,8 +25,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -50,8 +48,8 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.so $(1)/usr/lib/bbfdm
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
 	$(CP) ./files/* $(1)/
 endef
 

bulkdata/files/etc/init.d/bulkdatad

@@ -7,9 +7,12 @@ USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
 
 start_service() {
-	local enable=$(uci -q get bulkdata.bulkdata.enable)
+	local enable
 
-	[ "$enable" != "1" ] && {
+	config_load bulkdata
+	config_get_bool enable bulkdata enable 1
+
+	[ "$enable" -ne "1" ] && {
 		return 0
 	}
 
@@ -19,10 +22,6 @@ start_service() {
 	procd_close_instance
 }
 
-boot() {
-	start
-}
-
 reload_service() {
 	stop
 	start 

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.6.0
+PKG_VERSION:=6.7.3
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c8c406568822b170e373a54fbf32323e960259ff
+PKG_SOURCE_VERSION:=4dff7b6b9f742e52ee9e4034f8da74162a02c823
 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

evoice/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=evoice
-PKG_VERSION:=0.2.29
+PKG_VERSION:=0.2.30
 
 LOCAL_DEV=0
 LOCAL_DEV_EVOICE_DIR=~/voip/evoice
@@ -21,8 +21,6 @@ endif
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
-
 # All config variable that are passed to the make invocation, directly or
 # indirectly. This ensures that the package is rebuilt on config-changes.
 #PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
@@ -34,10 +32,10 @@ define Package/$(PKG_NAME)
 	SUBMENU:=Telephony
 	TITLE:=Ensemble Voice
 	URL:=
-	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl\
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl +libjson-c +libblobmsg-json\
 		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
 		+TARGET_iopsys_econet:kmod-voip_driver\
-		+TARGET_iopsys_econet:voip_app
+		+TARGET_iopsys_econet:voip_app +libbbf_api
 endef
 
 define Package/$(PKG_NAME)/description
@@ -65,10 +63,12 @@ ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 		-I$(IDIR)/bcm963xx/xchg/bos/publicInc\
 		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
 	TRG=SVrgBcmFxs
+	JSONFILE=codecs_brcm.json
 else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
 	TARGET_PLATFORM=ECONET
 	TONES_INI_REQUIRED=y
 	TRG=SVrgMtekOwrt
+	JSONFILE=codecs_airoha.json
 endif
 
 # disable temporarily some not important warnings, force PIC
@@ -95,6 +95,9 @@ define Package/evoice/install
 	$(CP) ./files/* $(1)/
 	$(if $(TONES_INI_REQUIRED),,$(RM) $(1)/etc/evoice/tones.ini)
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(1)/lib/voice/$(JSONFILE) $(1)/lib/voice/codecs_evoice.json
+	$(RM) $(1)/lib/voice/codecs_brcm.json
+	$(RM) $(1)/lib/voice/codecs_airoha.json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/libvoiceservice.so $(1)/usr/lib/bbfdm/

evoice/files/lib/voice/codecs_airoha.json

@@ -0,0 +1,50 @@
+{
+	"G.711ALaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.711MuLaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.722": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.726": [
+		{
+			"BitRate": 32000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		},
+		{
+			"BitRate": 24000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.729": [
+		{
+			"BitRate": 8000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"AMR": [
+		{
+			"BitRate": 7400,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	]
+}
+

evoice/files/lib/voice/codecs_brcm.json

@@ -0,0 +1,140 @@
+{
+	"G.711Mulaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.711alaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.726": [
+		{
+			"BitRate": 16000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 24000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 32000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 40000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.723.1": [
+		{
+			"BitRate": 5300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 6300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.729": [
+		{
+			"BitRate": 8000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"iLBC": [
+		{
+			"BitRate": 15200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 13300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.722": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"AMR": [
+		{
+			"BitRate": 12200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 10200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 7950,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 7400,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 6700,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 5900,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 5150,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 4750,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-EFR": [
+		{
+			"BitRate": 12200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-FR": [
+		{
+			"BitRate": 13200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-HR": [
+		{
+			"BitRate": 5600,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	]
+}
+

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.0.3
+PKG_VERSION:=9.0.5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=304db5eb064d89cf4e4df0bb81fa22b88933d602
+PKG_SOURCE_VERSION:=f590a3f64d9c0b80c3a41336e6fabbbff48868e5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.3.15
+PKG_VERSION:=2.10.3.16
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=075fb9f89722979d4622cbc575f34f74f19c1a91
+PKG_SOURCE_VERSION:=298b7ceef779a658b88f78e15f65883e5012273c
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.11.0.4
+PKG_VERSION:=2.11.0.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a4a626539ede73c1c4eb1ad768331524a8ee9ce8
+PKG_SOURCE_VERSION:=74c86c5468a5f42421e382eb90a53a643a2e6655
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -58,6 +58,8 @@ define Package/map-controller/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
+	$(CP) $(PKG_BUILD_DIR)/src/plugins/steer/rcpi/rcpi.so $(1)/usr/lib/mapcontroller/rcpi.so
 endef
 
 ifeq ($(LOCAL_DEV),1)

periodicstats/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.2.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -20,15 +20,13 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/periodicstats
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Periodic Statistics Daemon
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbf_api
 endef
 
 define Package/periodicstats/description

skopeo/Makefile

@@ -2,14 +2,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=skopeo
 PKG_VERSION:=1.9.2
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_NAME:=skopeo
-PKG_SOURCE_URL:=https://github.com/containers/skopeo.git
-PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION)-$(PKG_RELEASE).tar.gz
-PKG_MIRROR_HASH:=skip
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/containers/skopeo/archive/v$(PKG_VERSION)
+PKG_HASH:=9a321ba75f213e5c46cba7f92073c2437137a56d3140c9ab6e723fb92890f9d0
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE

stunc/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.12
+PKG_VERSION:=1.1.13
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -23,8 +23,6 @@ endif
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/stunc/default
@@ -32,7 +30,7 @@ define Package/stunc/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbf_api
 endef
 
 define Package/stunc-mbedtls

sulu-builder/Config.in

@@ -13,7 +13,7 @@ menu "SULU_CORE"
 
 	config SULU_CORE_VERSION
 		string "SULU repo version"
-		default "944f4e2217e478c04f1ef56ae67c66d82ece7994"
+		default "09f38d92c0690f4d101d7914948226299fafe066"
 endmenu
 
 menu "SULU_PLUGIN_LCM"
@@ -35,7 +35,7 @@ menu "SULU_PLUGIN_LCM"
 	config SULU_PLUGIN_LCM_VERSION
 		depends on SULU_PLUGIN_LCM_ENABLE
 		string "Version"
-		default "f8a96f1c55904082c0658ee63aebe1e67a097f42"
+		default "40da874871120e4a042ec5ac814e3c96e22d8c24"
 endmenu
 
 menu "SULU_PLUGIN_MULTIAP"
@@ -57,7 +57,7 @@ menu "SULU_PLUGIN_MULTIAP"
 	config SULU_PLUGIN_MULTIAP_VERSION
 		depends on SULU_PLUGIN_MULTIAP_ENABLE
 		string "Version"
-		default "89b4e4b95d3a94b88782f5cdc9d1eafd5728a1f7"
+		default "68d4919a7a40b3029ab56b47fc97bfa28619639b"
 endmenu
 
 menu "SULU_THEME_IOPSYS"

sulu-builder/Makefile

@@ -5,19 +5,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.2.2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=ca38b2086cee7ba83b41eec56539e9432271a349
+PKG_SOURCE_VERSION:=16bbf7e5a28a79c47a63bf454fc2f525d667c73d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=node-yarn/host
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/${PKG_NAME}
@@ -25,7 +23,7 @@ define Package/${PKG_NAME}
 	CATEGORY:=Utilities
 	TITLE:=Build sulu from source
 	DEPENDS:=+nginx +mosquitto-auth-shadow
-	MENU:=1
+	CONFLICTS:=sulu
 endef
 
 define Package/${PKG_NAME}/description
@@ -37,7 +35,7 @@ define Package/${PKG_NAME}/config
 endef
 
 # Sulu core and other dependent needs to be updated in Config.in
-SULU_DL_FILE:=sulu-${PKG_VERSION}-${CONFIG_SULU_CORE_VERSION}.tar.gz
+SULU_DL_FILE:=sulu_core-${CONFIG_SULU_CORE_VERSION}.tar.gz
 define Download/sulu_core
   FILE:=$(SULU_DL_FILE)
   URL:=$(CONFIG_SULU_CORE_URL)
@@ -144,10 +142,15 @@ endef
 define Package/${PKG_NAME}/install
 	$(INSTALL_DIR) $(1)/sulu
 	$(INSTALL_DIR) $(1)/sulu/config
+	$(INSTALL_DIR) $(1)/sulu/config/widgets
 	$(INSTALL_DIR) $(1)/etc/nginx/
 	$(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/
 	$(CP) $(PKG_BUILD_DIR)/build/dist/* $(1)/sulu
-	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/*.json $(1)/sulu/config/
+	$(CP) $(PKG_BUILD_DIR)/build/src/config/*.json $(1)/sulu/config/
+	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/diagnostics.json $(1)/sulu/config/widgets/
+ifeq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy)
+	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/lcm-store.json $(1)/sulu/config/widgets/
+endif
 	$(CP) ./files/* $(1)/
 endef
 

sulu/Makefile

@@ -1,15 +1,15 @@
 #
-# Copyright (C) 2021 IOPSYS
+# Copyright (C) 2021-2022 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.2.2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=ca38b2086cee7ba83b41eec56539e9432271a349
+PKG_SOURCE_VERSION:=16bbf7e5a28a79c47a63bf454fc2f525d667c73d
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -26,7 +26,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/sulu
 	SECTION:=sulu
 	CATEGORY:=Utilities
-	MENU=1
 	TITLE:=SULU-CE ReactJS based Web UI Package
 	DEPENDS:=+nginx +mosquitto-auth-shadow
 endef
@@ -38,10 +37,15 @@ endef
 define Package/sulu/install
 	$(INSTALL_DIR) $(1)/sulu
 	$(INSTALL_DIR) $(1)/sulu/config
+	$(INSTALL_DIR) $(1)/sulu/config/widgets
 	$(INSTALL_DIR) $(1)/etc/nginx/
 	$(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/
 	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu
-	$(CP) $(PKG_BUILD_DIR)/config/* $(1)/sulu/config
+	$(CP) $(PKG_BUILD_DIR)/config/*.json $(1)/sulu/config
+	$(CP) $(PKG_BUILD_DIR)/config/widgets/diagnostics.json $(1)/sulu/config/widgets/
+ifeq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy)
+	$(CP) $(PKG_BUILD_DIR)/config/widgets/lcm-store.json $(1)/sulu/config/widgets/
+endif
 	$(CP) ./files/* $(1)/
 endef
 

swmodd/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.16
+PKG_VERSION:=2.1.17
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -17,7 +17,6 @@ PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=bbf
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -32,7 +31,7 @@ define Package/swmodd
   DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
 	    +PACKAGE_liblxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
 	    +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT +@BUSYBOX_CONFIG_SCRIPT \
-	    +swmodd-cgroup +jq
+	    +swmodd-cgroup +jq +libbbf_api
 endef
 
 define Package/swmodd/description

twamp/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.2.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -19,7 +19,6 @@ endif
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
-PKG_BUILD_DEPENDS:=bbf
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,7 +27,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TWAMP Light Client(TR-390)
-  DEPENDS:=+libuci +ubox +libubus
+  DEPENDS:=+libuci +ubox +libubus +libbbf_api
 endef
 
 define Package/$(PKG_NAME)/description

twamp/files/etc/firewall.twamp

@@ -29,8 +29,11 @@ function configure_firewall()
 
 function delete_rule()
 {
-        while iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" > /dev/null 2>&1; do
-		iptables -w 1 -D zone_${1}_input $(iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" | head -1|awk '{print $1}');
+        while iptables -w 1 -L zone_${1}_input --line-numbers 2>/dev/null | grep "TWAMP reflector port"; do
+		rule_num="$(iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" | head -1|awk '{print $1}')"
+		if [ -n "${rule_num}" ]; then
+			iptables -w 1 -D zone_${1}_input ${rule_num};
+		fi
 	done
 }
 

udpecho/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udpecho
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.0.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -24,7 +24,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
-PKG_BUILD_DEPENDS:=bbf
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -35,7 +34,7 @@ define Package/$(PKG_NAME)-server
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF UDP Echo Server
-  DEPENDS:=+libuci
+  DEPENDS:=+libuci +libbbf_api
 endef
 
 define Package/$(PKG_NAME)-client

umoci/Makefile

@@ -3,15 +3,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=umoci
 PKG_VERSION:=0.4.7
 PKG_RELEASE:=$(AUTORELEASE)
+
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_NAME:=umoci
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/opencontainers/umoci.git
-PKG_SOURCE_VERSION:=17f38511d61846e2fb8ec01a1532f3ef5525e71d
-PKG_MIRROR_HASH:=skip
+PKG_SOURCE_URL:=https://github.com/opencontainers/umoci/archive/v$(PKG_VERSION)
+PKG_HASH:=c01b36de6fdc513eb65add57bc882d72f94fc3b4b65a8f9ef59826fb754af93e
 
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1

xmppc/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=2.0.2
+PKG_VERSION:=2.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -25,8 +25,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -34,7 +32,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF xmpp Client
-  DEPENDS:=+libuci +libubox +libstrophe +libubus
+  DEPENDS:=+libuci +libubox +libstrophe +libubus +libbbf_api
 endef
 
 define Package/$(PKG_NAME)/description