Integrating gmap-mod-moca to master_v0.5.1

Issue: NET-7566 - CHR30A 4.1.7.60 Devices connected wifi showing connected coax Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: cffa8c76104d99990a9824d7dc93da6a30783150
Integrating lib_gmap-client to gen_prplos_4.1.0_v0.1.0
2025-12-20 01:20:21 +08:00 · 2025-12-19 08:47:55 +00:00 · 2025-12-19 08:47:55 +00:00 · 2025-12-19 08:47:55 +00:00 · 2025-11-27 18:23:14 +00:00 · 2025-11-26 17:43:33 +00:00
31 changed files with 416 additions and 148 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,4 @@
+---
+
+include:
+  - remote: 'https://gitlab.com/prpl-foundation/tooling/yml-templates/raw/main/.feed-pipeline.yml'
--- a/apps/gmap-client/Config.in
+++ b/apps/gmap-client/Config.in
@@ -11,13 +11,13 @@ config SAH_AMX_GMAP_CLIENT
    bool "Build the gMap client plugin"
    default y

-config SAH_AMX_GMAP_CLIENT_ORDER
+config SAH_AMX_GMAP_CLIENT_START_ORDER
    int "gMap client plugin startup order"
    default 82

-config SAH_AMX_GMAP_CLIENT_ONE_PROCESS
-    bool "All gMap client modules run in same process"
-    default n
+config SAH_AMX_GMAP_CLIENT_STOP_ORDER
+    int "gMap client plugin shutdown order"
+    default 18

 endmenu

--- a/apps/gmap-client/Makefile
+++ b/apps/gmap-client/Makefile
@@ -1,13 +1,15 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-client
-PKG_VERSION:=v1.2.0
-SHORT_DESCRIPTION:=gMap client plugin
+PKG_VERSION:=sah-next_v1.4.1
+SHORT_DESCRIPTION:=Script to start gMap clients

-PKG_SOURCE:=gmap-client-v1.2.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.2.0
-PKG_HASH:=62d61ee64e45093f080588869d780915b194dde99b52877dc10988b1d3cea82a
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.2.0
+PKG_SOURCE:=gmap-client-sah-next_v1.4.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/sah-next_v1.4.1
+PKG_HASH:=3a0c9483cc8618590fbca159852547d260f132a8ecb02056a7cd524a442fafaa
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-sah-next_v1.4.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,43 +20,37 @@ PKG_RELEASE:=1

 define SAHInit/Install
 	install -d ${PKG_INSTALL_DIR}/etc/rc.d/
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/S$(CONFIG_SAH_AMX_GMAP_CLIENT_ORDER)$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/K$(CONFIG_SAH_AMX_GMAP_CLIENT_ORDER)$(COMPONENT)
+	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/S$(CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER)$(COMPONENT)
+	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/K$(CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER)$(COMPONENT)
 endef

 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Plugins
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client
-  DEPENDS += +libamxc
-  DEPENDS += +libamxp
-  DEPENDS += +libamxd
-  DEPENDS += +libamxb
-  DEPENDS += +libamxo
-  DEPENDS += +libsahtrace
  DEPENDS += +amxrt
  MENU:=1
 endef

 define Package/$(PKG_NAME)/description
-	gMap client plugin
+	Script to start gMap clients
 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_CLIENT_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS=$(CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS))
+	$(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_CLIENT_START_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_STOP_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_CLIENT_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS=$(CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS))
+	$(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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER))

 	$(call SAHInit/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_CLIENT_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS=$(CONFIG_SAH_AMX_GMAP_CLIENT_ONE_PROCESS))
+	$(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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_START_ORDER) CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_CLIENT_STOP_ORDER))
 endef

 define Package/$(PKG_NAME)/install
--- a/apps/gmap-client/files/etc/runlevel.d/ap/10-remove-gmap-client.sh
+++ b/apps/gmap-client/files/etc/runlevel.d/ap/10-remove-gmap-client.sh
@@ -0,0 +1 @@
+opkg remove gmap-client --force-depends
--- a/apps/gmap-mod-conntrack-stats/Makefile
+++ b/apps/gmap-mod-conntrack-stats/Makefile
@@ -0,0 +1,67 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.softathome.com/ext_prpl/components/gmap-mod-conntrack-stats/-/blob/main/baf.yml instead
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-conntrack-stats
+PKG_VERSION:=v1.1.0
+SHORT_DESCRIPTION:=Module to conntrack statistics information in gMap
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v1.1.0
+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:=SoftAtHome
+  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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+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)))
--- a/apps/gmap-mod-conntrack-stats/files/etc/runlevel.d/ap/10-remove-gmap-mod-conntrack-stats.sh
+++ b/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
--- a/apps/gmap-mod-ethernet-dev/Makefile
+++ b/apps/gmap-mod-ethernet-dev/Makefile
@@ -1,13 +1,15 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-ethernet-dev
-PKG_VERSION:=v1.16.1
+PKG_VERSION:=sah-next_v1.26.0
 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.16.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.16.1
-PKG_HASH:=eb3fc700df1b58b54857dfe10b8bbe17cbfbfc47f0cb78c67ac5272d3ec0abbe
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.16.1
+PKG_SOURCE:=gmap-mod-ethernet-dev-sah-next_v1.26.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/sah-next_v1.26.0
+PKG_HASH:=99d992f164fae8a6f0e743d9351c194994af8d334ddc553da743cdea0d6c13e7
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-sah-next_v1.26.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,8 +20,8 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Applications
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev
  DEPENDS += +libamxc
@@ -32,6 +34,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libsahtrace
  DEPENDS += +libdhcpoptions
  DEPENDS += +libdiscoping
+  DEPENDS += +libnetmodel
  MENU:=1
 endef

--- a/apps/gmap-mod-ethernet-dev/files/etc/runlevel.d/ap/10-remove-gmap-mod-ethernet-dev.sh
+++ b/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
--- a/apps/gmap-mod-mdns/Makefile
+++ b/apps/gmap-mod-mdns/Makefile
@@ -1,16 +1,17 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-mdns/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-mdns
-PKG_VERSION:=v0.1.5
+PKG_VERSION:=sah-next_v0.4.0
 SHORT_DESCRIPTION:=Module to expose mdns information in gMap

-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.5
-PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-mdns.git
-PKG_MIRROR_HASH:=skip
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=gmap-mod-mdns-sah-next_v0.4.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-mdns/-/archive/sah-next_v0.4.0
+PKG_HASH:=dc75a9b950a0b06a75f0420ef3f9b216cf1d74ab9dfc1a96c0761ada3e97ccef
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-mdns-sah-next_v0.4.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:=SAH
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE


@@ -19,10 +20,10 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Applications
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-mdns
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-mdns
  DEPENDS += +libamxb
  DEPENDS += +libamxc
  DEPENDS += +libamxp
@@ -30,6 +31,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxo
  DEPENDS += +libamxs
  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
  DEPENDS += +libsahtrace
  DEPENDS += +amxrt
  MENU:=1
@@ -44,14 +46,11 @@ define Build/Compile
 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)
-	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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 endef

 define Package/$(PKG_NAME)/install
@@ -59,6 +58,9 @@ define Package/$(PKG_NAME)/install
 	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)))
--- a/apps/gmap-mod-mdns/files/etc/runlevel.d/ap/10-remove-gmap-mod-mdns.sh
+++ b/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
--- a/apps/gmap-mod-moca/Makefile
+++ b/apps/gmap-mod-moca/Makefile
@@ -0,0 +1,66 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.softathome.com/ext_prpl/components/gmap-mod-moca/-/blob/main/baf.yml instead
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-moca
+PKG_VERSION:=v0.5.1
+SHORT_DESCRIPTION:=Module to expose MoCA information in gMap
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v0.5.1
+PKG_SOURCE_URL:=https://$(SAH_GIT_USER):$(SAH_GIT_TOKEN)@$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-moca.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:=SoftAtHome
+  SUBMENU:=gMap
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-moca
+  DEPENDS += +libamxc
+  DEPENDS += +libamxd
+  DEPENDS += +libamxb
+  DEPENDS += +libamxo
+  DEPENDS += +libamxj
+  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
+  DEPENDS += +libsahtrace
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module to expose MoCA 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)))
--- a/apps/gmap-mod-moca/files/etc/runlevel.d/ap/10-remove-gmap-mod-moca.sh
+++ b/apps/gmap-mod-moca/files/etc/runlevel.d/ap/10-remove-gmap-mod-moca.sh
@@ -0,0 +1 @@
+opkg remove gmap-mod-moca --force-depends
--- a/apps/gmap-mod-name-selector/Makefile
+++ b/apps/gmap-mod-name-selector/Makefile
@@ -1,24 +1,27 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-name-selector
-PKG_VERSION:=v1.0.1
+PKG_VERSION:=sah-next_v1.1.0
 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-sah-next_v1.1.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector/-/archive/sah-next_v1.1.0
+PKG_HASH:=e06d5db18ff80849260b704837ba324904196aa86719d95c529e146ab45d4c1a
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-name-selector-sah-next_v1.1.0
 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:=Applications
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector
  DEPENDS += +gmap-server
@@ -37,25 +40,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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 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)))
--- a/apps/gmap-mod-name-selector/files/etc/runlevel.d/ap/10-remove-gmap-mod-name-selector.sh
+++ b/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
--- a/apps/gmap-mod-sahpairing/Makefile
+++ b/apps/gmap-mod-sahpairing/Makefile
@@ -0,0 +1,68 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.softathome.com/ext_prpl/components/gmap-mod-sahpairing/-/blob/main/baf.yml instead
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-sahpairing
+PKG_VERSION:=v0.2.0
+SHORT_DESCRIPTION:=Module to expose sahpairing information in gMap
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v0.2.0
+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:=SoftAtHome
+  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 CONFIG_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
+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)))
--- a/apps/gmap-mod-sahpairing/files/etc/runlevel.d/ap/10-remove-gmap-mod-sahpairing.sh
+++ b/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
--- a/apps/gmap-mod-self/Makefile
+++ b/apps/gmap-mod-self/Makefile
@@ -1,13 +1,15 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-self
-PKG_VERSION:=v1.4.4
+PKG_VERSION:=sah-next_v1.11.0
 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.4.4.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.4.4
-PKG_HASH:=0e504feb0f8464a2a5e74fef10394de5cadc4bca1917a05e32014691895288d2
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.4.4
+PKG_SOURCE:=gmap-mod-self-sah-next_v1.11.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/sah-next_v1.11.0
+PKG_HASH:=310e250366cbbd81f196e421ab3f5c524ed52081f3f82d0fb41ee83b333bdedf
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-sah-next_v1.11.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,8 +20,8 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Applications
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self
  DEPENDS += +libamxc
@@ -45,11 +47,11 @@ define Build/Compile
 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_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
+	$(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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
 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_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
+	$(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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
 endef

 define Package/$(PKG_NAME)/install
--- a/apps/gmap-mod-self/files/etc/runlevel.d/ap/10-remove-gmap-mod-self.sh
+++ b/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
--- a/apps/gmap-mod-services-db/Config.in
+++ b/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
--- a/apps/gmap-mod-services-db/Makefile
+++ b/apps/gmap-mod-services-db/Makefile
@@ -1,17 +1,19 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.softathome.com/ext_prpl/components/gmap-mod-services-db/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk
 -include $(STAGING_DIR)/components.config

 PKG_NAME:=gmap-mod-services-db
-PKG_VERSION:=v0.1.8
+PKG_VERSION:=v0.3.0
 SHORT_DESCRIPTION:=gMap component that populates the datamodel based on preconfigured grules

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.8
+PKG_SOURCE_VERSION:=v0.3.0
 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


@@ -20,8 +22,8 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Applications
+  CATEGORY:=SoftAtHome
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-services-db
  DEPENDS += +libamxc
@@ -41,15 +43,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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) 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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT) 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 +64,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)))
--- a/apps/gmap-mod-services-db/files/etc/runlevel.d/ap/10-remove-gmap-mod-services-db.sh
+++ b/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
--- a/apps/gmap-mod-upnp/Makefile
+++ b/apps/gmap-mod-upnp/Makefile
@@ -1,17 +1,17 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-upnp/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk
-include $(STAGING_DIR)/components.config

 PKG_NAME:=gmap-mod-upnp
-PKG_VERSION:=v0.2.0
+PKG_VERSION:=sah-next_v0.7.0
 SHORT_DESCRIPTION:=Module to expose upnp information in gMap

-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.2.0
-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)
+PKG_SOURCE:=gmap-mod-upnp-sah-next_v0.7.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-upnp/-/archive/sah-next_v0.7.0
+PKG_HASH:=7e1cc47fb27deef6664da8d347f77d049a0a0ee2422ebd9bdb58ddc13a09c9cc
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-upnp-sah-next_v0.7.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
-PKG_LICENSE:=SAH
+PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE


@@ -20,10 +20,10 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Applications
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-upnp
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-upnp
  DEPENDS += +libamxb
  DEPENDS += +libamxc
  DEPENDS += +libamxp
@@ -46,11 +46,11 @@ define Build/Compile
 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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 endef

 define Package/$(PKG_NAME)/install
--- a/apps/gmap-mod-upnp/files/etc/runlevel.d/ap/10-remove-gmap-mod-upnp.sh
+++ b/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
--- a/apps/gmap-server/Config.in
+++ b/apps/gmap-server/Config.in
@@ -11,17 +11,13 @@ config SAH_AMX_GMAP_SERVER
    bool "Build gMap server"
    default y

-config SAH_AMX_GMAP_SERVER_ORDER
+config SAH_AMX_GMAP_SERVER_START_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
+config SAH_AMX_GMAP_SERVER_STOP_ORDER
+    int "gMap server plugin shutdown order"
+    default 29

 endmenu

--- a/apps/gmap-server/Makefile
+++ b/apps/gmap-server/Makefile
@@ -1,13 +1,15 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-server
-PKG_VERSION:=v2.2.16
+PKG_VERSION:=sah-next_v3.10.3
 SHORT_DESCRIPTION:=Service implementing the gmap data model

-PKG_SOURCE:=gmap-server-v2.2.16.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.2.16
-PKG_HASH:=184215e854614512d2795481de35f3e39ef2d99ab02ca43d8081cc0bb165146a
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.2.16
+PKG_SOURCE:=gmap-server-sah-next_v3.10.3.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/sah-next_v3.10.3
+PKG_HASH:=71e2ced55ee6ec94427b3479a47719e4b92a2060a91a86266478149f7e76f941
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-sah-next_v3.10.3
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -15,28 +17,18 @@ 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/
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/S$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/K$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT)
-endef
-
-define SAHBackupRestore/Install
-	install -d ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/backup
-	install -d ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore
-	install -d ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/backup/B$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore/R$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import/R$(CONFIG_SAH_AMX_GMAP_SERVER_ORDER)$(COMPONENT)
+	install -d $(1)/etc/rc.d/
+	ln -sfr $(1)/etc/init.d/$(COMPONENT) $(1)/etc/rc.d/S$(CONFIG_SAH_AMX_GMAP_SERVER_START_ORDER)$(COMPONENT)
+	ln -sfr $(1)/etc/init.d/$(COMPONENT) $(1)/etc/rc.d/K$(CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER)$(COMPONENT)
 endef

 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Applications
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server
  DEPENDS += +libamxc
@@ -44,9 +36,11 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxp
  DEPENDS += +libamxb
  DEPENDS += +libamxo
+  DEPENDS += +libamxs
  DEPENDS += +libgmap-client
  DEPENDS += +libsahtrace
  DEPENDS += +libuuid
+  DEPENDS += +mod-pcm-svc
  MENU:=1
 endef

@@ -55,18 +49,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_START_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_START_ORDER) CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_STOP_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_START_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_START_ORDER) CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER))

-	$(call SAHInit/Install)
-	$(call SAHBackupRestore/Install)
+	$(call SAHInit/Install,$(PKG_INSTALL_DIR))
 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_START_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_START_ORDER) CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER=$(CONFIG_SAH_AMX_GMAP_SERVER_STOP_ORDER))
+	$(call SAHInit/Install,$(STAGING_DIR))
 endef

 define Package/$(PKG_NAME)/install
--- a/apps/gmap-server/files/etc/runlevel.d/ap/10-remove-gmap-server.sh
+++ b/apps/gmap-server/files/etc/runlevel.d/ap/10-remove-gmap-server.sh
@@ -0,0 +1 @@
+opkg remove gmap-server --force-depends
--- a/configs/gmap-mibs-common/Makefile
+++ b/configs/gmap-mibs-common/Makefile
@@ -1,13 +1,15 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mibs-common
-PKG_VERSION:=v0.14.0
+PKG_VERSION:=sah-next_v0.26.2
 SHORT_DESCRIPTION:=Generic mib files for the gmap service

-PKG_SOURCE:=gmap-mibs-common-v0.14.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.14.0
-PKG_HASH:=22f390e457ce5067eaf0f604a630647ea58b7285fee1a58ebe3b2a9d61a86ab1
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.14.0
+PKG_SOURCE:=gmap-mibs-common-sah-next_v0.26.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/sah-next_v0.26.2
+PKG_HASH:=866e1dd5eb88727efa2f1158ab507297cd669020e265fde2e258c2a0365c69e4
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-sah-next_v0.26.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,8 +20,8 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Configurations
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common
  DEPENDS += +gmap-server
@@ -27,11 +29,14 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxp
  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

@@ -44,11 +49,11 @@ define Build/Compile
 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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 endef

 define Package/$(PKG_NAME)/install
--- a/configs/gmap-mibs-common/files/etc/runlevel.d/ap/10-remove-gmap-mibs-common.sh
+++ b/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
--- a/libs/libgmap-client/Config.in
+++ b/libs/libgmap-client/Config.in
@@ -0,0 +1,20 @@
+config PACKAGE_libgmap-client
+    tristate
+    select SAH_LIB_GMAP-CLIENT
+
+if PACKAGE_libgmap-client
+
+menu "Select libgmap-client build options"
+    depends on PACKAGE_libgmap-client
+
+config SAH_LIB_GMAP-CLIENT
+    bool "Build libgmap-client"
+    default y
+
+config SAH_LIB_GMAP-CLIENT_SOP
+    bool "Build the libgmap-client library for SOP"
+    default n
+
+endmenu
+
+endif
--- a/libs/libgmap-client/Makefile
+++ b/libs/libgmap-client/Makefile
@@ -1,13 +1,15 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libgmap-client
-PKG_VERSION:=v1.6.0
+PKG_VERSION:=sah-next-4.1_v0.1.0
 SHORT_DESCRIPTION:=Client library for gmap modules

-PKG_SOURCE:=libgmap-client-v1.6.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v1.6.0
-PKG_HASH:=e1b924d6826b2682f6c293494443fe8fc55e854c5bb924038134405e036247fe
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v1.6.0
+PKG_SOURCE:=libgmap-client-sah-next-4.1_v0.1.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/sah-next-4.1_v0.1.0
+PKG_HASH:=f4365909fe3e095e25e8fe3d5b783d1682e52a5226a81390470110a16503ef74
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-sah-next-4.1_v0.1.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,8 +20,8 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Libraries
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client
  DEPENDS += +libamxc
--- a/libs/libgmap-ext/Makefile
+++ b/libs/libgmap-ext/Makefile
@@ -1,13 +1,15 @@
+# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
+# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libgmap-ext
-PKG_VERSION:=v1.0.0
+PKG_VERSION:=sah-next_v1.6.0
 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-sah-next_v1.6.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext/-/archive/sah-next_v1.6.0
+PKG_HASH:=be6524d929b3217293cac7b375a08ce71e391435da3fbd2d0e0ef3139282c774
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-ext-sah-next_v1.6.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,8 +20,8 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
-  CATEGORY:=gmap
-  SUBMENU:=Libraries
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext
  DEPENDS += +libamxc
@@ -41,11 +43,11 @@ define Build/Compile
 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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 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_GATEWAY=$(CONFIG_GATEWAY) CONFIG_ACCESSPOINT=$(CONFIG_ACCESSPOINT))
 endef

 define Package/$(PKG_NAME)/install
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mod-conntrack-stats --force-depends`
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mod-ethernet-dev --force-depends`
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mod-name-selector --force-depends`
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mod-sahpairing --force-depends`
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mod-services-db --force-depends`
				`@@ -0,0 +1 @@`
				`opkg remove gmap-mibs-common --force-depends`