Integrating libgmap-ext to master_v1.2.2

Issue: NET-6419 [lib_gmap-ext] Remove the search path expression

Signed-off-by: sahbot                 <sahbot@softathome.com>
GitOrigin-RevId: fd68e84ca0e0fa28eeca4afb6b4e30dfc5196b29

.gitlab-ci.yml

@@ -0,0 +1,4 @@
+---
+
+include:
+  - remote: 'https://gitlab.com/prpl-foundation/tooling/yml-templates/raw/main/.feed-pipeline.yml'

apps/gmap-client/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-client
-PKG_VERSION:=v1.2.1
+PKG_VERSION:=v1.3.1
 SHORT_DESCRIPTION:=gMap client plugin
 
-PKG_SOURCE:=gmap-client-v1.2.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.2.1
-PKG_HASH:=04f1fa5d8a9ddbcaba519dbd2f8d193cd596a321cc84b3132fde6f3a09627720
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.2.1
+PKG_SOURCE:=gmap-client-v1.3.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.3.1
+PKG_HASH:=036c0aada8d80303fde6ca9667e0c7c46dcd107788156ec2f214a7af4ced1921
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.3.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -25,7 +25,7 @@ endef
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
+  CATEGORY:=prpl Foundation
   SUBMENU:=Plugins
   TITLE:=$(SHORT_DESCRIPTION)
   URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client

apps/gmap-client/files/etc/runlevel.d/ap/10-remove-gmap-client.sh

@@ -0,0 +1 @@
+opkg remove gmap-client --force-depends

apps/gmap-mod-conntrack-stats/Makefile

@@ -0,0 +1,65 @@
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-conntrack-stats
+PKG_VERSION:=v1.0.3
+SHORT_DESCRIPTION:=Module to conntrack statistics information in gMap
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v1.0.3
+PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-conntrack-stats.git
+PKG_MIRROR_HASH:=skip
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
+PKG_LICENSE:=BSD-2-Clause-Patent
+PKG_LICENSE_FILES:=LICENSE
+
+
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  CATEGORY:=gmap
+  SUBMENU:=gMap
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-conntrack-stats
+  DEPENDS += +libamxb
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libamxs
+  DEPENDS += +libgmap-client
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module to conntrack statistics information in gMap
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+endef
+
+define Build/Install
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+endef
+
+define Build/InstallDev
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
+	find $(1) -name *.a -exec rm {} +;
+	find $(1) -name *.h -exec rm {} +;
+	find $(1) -name *.pc -exec rm {} +;
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

apps/gmap-mod-conntrack-stats/files/etc/runlevel.d/ap/10-remove-gmap-mod-conntrack-stats.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-conntrack-stats --force-depends

apps/gmap-mod-ethernet-dev/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-mod-ethernet-dev
-PKG_VERSION:=v1.18.0
+PKG_VERSION:=v1.20.7
 SHORT_DESCRIPTION:=gMap component that adds discovered devices to the gmap datamodel and links them to the correct interface
 
-PKG_SOURCE:=gmap-mod-ethernet-dev-v1.18.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.18.0
-PKG_HASH:=8836d88d75c1b035546032227e593cf808ad8c4e1a1ec04b3e1dfe8fc107eca8
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.18.0
+PKG_SOURCE:=gmap-mod-ethernet-dev-v1.20.7.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.20.7
+PKG_HASH:=e3caa0dd7830d2f509ac5dcd5f135d544e3b2cf0eee437adfe017e28f3421745
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.20.7
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -32,6 +32,7 @@ define Package/$(PKG_NAME)
   DEPENDS += +libsahtrace
   DEPENDS += +libdhcpoptions
   DEPENDS += +libdiscoping
+  DEPENDS += +libnetmodel
   MENU:=1
 endef
 

apps/gmap-mod-ethernet-dev/files/etc/runlevel.d/ap/10-remove-gmap-mod-ethernet-dev.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-ethernet-dev --force-depends

apps/gmap-mod-mdns/files/etc/runlevel.d/ap/10-remove-gmap-mod-mdns.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-mdns --force-depends

apps/gmap-mod-name-selector/Makefile

@@ -1,23 +1,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-mod-name-selector
-PKG_VERSION:=v1.0.1
+PKG_VERSION:=v1.0.2
 SHORT_DESCRIPTION:=Name selection module for gmap
 
-PKG_SOURCE:=gmap-mod-name-selector-v1.0.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector/-/archive/v1.0.1
-PKG_HASH:=cac734389d94a198f980ec4c39956655d0f12a1177fcb0d204a186df2becc206
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-name-selector-v1.0.1
+PKG_SOURCE:=gmap-mod-name-selector-v1.0.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector/-/archive/v1.0.2
+PKG_HASH:=b0239e8099767a85859d70fbd43b0cb805292104d55a6782bab2a8f3f7740b4b
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-name-selector-v1.0.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
+
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
+  CATEGORY:=prpl Foundation
   SUBMENU:=gMap
   TITLE:=$(SHORT_DESCRIPTION)
   URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector
@@ -37,25 +38,25 @@ define Package/$(PKG_NAME)/description
 endef
 
 define Build/Compile
-	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
 endef
 
 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
-	find $(PKG_INSTALL_DIR) -name *.a -exec rm {} +;
-	find $(PKG_INSTALL_DIR) -name *.h -exec rm {} +;
-	find $(PKG_INSTALL_DIR) -name *.pc -exec rm {} +;
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
 endef
 
 define Build/InstallDev
-	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
 endef
 
 define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 	if [ -d ./files ]; then \
 		$(CP) ./files/* $(1)/; \
 	fi
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	find $(1) -name *.a -exec rm {} +;
+	find $(1) -name *.h -exec rm {} +;
+	find $(1) -name *.pc -exec rm {} +;
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

apps/gmap-mod-name-selector/files/etc/runlevel.d/ap/10-remove-gmap-mod-name-selector.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-name-selector --force-depends

apps/gmap-mod-sahpairing/Makefile

@@ -0,0 +1,66 @@
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-sahpairing
+PKG_VERSION:=v0.1.4
+SHORT_DESCRIPTION:=Module to expose sahpairing information in gMap
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v0.1.4
+PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-sahpairing.git
+PKG_MIRROR_HASH:=skip
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
+PKG_LICENSE:=SAH
+PKG_LICENSE_FILES:=LICENSE
+
+
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  CATEGORY:=gmap
+  SUBMENU:=gMap
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-sahpairing
+  DEPENDS += +libamxb
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libamxs
+  DEPENDS += +libgmap-client
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  DEPENDS += +sahpairing
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module to expose sahpairing information in gMap
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+endef
+
+define Build/Install
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+endef
+
+define Build/InstallDev
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
+	find $(1) -name *.a -exec rm {} +;
+	find $(1) -name *.h -exec rm {} +;
+	find $(1) -name *.pc -exec rm {} +;
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

apps/gmap-mod-sahpairing/files/etc/runlevel.d/ap/10-remove-gmap-mod-sahpairing.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-sahpairing --force-depends

apps/gmap-mod-self/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-mod-self
-PKG_VERSION:=v1.5.0
+PKG_VERSION:=v1.7.5
 SHORT_DESCRIPTION:=gmap module to fetch information about the hgw/repeater itself and the layer 2 'devices' on it
 
-PKG_SOURCE:=gmap-mod-self-v1.5.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.5.0
-PKG_HASH:=ed4c1c195713f5c4f64aa770fddb0d10d51f50ac0ae5d6c9823037d4a00ce23a
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.5.0
+PKG_SOURCE:=gmap-mod-self-v1.7.5.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.7.5
+PKG_HASH:=642c9ece94d7415992afdf08a0a9a21912c1eeb2efec4116bb8c1e9db9728ee8
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.7.5
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE

apps/gmap-mod-self/files/etc/runlevel.d/ap/10-remove-gmap-mod-self.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-self --force-depends

apps/gmap-mod-services-db/Config.in

@@ -0,0 +1,20 @@
+config PACKAGE_gmap-mod-services-db
+    tristate
+    select SAH_SERVICES_GMAP-MOD_SERVICES-DB
+
+if PACKAGE_gmap-mod-services-db
+
+menu "Select gmap-mod-services-db build options"
+    depends on PACKAGE_gmap-mod-services-db
+
+config SAH_SERVICES_GMAP-MOD_SERVICES-DB
+    bool "Application for populating the datamodel based on grules"
+    default y
+
+config SAH_SERVICES_GMAP-MOD_SERVICES-DB_BUILT-IN_SAH_RULES
+    bool "Include sah proprietary grules in build package"
+    default y
+
+endmenu
+
+endif

apps/gmap-mod-services-db/Makefile

@@ -2,16 +2,16 @@ include $(TOPDIR)/rules.mk
 -include $(STAGING_DIR)/components.config
 
 PKG_NAME:=gmap-mod-services-db
-PKG_VERSION:=v0.1.9
+PKG_VERSION:=v0.2.8
 SHORT_DESCRIPTION:=gMap component that populates the datamodel based on preconfigured grules
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.9
+PKG_SOURCE_VERSION:=v0.2.8
 PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-services-db.git
 PKG_MIRROR_HASH:=skip
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:=SAH
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
 
 
@@ -41,15 +41,15 @@ define Package/$(PKG_NAME)/description
 endef
 
 define Build/Compile
-	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_SERVICES_GMAP-MOD_SERVICES-DB_BUILT-IN_SAH_RULES=$(CONFIG_SAH_SERVICES_GMAP-MOD_SERVICES-DB_BUILT-IN_SAH_RULES))
 endef
 
 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_SERVICES_GMAP-MOD_SERVICES-DB_BUILT-IN_SAH_RULES=$(CONFIG_SAH_SERVICES_GMAP-MOD_SERVICES-DB_BUILT-IN_SAH_RULES))
 endef
 
 define Build/InstallDev
-	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_SERVICES_GMAP-MOD_SERVICES-DB_BUILT-IN_SAH_RULES=$(CONFIG_SAH_SERVICES_GMAP-MOD_SERVICES-DB_BUILT-IN_SAH_RULES))
 endef
 
 define Package/$(PKG_NAME)/install
@@ -62,4 +62,8 @@ define Package/$(PKG_NAME)/install
 	find $(1) -name *.pc -exec rm {} +;
 endef
 
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
 $(eval $(call BuildPackage,$(PKG_NAME)))

apps/gmap-mod-services-db/files/etc/runlevel.d/ap/10-remove-gmap-mod-services-db.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-services-db --force-depends

apps/gmap-mod-upnp/Makefile

@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 -include $(STAGING_DIR)/components.config
 
 PKG_NAME:=gmap-mod-upnp
-PKG_VERSION:=v0.2.0
+PKG_VERSION:=v0.4.1
 SHORT_DESCRIPTION:=Module to expose upnp information in gMap
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.2.0
+PKG_SOURCE_VERSION:=v0.4.1
 PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-upnp.git
 PKG_MIRROR_HASH:=skip
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

apps/gmap-mod-upnp/files/etc/runlevel.d/ap/10-remove-gmap-mod-upnp.sh

@@ -0,0 +1 @@
+opkg remove gmap-mod-upnp --force-depends

apps/gmap-server/Config.in

@@ -15,14 +15,6 @@ config SAH_AMX_GMAP_SERVER_ORDER
     int "gMap server plugin startup order"
     default 71
 
-config AMX_GMAP_SERVER_NAME_ORDER
-    string "Priority list of device name sources (highest priority on the left). Source default is implicit and last (after searching alternatives for the device)."
-    default "webui,user,dil,tags,mdns,dhcp,lltd,plc,mac,upnp,usb,voice,default"
-
-config AMX_GMAP_MAX_DEVICES
-    int "The max number of gmap devices that can be present at the same time"
-    default 70
-
 endmenu
 
 endif

apps/gmap-server/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-server
-PKG_VERSION:=v2.3.0
+PKG_VERSION:=v3.0.9
 SHORT_DESCRIPTION:=Service implementing the gmap data model
 
-PKG_SOURCE:=gmap-server-v2.3.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.3.0
-PKG_HASH:=4f37480d4a0ac9d33743e3bcff8862aac2de7f614ef41bbe4ca173ed6d2beaff
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.3.0
+PKG_SOURCE:=gmap-server-v3.0.9.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v3.0.9
+PKG_HASH:=8149cc93a91a5979845e4f8196db8bd15cebde1ffc75ccf998c4e32a0b9f4a09
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v3.0.9
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -15,7 +15,6 @@ PKG_LICENSE_FILES:=LICENSE
 COMPONENT:=gmap-server
 
 PKG_RELEASE:=1
-PKG_BUILD_DEPENDS += util-linux
 
 define SAHInit/Install
 	install -d ${PKG_INSTALL_DIR}/etc/rc.d/
@@ -47,6 +46,7 @@ define Package/$(PKG_NAME)
   DEPENDS += +libgmap-client
   DEPENDS += +libsahtrace
   DEPENDS += +libuuid
+  DEPENDS += +mod-pcm-svc
   MENU:=1
 endef
 
@@ -55,18 +55,18 @@ define Package/$(PKG_NAME)/description
 endef
 
 define Build/Compile
-	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_SERVER_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER) CONFIG_AMX_GMAP_SERVER_NAME_ORDER=$(CONFIG_AMX_GMAP_SERVER_NAME_ORDER) CONFIG_AMX_GMAP_MAX_DEVICES=$(CONFIG_AMX_GMAP_MAX_DEVICES))
+	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_SERVER_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER))
 endef
 
 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_SERVER_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER) CONFIG_AMX_GMAP_SERVER_NAME_ORDER=$(CONFIG_AMX_GMAP_SERVER_NAME_ORDER) CONFIG_AMX_GMAP_MAX_DEVICES=$(CONFIG_AMX_GMAP_MAX_DEVICES))
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_SERVER_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER))
 
 	$(call SAHInit/Install)
 	$(call SAHBackupRestore/Install)
 endef
 
 define Build/InstallDev
-	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_SERVER_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER) CONFIG_AMX_GMAP_SERVER_NAME_ORDER=$(CONFIG_AMX_GMAP_SERVER_NAME_ORDER) CONFIG_AMX_GMAP_MAX_DEVICES=$(CONFIG_AMX_GMAP_MAX_DEVICES))
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_AMX_GMAP_SERVER_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER))
 endef
 
 define Package/$(PKG_NAME)/install

apps/gmap-server/files/etc/runlevel.d/ap/10-remove-gmap-server.sh

@@ -0,0 +1 @@
+opkg remove gmap-server --force-depends

configs/gmap-mibs-common/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-mibs-common
-PKG_VERSION:=v0.17.0
+PKG_VERSION:=v0.24.7
 SHORT_DESCRIPTION:=Generic mib files for the gmap service
 
-PKG_SOURCE:=gmap-mibs-common-v0.17.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.17.0
-PKG_HASH:=cd9d9f5a3611a355ab97234d748d6d2c61e48bcba274fd413d568e70d7f7304d
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.17.0
+PKG_SOURCE:=gmap-mibs-common-v0.24.7.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.24.7
+PKG_HASH:=1d2084f58619fdee096c64c04f807e7ef320bb3e74052cf5a0b0f4fee437f7da
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.24.7
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -28,11 +28,13 @@ define Package/$(PKG_NAME)
   DEPENDS += +libamxd
   DEPENDS += +libamxb
   DEPENDS += +libamxj
+  DEPENDS += +libamxm
   DEPENDS += +libsahtrace
   DEPENDS += +libamxo
   DEPENDS += +libgmap-client
   DEPENDS += +libgmap-ext
   DEPENDS += +mod-dmext
+  DEPENDS += +libipat
   MENU:=1
 endef
 

configs/gmap-mibs-common/files/etc/runlevel.d/ap/10-remove-gmap-mibs-common.sh

@@ -0,0 +1 @@
+opkg remove gmap-mibs-common --force-depends

libs/libgmap-client/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgmap-client
-PKG_VERSION:=v1.6.3
+PKG_VERSION:=v2.1.5
 SHORT_DESCRIPTION:=Client library for gmap modules
 
-PKG_SOURCE:=libgmap-client-v1.6.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v1.6.3
-PKG_HASH:=ecd47481385996f06098a06e133ca29c10fe103aee1aca695b907c761cfe2d07
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v1.6.3
+PKG_SOURCE:=libgmap-client-v2.1.5.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v2.1.5
+PKG_HASH:=0a155dd153c122718f47a57d42dd7a958f212f7867b3c82d187aa5e829739610
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v2.1.5
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE

libs/libgmap-ext/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgmap-ext
-PKG_VERSION:=v1.0.0
+PKG_VERSION:=v1.2.2
 SHORT_DESCRIPTION:=Functionality common for gmap clients (not server)
 
-PKG_SOURCE:=libgmap-ext-v1.0.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext/-/archive/v1.0.0
-PKG_HASH:=11e489b0c3554adcd10f9fe52b1fe2f0eb91f748a54a6589b27c8189ed6cfead
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-ext-v1.0.0
+PKG_SOURCE:=libgmap-ext-v1.2.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext/-/archive/v1.2.2
+PKG_HASH:=e7c16f5a9589394c972390dc5bd28dd1ea5849fd7d18adfaea22c7619f13b32f
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-ext-v1.2.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,7 +18,7 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
+  CATEGORY:=prpl Foundation
   SUBMENU:=gMap
   TITLE:=$(SHORT_DESCRIPTION)
   URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext