Integrating gmap-mibs-common to master_v0.19.2

Issue: NET-5464 set 'Portable' as default value of 'Mobility' parameter GitOrigin-RevId: 35476a2aa85d8e97259bad40b4bcb08f3d5b853f
Integrating gmap-mibs-common to master_v0.19.1
2026-01-07 23:01:39 +08:00 · 2024-01-30 15:04:33 +00:00 · 2024-01-24 09:16:42 +00:00 · 2024-01-18 16:03:03 +00:00 · 2024-01-18 16:03:03 +00:00 · 2024-01-16 19:18:29 +00:00
16 changed files with 608 additions and 128 deletions
--- a/README.md
+++ b/README.md
@@ -1,13 +0,0 @@
-# OpenWrt/LEDE packages for gmap components
-Soft At Home Feed of Openwrt/LEDE packages for gmap components
-
-## How to add the gmap Feed to you OpenWrt/LEDE build
-At the root of your OpenWrt/LEDE tree, add the following to your `feeds.conf` file:
-```sh
-src-git feed_gmap https://gitlab.com/soft.at.home/buildsystems/openwrt/feed_gmap.git;master
-```
-Now to add the packages on your gmap feed to your OpenWrt/LEDE instance:
-```sh
-./scripts/feeds update feed_gmap #retrieve the gmap feed from service/update to latest
-./scripts/feeds install -p feed_gmap #make all of the gmap feed packages available to the build
-```
--- a/apps/gmap-client/Config.in
+++ b/apps/gmap-client/Config.in
@@ -0,0 +1,24 @@
+config PACKAGE_gmap-client
+    tristate
+    select SAH_AMX_GMAP_CLIENT
+
+if PACKAGE_gmap-client
+
+menu "Select gmap-client build options"
+    depends on PACKAGE_gmap-client
+
+config SAH_AMX_GMAP_CLIENT
+    bool "Build the gMap client plugin"
+    default y
+
+config SAH_AMX_GMAP_CLIENT_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
+
+endmenu
+
+endif
--- a/apps/gmap-client/Makefile
+++ b/apps/gmap-client/Makefile
@@ -0,0 +1,74 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmap-client
+PKG_VERSION:=v1.2.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_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
+PKG_LICENSE:=BSD-2-Clause-Patent
+PKG_LICENSE_FILES:=LICENSE
+
+COMPONENT:=gmap-client
+
+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)
+endef
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  CATEGORY:=gmap
+  SUBMENU:=Plugins
+  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
+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))
+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 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))
+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
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/apps/gmap-mod-ethernet-dev/Makefile
+++ b/apps/gmap-mod-ethernet-dev/Makefile
@@ -1,51 +1,37 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-ethernet-dev
-PKG_VERSION:=v0.0.4
+PKG_VERSION:=v1.18.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-v0.0.4.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-ethernet-dev/-/archive/v0.0.4
-PKG_HASH:=124e3f1781f2b54b3ce30588d03c51a0dff407bf88c0ad7a00a0dbc92c81d9d7
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v0.0.4
+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_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE

-COMPONENT:=gmap-mod-ethernet-dev

 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/S73$(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/B10$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore/R10$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import/R10$(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/soft.at.home/gmap/applications/gmap-mod-ethernet-dev
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev
  DEPENDS += +libamxc
  DEPENDS += +libamxd
-  DEPENDS += +libamxj
-  DEPENDS += +libamxp
  DEPENDS += +libamxb
  DEPENDS += +libamxo
-  DEPENDS += +libmnl
+  DEPENDS += +libamxj
  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
  DEPENDS += +libsahtrace
+  DEPENDS += +libdhcpoptions
+  DEPENDS += +libdiscoping
  MENU:=1
 endef

@@ -54,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 SAHInit/Install)
-	$(call SAHBackupRestore/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) 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
+	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/Makefile
+++ b/apps/gmap-mod-mdns/Makefile
@@ -0,0 +1,64 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmap-mod-mdns
+PKG_VERSION:=v0.1.5
+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_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-mdns
+  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 expose mdns 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)
+	find $(PKG_INSTALL_DIR) -name *.a -exec rm {} +;
+	find $(PKG_INSTALL_DIR) -name *.h -exec rm {} +;
+	find $(PKG_INSTALL_DIR) -name *.pc -exec rm {} +;
+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
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/apps/gmap-mod-name-selector/Makefile
+++ b/apps/gmap-mod-name-selector/Makefile
@@ -0,0 +1,61 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmap-mod-name-selector
+PKG_VERSION:=v1.0.1
+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_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://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector
+  DEPENDS += +gmap-server
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxb
+  DEPENDS += +libsahtrace
+  DEPENDS += +libamxo
+  DEPENDS += +libgmap-client
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Name selection module for gmap
+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)
+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 {} +;
+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)
+endef
+
+define Package/$(PKG_NAME)/install
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/apps/gmap-mod-self/Config.in
+++ b/apps/gmap-mod-self/Config.in
@@ -0,0 +1,20 @@
+config PACKAGE_gmap-mod-self
+    tristate
+    select SAH_SERVICES_GMAP-SELF
+
+if PACKAGE_gmap-mod-self
+
+menu "Select gmap-mod-self build options"
+    depends on PACKAGE_gmap-mod-self
+
+config SAH_SERVICES_GMAP-SELF
+    bool "Application for filling in the device's and it's interfaces information"
+    default y
+
+config SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER
+    bool "gmap-self runs on a wifi repeater"
+    default n
+
+endmenu
+
+endif
--- a/apps/gmap-mod-self/Makefile
+++ b/apps/gmap-mod-self/Makefile
@@ -1,77 +1,69 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-self
-PKG_VERSION:=v0.0.9
-SHORT_DESCRIPTION:=gmap module to fetch information about the hgw itself and the layer 2 'devices' on it
+PKG_VERSION:=v1.5.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-v0.0.9.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self/-/archive/v0.0.9
-PKG_HASH:=0663725434372d6e5452bf96ac7923eee24899095c61f54a0208bd629ed75ec5
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v0.0.9
+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_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE

-COMPONENT:=gmap-mod-self

 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/S72$(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/B10$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore/R10$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import/R10$(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/soft.at.home/gmap/applications/gmap-mod-self
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self
  DEPENDS += +libamxc
  DEPENDS += +libamxj
  DEPENDS += +libamxd
  DEPENDS += +libamxp
  DEPENDS += +libamxb
  DEPENDS += +libamxo
+  DEPENDS += +libamxs
  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
  DEPENDS += +libsahtrace
+  DEPENDS += +libnetmodel
  MENU:=1
 endef

 define Package/$(PKG_NAME)/description
-	gmap module to fetch information about the hgw itself and the layer 2 'devices' on it
+	gmap module to fetch information about the hgw/repeater itself and the layer 2 'devices' on it
 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 CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
 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 SAHInit/Install)
-	$(call SAHBackupRestore/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))
 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_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER=$(CONFIG_SAH_SERVICES_GMAP_SELF_DEVTYPE_WIFIREPEATER))
 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
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
 endef

 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/apps/gmap-mod-services-db/Makefile
+++ b/apps/gmap-mod-services-db/Makefile
@@ -0,0 +1,65 @@
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-services-db
+PKG_VERSION:=v0.1.9
+SHORT_DESCRIPTION:=gMap component that populates the datamodel based on preconfigured grules
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v0.1.9
+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_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-services-db
+  DEPENDS += +libamxc
+  DEPENDS += +libamxb
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libamxj
+  DEPENDS += +libgmap-client
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	gMap component that populates the datamodel based on preconfigured grules
+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-upnp/Makefile
+++ b/apps/gmap-mod-upnp/Makefile
@@ -0,0 +1,66 @@
+include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config
+
+PKG_NAME:=gmap-mod-upnp
+PKG_VERSION:=v0.2.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_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-upnp
+  DEPENDS += +libamxb
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libamxs
+  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
+  DEPENDS += +libsahtrace
+  DEPENDS += +amxrt
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Module to expose upnp 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-server/Config.in
+++ b/apps/gmap-server/Config.in
@@ -0,0 +1,28 @@
+config PACKAGE_gmap-server
+    tristate
+    select SAH_AMX_GMAP_SERVER
+
+if PACKAGE_gmap-server
+
+menu "Select gmap-server build options"
+    depends on PACKAGE_gmap-server
+
+config SAH_AMX_GMAP_SERVER
+    bool "Build gMap server"
+    default y
+
+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
--- a/apps/gmap-server/Makefile
+++ b/apps/gmap-server/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-server
-PKG_VERSION:=v0.1.0
+PKG_VERSION:=v2.4.0
 SHORT_DESCRIPTION:=Service implementing the gmap data model

-PKG_SOURCE:=gmap-server-v0.1.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-server/-/archive/v0.1.0
-PKG_HASH:=b421a1815ef7b26952842e6a66d6d1347f8472d8ce6984eea70444dc323d96b6
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v0.1.0
+PKG_SOURCE:=gmap-server-v2.4.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.4.0
+PKG_HASH:=9cf595e9be2b27db6e48999356050b659f05a03262daa0da526517bbd9ab2f4a
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.4.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -15,34 +15,38 @@ 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/S71$(COMPONENT)
+	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/B10$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore/R10$(COMPONENT)
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import/R10$(COMPONENT)
+	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)
 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/soft.at.home/gmap/applications/gmap-server
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server
  DEPENDS += +libamxc
  DEPENDS += +libamxd
  DEPENDS += +libamxp
  DEPENDS += +libamxb
  DEPENDS += +libamxo
  DEPENDS += +libgmap-client
+  DEPENDS += +libsahtrace
+  DEPENDS += +libuuid
  MENU:=1
 endef

@@ -51,25 +55,32 @@ 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 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))
 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_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 SAHInit/Install)
 	$(call SAHBackupRestore/Install)
 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_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))
 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
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
 endef

 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/configs/gmap-mibs-common/Makefile
+++ b/configs/gmap-mibs-common/Makefile
@@ -1,27 +1,38 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mibs-common
-PKG_VERSION:=v0.1.1
+PKG_VERSION:=v0.19.2
 SHORT_DESCRIPTION:=Generic mib files for the gmap service

-PKG_SOURCE:=gmap-mibs-common-v0.1.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/mibs/gmap-mibs-common/-/archive/v0.1.1
-PKG_HASH:=8df8fd1a5a90935d0bc38d735921dff4b69ac8bc1cce9ad090c1b42163fb63a5
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.1.1
+PKG_SOURCE:=gmap-mibs-common-v0.19.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.19.2
+PKG_HASH:=c25e9998456cdd3daef08876c8627ddd75343cb896697094298abef63d5243dc
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.19.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
-  SUBMENU:=Configurations
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://gitlab.com/soft.at.home/gmap/mibs/gmap-mibs-common
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common
  DEPENDS += +gmap-server
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxd
+  DEPENDS += +libamxb
+  DEPENDS += +libamxj
+  DEPENDS += +libsahtrace
+  DEPENDS += +libamxo
+  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
+  DEPENDS += +mod-dmext
  MENU:=1
 endef

@@ -30,22 +41,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
+	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/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,29 +1,33 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libgmap-client
-PKG_VERSION:=v0.1.6
+PKG_VERSION:=v1.6.3
 SHORT_DESCRIPTION:=Client library for gmap modules

-PKG_SOURCE:=libgmap-client-v0.1.6.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client/-/archive/v0.1.6
-PKG_HASH:=c9b5537d6fff041894689809a006e8548ecabf8d854f5913c21f7da6069fff23
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v0.1.6
+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_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:=Libraries
+  CATEGORY:=prpl Foundation
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client
+  URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client
  DEPENDS += +libamxc
+  DEPENDS += +libamxo
  DEPENDS += +libamxp
  DEPENDS += +libamxb
+  DEPENDS += +libamxd
+  DEPENDS += +libsahtrace
  MENU:=1
 endef

@@ -32,22 +36,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
+	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/libs/libgmap-ext/Makefile
+++ b/libs/libgmap-ext/Makefile
@@ -0,0 +1,61 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libgmap-ext
+PKG_VERSION:=v1.0.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_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://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext
+  DEPENDS += +libamxc
+  DEPENDS += +libamxp
+  DEPENDS += +libamxb
+  DEPENDS += +libamxd
+  DEPENDS += +libamxo
+  DEPENDS += +libsahtrace
+  DEPENDS += +libgmap-client
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Functionality common for gmap clients (not server)
+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)))