Integrating gmap-mibs-common to master_v0.13.0

Issue: NET-5249 Add Mobility parameter GitOrigin-RevId: 5864499be9ca9d5936780173dd3888e847b64b95
Integrating gmap-mod-self to master_v1.4.3
2026-01-07 23:01:39 +08:00 · 2023-11-11 08:24:19 +00:00 · 2023-11-09 12:25:51 +00:00 · 2023-11-09 12:25:51 +00:00 · 2023-11-09 12:25:51 +00:00 · 2023-11-09 12:25:50 +00:00
8 changed files with 43 additions and 38 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.2
+PKG_VERSION:=v1.2.0
 SHORT_DESCRIPTION:=gMap client plugin

-PKG_SOURCE:=gmap-client-v1.1.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.1.2
-PKG_HASH:=1de9b304c1451a29b368abeaf583b301fe2b6d45ffbb038fb85459e6f589a1a0
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.1.2
+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_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- 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.1
+PKG_VERSION:=v1.16.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.15.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.15.1
-PKG_HASH:=2ac7f8b6d6bb3b5a789543e7fc610ee24e9ab78fa9c129f78cb99c5bc837491c
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.15.1
+PKG_SOURCE:=gmap-mod-ethernet-dev-v1.16.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.16.0
+PKG_HASH:=a4a89507746067da6aee9f5536cb70d372fd5b6bb305c730ad691ae23d619ebd
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.16.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- 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.3
 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.3.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.4.3
+PKG_HASH:=a3efb9c200a5d4bc4ce6711a2a19f5e29ae496746581502942effe8203a2af42
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.4.3
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -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-upnp/Makefile
+++ b/apps/gmap-mod-upnp/Makefile
@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 -include $(STAGING_DIR)/components.config

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

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v0.1.8
+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)
@@ -31,6 +31,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxo
  DEPENDS += +libamxs
  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
  DEPENDS += +libsahtrace
  DEPENDS += +amxrt
  MENU:=1
--- 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.2
+PKG_VERSION:=v0.13.0
 SHORT_DESCRIPTION:=Generic mib files for the gmap service

-PKG_SOURCE:=gmap-mibs-common-v0.11.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.11.2
-PKG_HASH:=4d799e0294274b7cb6992b07b26919a53a36ceda1b65d9f7ac2e18035ca20ce4
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.11.2
+PKG_SOURCE:=gmap-mibs-common-v0.13.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common/-/archive/v0.13.0
+PKG_HASH:=bd5250ebe7f531857f9e2b27d727e01f2641e480346d7947d01f6c7731aa45c8
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.13.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -30,6 +30,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libsahtrace
  DEPENDS += +libamxo
  DEPENDS += +libgmap-client
+  DEPENDS += +libgmap-ext
  MENU:=1
 endef

--- 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.0
 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.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_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- 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
@@ -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	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