Integrating gmap-mod-ethernet-dev to master_v1.17.1

Issue: NET-5319 Fix ipv4 discoping not robust when low gmap/system performance [fix] GitOrigin-RevId: 310f99a95566f0f23e0f3ea820fcd74fda7317b1
Integrating gmap-mod-self to master_v1.4.5
2026-01-14 20:43:28 +08:00 · 2024-01-09 11:00:43 +00:00 · 2024-01-09 11:00:43 +00:00 · 2024-01-08 13:43:39 +00:00 · 2024-01-08 07:32:09 +00:00 · 2024-01-08 07:32:09 +00:00
13 changed files with 110 additions and 77 deletions
--- a/apps/gmap-client/Config.in
+++ b/apps/gmap-client/Config.in
@@ -17,7 +17,7 @@ config SAH_AMX_GMAP_CLIENT_ORDER

 config SAH_AMX_GMAP_CLIENT_ONE_PROCESS
    bool "All gMap client modules run in same process"
-    default y
+    default n

 endmenu

--- a/apps/gmap-client/Makefile
+++ b/apps/gmap-client/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-client
-PKG_VERSION:=v1.1.1
+PKG_VERSION:=v1.2.1
 SHORT_DESCRIPTION:=gMap client plugin

-PKG_SOURCE:=gmap-client-v1.1.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.1.1
-PKG_HASH:=c77f3a38651ae5a848479bb682c8bf750617935e178b2ec381da22b116f614f1
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.1.1
+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
@@ -36,7 +36,6 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxo
  DEPENDS += +libsahtrace
  DEPENDS += +amxrt
-  DEPENDS += +gmap-server
  MENU:=1
 endef

@@ -49,16 +48,13 @@ define Build/Compile
 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 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))
-	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_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) 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_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
@@ -66,6 +62,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

 define Package/$(PKG_NAME)/config
--- a/apps/gmap-mod-ethernet-dev/Makefile
+++ b/apps/gmap-mod-ethernet-dev/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-ethernet-dev
-PKG_VERSION:=v1.15.0
+PKG_VERSION:=v1.17.1
 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.15.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.15.0
-PKG_HASH:=b7e8734dd7e43fbe39de6895d96b14b2931fc1b74288c2ff170b74c5b6971132
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.15.0
+PKG_SOURCE:=gmap-mod-ethernet-dev-v1.17.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.17.1
+PKG_HASH:=1c795de1644d66554524531460b5cbed1686d49d8d55372c1d51d6d42b018760
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.17.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,8 +18,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
@@ -45,9 +45,6 @@ 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
@@ -59,6 +56,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/Makefile
+++ b/apps/gmap-mod-mdns/Makefile
@@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
  CATEGORY:=gmap
-  SUBMENU:=Applications
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-mdns
  DEPENDS += +libamxb
--- a/apps/gmap-mod-name-selector/Makefile
+++ b/apps/gmap-mod-name-selector/Makefile
@@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
  CATEGORY:=gmap
-  SUBMENU:=Applications
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector
  DEPENDS += +gmap-server
--- a/apps/gmap-mod-self/Makefile
+++ b/apps/gmap-mod-self/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gmap-mod-self
-PKG_VERSION:=v1.4.1
+PKG_VERSION:=v1.4.5
 SHORT_DESCRIPTION:=gmap module to fetch information about the hgw/repeater itself and the layer 2 'devices' on it

-PKG_SOURCE:=gmap-mod-self-v1.4.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.4.1
-PKG_HASH:=8a2f74b7689ef247ecaa91d36c51758ce8e34e91ddf2eb71d2e5836e053bdd3e
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.4.1
+PKG_SOURCE:=gmap-mod-self-v1.4.5.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.4.5
+PKG_HASH:=3352786e5b213c17194e1ea788c3728e53c0c8e44bc7a300f29954395c9b1aac
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.4.5
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,8 +18,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
@@ -30,6 +30,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxo
  DEPENDS += +libamxs
  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
  DEPENDS += +libsahtrace
  DEPENDS += +libnetmodel
  MENU:=1
@@ -45,9 +46,6 @@ 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))
-	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
@@ -59,6 +57,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

 define Package/$(PKG_NAME)/config
--- a/apps/gmap-mod-services-db/Makefile
+++ b/apps/gmap-mod-services-db/Makefile
@@ -2,10 +2,11 @@ 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.7
+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)
@@ -20,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
  CATEGORY:=gmap
-  SUBMENU:=Applications
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-services-db
  DEPENDS += +libamxc
--- a/apps/gmap-mod-upnp/Makefile
+++ b/apps/gmap-mod-upnp/Makefile
@@ -1,16 +1,17 @@
 include $(TOPDIR)/rules.mk
+-include $(STAGING_DIR)/components.config

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

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.5
+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:=
+PKG_LICENSE:=SAH
 PKG_LICENSE_FILES:=LICENSE


@@ -20,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
  CATEGORY:=gmap
-  SUBMENU:=Applications
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://$(SAH_GIT)/$(SAH_GIT_GROUP)/gmap-mod-upnp
  DEPENDS += +libamxb
@@ -30,6 +31,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxo
  DEPENDS += +libamxs
  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
  DEPENDS += +libsahtrace
  DEPENDS += +amxrt
  MENU:=1
@@ -45,9 +47,6 @@ 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
@@ -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-server/Makefile
+++ b/apps/gmap-server/Makefile
@@ -1,12 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=gmap-server-v2.2.10.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.2.10
-PKG_HASH:=c6c48203b761edf6527deea46c7c3a2745ca43c86f33103066dd2a9c230cddca
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.2.10
+PKG_SOURCE:=gmap-server-v2.2.18.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v2.2.18
+PKG_HASH:=676eff4db9b8684fda76e32d70a760f46b3b178d39df9c1a17fa881c85b08b71
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v2.2.18
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -34,8 +35,8 @@ 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
--- a/configs/gmap-mibs-common/Makefile
+++ b/configs/gmap-mibs-common/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=gmap-mibs-common-v0.11.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.11.0
-PKG_HASH:=skip
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.11.0
+PKG_SOURCE:=gmap-mibs-common-v0.16.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.16.0
+PKG_HASH:=2e93e3f285613cf0c844f4f1995e4edc6d19c5c6a86a281a61666ea954e2129b
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.16.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -18,8 +18,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,9 +27,12 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxp
  DEPENDS += +libamxd
  DEPENDS += +libamxb
+  DEPENDS += +libamxj
  DEPENDS += +libsahtrace
  DEPENDS += +libamxo
  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
+  DEPENDS += +mod-dmext
  MENU:=1
 endef

@@ -43,9 +46,6 @@ 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
@@ -57,6 +57,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/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,12 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=libgmap-client-v1.5.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v1.5.3
-PKG_HASH:=7adb25b5daaeed99ec0459a74b84d3a45dcd86ec461eeb4508f47f39f83aa7d8
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v1.5.3
+PKG_SOURCE:=libgmap-client-v1.6.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v1.6.2
+PKG_HASH:=a0fe8426e5179355da9c7039cfef24cf5a8887f33f15e304e29f2214e4132d51
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v1.6.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -17,8 +18,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
@@ -35,15 +36,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_LIB_GMAP-CLIENT_SOP=$(CONFIG_SAH_LIB_GMAP-CLIENT_SOP))
 endef

 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_LIB_GMAP-CLIENT_SOP=$(CONFIG_SAH_LIB_GMAP-CLIENT_SOP))
 endef

 define Build/InstallDev
-	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_SAH_LIB_GMAP-CLIENT_SOP=$(CONFIG_SAH_LIB_GMAP-CLIENT_SOP))
 endef

 define Package/$(PKG_NAME)/install
@@ -56,4 +57,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/libs/libgmap-ext/Makefile
+++ b/libs/libgmap-ext/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libgmap-ext
-PKG_VERSION:=v0.8.0
+PKG_VERSION:=v1.0.0
 SHORT_DESCRIPTION:=Functionality common for gmap clients (not server)

-PKG_SOURCE:=libgmap-ext-v0.8.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext/-/archive/v0.8.0
-PKG_HASH:=f2b2c5e66595bac74c4436ac978354be56a6913e204a4e57cd51418ab1d8fc8b
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-ext-v0.8.0
+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
@@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
  CATEGORY:=gmap
-  SUBMENU:=Libraries
+  SUBMENU:=gMap
  TITLE:=$(SHORT_DESCRIPTION)
  URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-ext
  DEPENDS += +libamxc
@@ -28,6 +28,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxd
  DEPENDS += +libamxo
  DEPENDS += +libsahtrace
+  DEPENDS += +libgmap-client
  MENU:=1
 endef

@@ -41,9 +42,6 @@ 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
@@ -55,6 +53,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)))
Author	SHA1	Message	Date
sahbot	deee66b01f	Integrating gmap-mod-ethernet-dev to master_v1.17.1 Issue: NET-5319 Fix ipv4 discoping not robust when low gmap/system performance [fix] GitOrigin-RevId: 310f99a95566f0f23e0f3ea820fcd74fda7317b1	2024-01-09 11:00:43 +00:00
sahbot	0e86d68c21	Integrating gmap-mod-self to master_v1.4.5 Issue: NET-5319 Fix ipv4 discoping not robust when low gmap/system performance [fix] GitOrigin-RevId: 76cf5cf16f5e5134a472b26447fd4aa7a69dcdfb	2024-01-09 11:00:43 +00:00
sahbot	5df202fd0e	Integrating gmap-mod-ethernet-dev to master_v1.17.0 Issue: NET-5347 One query instead of two overlapping ones GitOrigin-RevId: 36868275d703a33b8f429d58f31336e90f079141	2024-01-08 13:43:39 +00:00
sahbot	fedafebae9	Integrating libgmap-client to master_v1.6.2 Issue: NET-5413 [ServiceID] Make ServiceID work with SOP GMAP[change] GitOrigin-RevId: 5e2d6d8a380a0c7957d4dd469ddacb4dd3edd464	2024-01-08 07:32:09 +00:00
sahbot	048f653729	Integrating gmap-mibs-common to master_v0.16.0 Issue: NET-5415 Load location config on location mib load GitOrigin-RevId: 2574ea3b6af43eadf72d477db862ee0885748936	2024-01-08 07:32:09 +00:00
sahbot	4f657c99f7	Integrating gmap-mibs-common to master_v0.15.4 Issue: NET-5381 [gmap][mibs][useragent] the contructor in the mib should be changed to an entry-point GitOrigin-RevId: 28c87bdab7c14a481622e24d22c9671e68aa7c2f	2023-12-18 20:35:14 +00:00
sahbot	9aaa810696	Integrating gmap-mibs-common to master_v0.15.3 Issue: NET-5391 Added fetchFingerprints api to prpl Issue: NET-5392 [gmap][ethNetDev] MaxBitrateSupported type needs to be changed to signed GitOrigin-RevId: ed18316f84c42c6e1170b0f8d9693d8821ec4f6e	2023-12-16 09:32:00 +00:00
sahbot	e6afe0a56e	Integrating gmap-mibs-common to master_v0.15.1 Issue: NET-5381 [gmap][mibs][useragent] the contructor in the mib should be changed to an entry-point GitOrigin-RevId: 2f31df4e2e20ac216e8307b2308bed15fadbf30b	2023-12-15 13:01:02 +00:00
sahbot	733b8da3a8	Integrating gmap-mod-services-db to master_v0.1.9 Issue: NET-5365 Reduce grules files to bare minimum GitOrigin-RevId: c1167a263803e868ec647737e0544b33a11b27df	2023-12-08 17:38:52 +00:00
sahbot	f54b9b9beb	Integrating gmap-mibs-common to master_v0.15.0 Issue: NET-5252 [BDD] Create an mdns parser module in AMX GitOrigin-RevId: 06463d9dfb357c4970612f540d613d2688ec9e78	2023-12-08 17:38:52 +00:00
sahbot	98e67e8e5b	Integrating gmap-server to master_v2.2.18 Issue: NET-5295 Fix performance problem of re-evaluating query expressions too often GitOrigin-RevId: 3aa7032221625ec4d3a7561c45fe6e679dcf23d1	2023-12-06 17:39:29 +00:00
sahbot	f7e8e30cea	Issue: HOP-5121 Align SUBMENU and CATEGORY with feed-prpl GitOrigin-RevId: 35ae0307da29b626474385eca2167c152a095414	2023-11-24 13:36:10 +00:00
sahbot	0d2f388e74	Integrating gmap-client to master_v1.2.1 Issue: SSW-7268 create a restart target for amx process monitor GitOrigin-RevId: 1859f76cec456950048999889808b0df1d3141c8	2023-11-20 09:52:59 +00:00
sahbot	1fce4f6152	Integrating libgmap-client to master_v1.6.1 Issue: NET-5302 Increase timeout GitOrigin-RevId: d4664501f09a17367b022c8007839050daa330cc	2023-11-20 09:52:59 +00:00
sahbot	df2ffec8ff	Integrating gmap-mod-self to master_v1.4.4 Issue: NET-5269 Create wifi vaps in gmap-mod-self GitOrigin-RevId: bbf9a9918e50bf152a4120c65a41d77473f28acc	2023-11-15 20:16:35 +00:00
sahbot	ce3bcffb8b	Integrating gmap-mod-ethernet-dev to master_v1.16.1 Issue: NET-5269 Support wifi devices + also update Active on link error GitOrigin-RevId: 6ec75bab01f2769dca76391bf2453ac73cddc431	2023-11-15 20:16:35 +00:00
sahbot	431527d27e	Integrating gmap-mibs-common to master_v0.14.0 Issue: NET-5251 Move Locations config to config level and add CustomLocation at device level GitOrigin-RevId: 8eb2a321120564cb9688240b2e66f0419d7554de	2023-11-13 18:22:32 +00:00
sahbot	fe3035a003	Integrating gmap-mibs-common to master_v0.13.0 Issue: NET-5249 Add Mobility parameter GitOrigin-RevId: 5864499be9ca9d5936780173dd3888e847b64b95	2023-11-11 08:24:19 +00:00
sahbot	a8bc499172	Integrating gmap-mod-self to master_v1.4.3 Issue: NET-4320 [amx][gmap] move non-generic functions out of lib_gmap-client Issue: NET-5267 Fix gmap-mod-self dependencies GitOrigin-RevId: ef574ea7600ab0ce0d0213be94d4b9266183fd9e	2023-11-09 12:25:51 +00:00
sahbot	c737bc0c2d	Integrating gmap-client to master_v1.2.0 Issue: NET-5140 Use separate process per module by default GitOrigin-RevId: 2e56751c5d7983794da3a471de55d52f9e21ef75	2023-11-09 12:25:51 +00:00
sahbot	eecf658e83	Integrating gmap-mod-ethernet-dev to master_v1.16.0 Issue: NET-4320 [amx][gmap] move non-generic functions out of lib_gmap-client add libgmap-ext dep GitOrigin-RevId: 40cb1f8a381750fbc03b92fc348b1dcfd9c5e12f	2023-11-09 12:25:51 +00:00
sahbot	df8fc74939	Integrating gmap-mibs-common to master_v0.12.0 Issue: NET-4320 [amx][gmap] move non-generic functions out of lib_gmap-client GitOrigin-RevId: f05f502fb10e67dff5955836973b29dcfd5d50ff	2023-11-09 12:25:50 +00:00
sahbot	5b8781b4a4	Integrating gmap-mod-upnp to master_v0.2.0 Issue: NET-4320 [amx][gmap] move non-generic functions out of lib_gmap-client GitOrigin-RevId: 88882b961028427cf9a4d7083ba7aa7a079ec61f	2023-11-09 12:25:50 +00:00
sahbot	1e3efc93af	Integrating libgmap-ext to master_v1.0.0 Issue: NET-4320 [amx][gmap] move non-generic functions out of lib_gmap-client GitOrigin-RevId: 43c89cd14786c3cf61ce2ceb5870dd98eab1acd9	2023-11-09 12:25:50 +00:00
sahbot	3c95f5e02a	Integrating libgmap-client to master_v1.6.0 Issue: NET-4320 [amx][gmap] move non-generic functions out of lib_gmap-client remove ip funtions GitOrigin-RevId: 0a711b8e6d96ad546e6e3bf7b69bfa82e9791b8b	2023-11-09 12:25:50 +00:00
sahbot	28ab0a8759	Integrating gmap-mod-upnp to master_v0.1.9 Issue: NET-5219 [GMAP] Server parameter is missing for upnp devices GitOrigin-RevId: 7adcbb98b9e6762734a76a8c81673654f0521577	2023-10-25 08:15:09 +00:00
sahbot	9832130f14	Integrating gmap-server to master_v2.2.16 Issue: NET-5206 Move DeviceType from gmap server to information mib GitOrigin-RevId: cfe9dec7a60011fdefa2aa6aafbe51d28281581b	2023-10-24 08:26:53 +00:00
sahbot	f578d8dcda	Integrating gmap-client to master_v1.1.2 Issue: SSW-6789 [LCM] add all feed wifi services components to the wifion lcm app GitOrigin-RevId: 25d50aa64f82bc6bc52041d745d4c523cec17ddd	2023-10-24 08:26:53 +00:00
sahbot	29c6c1997f	Integrating gmap-server to master_v2.2.15 Issue: NET-5212 [gMAP] [Prpl] Tag parsing not working as expected GitOrigin-RevId: fb373c0cb3ecf7fcf180809cf5499d27e57f0a5f	2023-10-20 19:16:44 +00:00
sahbot	6cb75b0f05	Integrating gmap-mod-ethernet-dev to master_v1.15.1 Issue: NET-5209 Change bridgetable Active priority to 50 GitOrigin-RevId: a972bca2c0494dbeb049b84a0b57bb5fd71d28d1	2023-10-20 06:40:12 +00:00
sahbot	5902bffd51	Integrating gmap-mod-upnp to master_v0.1.8 Issue: NET-5083 [gmap] [self] [mod] Self can be started after the modules, causing some detection issues. Issue: NET-5158 [gmap][mod-upnp] Not use the UDN as Alias anymore, only index Issue: NET-5217 [gmap][mod-upnp] Fill the ModelName parameter GitOrigin-RevId: f5abde5136438ba724a789335962610e0f14b3d0	2023-10-20 06:40:12 +00:00
sahbot	728ef1caa5	Integrating gmap-mibs-common to master_v0.11.2 Issue: NET-5182 Add multi-instance objects for missing bdd parameters GitOrigin-RevId: 8c094d8173e54d981a6ba4ca3e4f3a926974c5e5	2023-10-20 06:40:12 +00:00
sahbot	0007d6a705	Integrating gmap-server to master_v2.2.14 Issue: NET-5057 gMap Homeplug plugin: topology changes GitOrigin-RevId: b29f5049a52e7d4680917bc291c1912bad0c93d6	2023-10-20 06:40:12 +00:00
sahbot	0e215f3898	Integrating gmap-mod-services-db to master_v0.1.8 Issue: DUMMY-0000 - No associated bugs found GitOrigin-RevId: 4c1be2b41368ab6db6cc88981b50125aeaa60437	2023-10-20 06:40:12 +00:00
sahbot	1c9b57ce95	Integrating gmap-mod-upnp to master_v0.1.7 Issue: NET-5083 [gmap] [self] [mod] Self can be started after the modules, causing some detection issues. Issue: NET-5158 [gmap][mod-upnp] Not use the UDN as Alias anymore, only index GitOrigin-RevId: f602d5ef178f53ef177ecb6fa213c565f5292ebe	2023-10-20 06:40:12 +00:00
sahbot	6e7bd47bfd	Integrating gmap-mod-upnp to master_v0.1.6 Issue: NET-5083 [gmap] [self] [mod] Self can be started after the modules, causing some detection issues. GitOrigin-RevId: 0f6fb0fc8c9b2be0d3e0dbe7a31a7a13beff6585	2023-10-20 06:40:12 +00:00
sahbot	f128b86ab3	[CI] Update PKG_HASH GitOrigin-RevId: f134306c5d4fa5a521eee18a1d04bd2b1053e303	2023-10-16 15:56:13 +00:00
sahbot	09854404bf	Integrating gmap-server to master_v2.2.13 Issue: NET-5197 Fix datamodel gmap missing in getdebug GitOrigin-RevId: 421ff53658d8c13e913f054079f8dd9b8d5a13cf	2023-10-16 15:56:13 +00:00
sahbot	683e2d8ed4	Integrating gmap-server to master_v2.2.12 Issue: HGWPR-24927 Fix crash on gmap devices with tricky names (dots, square... Issue: HOP-4628 [USP] access to Devices.Device. using USP return an error GitOrigin-RevId: 0378842fe5d8a6e30645c0c6ed23404282a1375d	2023-10-15 09:04:05 +00:00
sahbot	bc772a41ba	Integrating gmap-mibs-common to master_v0.11.1 Issue: NET-5166 [AMX gMap] UserAgents are not present in Devices.Device DM GitOrigin-RevId: effc4bc98e5292427d7d496d1d70d2c6c694ecd2	2023-10-10 12:50:28 +00:00