[CI] Update changelog for release master_v0.10.4

GitOrigin-RevId: 4de2510ae0e15b4c7365511bd5fe733750100693

CHANGELOG.md

@@ -0,0 +1,141 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+
+## Release v0.10.4 - 2022-08-09(10:47:53 +0000)
+
+### Other
+
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Link dev<->port dynamically when all info is available
+
+## Release v0.10.3 - 2022-08-08(16:23:26 +0000)
+
+### Other
+
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Implement using UUIDs for device keys
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [prpl][gMap] gMap queries must be evaluated in the gMap server(not the lib)
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [CI] Fix missing dependencies on uuid
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [prpl][gMap] gMap queries must be evaluated in the gMap server(not the lib)
+
+## Release v0.10.2 - 2022-08-04(09:20:50 +0000)
+
+### Other
+
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): LAN Device must have a uuid as unique (instance)key
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): LAN Device must have a uuid as unique (instance)key
+
+## Release v0.10.1 - 2022-07-29(09:23:27 +0000)
+
+### Other
+
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): test mib loading + move testhelper functions to correct test file
+
+## Release v0.10.0 - 2022-07-27(09:40:31 +0000)
+
+### New
+
+- [gmap-client](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client): Component added
+
+### Other
+
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
+- [gmap-mod-name-selector](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [prpl][gMap] gMap needs to be split in a gMap-core and gMap-client process
+
+## Release v0.9.2 - 2022-07-14(12:54:08 +0000)
+
+### Other
+
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Revert "common: add workaround method for retrieving intf from ifindex"
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): Switch to using netmodel and amxs
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): Fix `gmap_devices_unlink` doing nothing
+
+## Release v0.9.1 - 2022-06-01(13:06:16 +0000)
+
+### Fixes
+
+- [gmap-mod-name-selector](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when memory leaks are detected
+
+### Other
+
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): Fix DHCP option 60 (vendor class) not coming through
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): [Gitlab CI][Unit tests][valgrind] Pipeline doesn't stop when...
+
+## Release v0.9.0 - 2022-01-28(19:52:18 +0000)
+
+### New
+
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client): Add query functionality
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server): Gmap add query functionality
+
+## Release v0.8.3 - 2021-11-09(08:47:08 +0000)
+
+### Changes
+
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self): remove symlink to init script
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev): remove symlink to init script
+
+## Release v0.8.2 - 2021-10-14(11:25:18 +0000)
+
+## Release v0.8.1 - 2021-10-06(11:42:29 +0000)
+
+### Fixes
+
+- [gmap-mod-self](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self): [GMAP-MOD-SELF] add ; in odl
+- [gmap-mod-self](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self): [GMAP-MOD-SELF] wait for network.device on ubus
+
+## Release v0.8.0 - 2021-09-15(07:36:35 +0000)
+
+### New
+
+- [gmap-mod-ethernet-dev](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-ethernet-dev): make use of libdhcpoption
+
+## Release v0.7.1 - 2021-09-14(16:27:08 +0000)
+
+### Fixes
+
+- [gmap-mibs-common](https://gitlab.com/soft.at.home/gmap/mibs/gmap-mibs-common): [amxc] add ifdef around when_null_x, when_str_empty_x
+- [gmap-mibs-common](https://gitlab.com/soft.at.home/gmap/mibs/gmap-mibs-common): Use amxc_macros.h instead of local macros
+- [gmap-mod-name-selector](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-name-selector): [amxc] add ifdef around when_null_x, when_str_empty_x
+
+## Release v0.7.0 - 2021-08-20(14:14:49 +0000)
+
+### New
+
+- [gmap-server](https://gitlab.com/soft.at.home/gmap/applications/gmap-server): [GMAP] add implementation for name selection
+
+## Release v0.6.0 - 2021-08-18(17:16:12 +0000)
+
+### New
+
+- [gmap-mod-name-selector](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-name-selector): Component added
+- [gmap-mod-ethernet-dev](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-ethernet-dev): GMAP-MOD-ETHERNET-DEV add dhcp information to device
+
+### Fixes
+
+- [libgmap-client](https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client): [GMAP_CLIENT] functions returns array while expecting a bool
+- [libgmap-client](https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client): [GMAP-CLIENT] gmap_device_hasTag does not work
+- [gmap-server](https://gitlab.com/soft.at.home/gmap/applications/gmap-server): [GMAP-SERVER] allow hasTags to check multiple tags
+
+## Release v0.5.2 - 2021-08-06(13:58:03 +0000)
+
+### Changes
+
+- [gmap-server](https://gitlab.com/soft.at.home/gmap/applications/gmap-server): GMAP-SERVER update mibs after changing tag
+
+## Release v0.5.1 - 2021-08-05(14:40:46 +0000)
+
+### Fixes
+
+- [libgmap-client](https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client): Circular dependency libgmap-client and gmap-server
+

README.md

@@ -6,19 +6,24 @@ SoftAtHome feed of Openwrt packages for gMap components.
 
 Feed_gmap includes the following components:
 
+### Plugins
+
+- [gmap-client](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client) - gMap client plugin
+
 ### Applications
 
-- [gmap-mod-ethernet-dev](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-ethernet-dev) - gMap component that adds discovered devices to the gmap datamodel and links them to the correct interface
-- [gmap-mod-self](https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self) - gmap module to fetch information about the hgw itself and the layer 2 'devices' on it
-- [gmap-server](https://gitlab.com/soft.at.home/gmap/applications/gmap-server) - Service implementing the gmap data model
+- [gmap-mod-ethernet-dev](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev) - gMap component that adds discovered devices to the gmap datamodel and links them to the correct interface
+- [gmap-mod-name-selector](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector) - Name selection module for gmap
+- [gmap-mod-self](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self) - gmap module to fetch information about the hgw/repeater itself and the layer 2 'devices' on it
+- [gmap-server](https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server) - Service implementing the gmap data model
 
 ### Configurations
 
-- [gmap-mibs-common](https://gitlab.com/soft.at.home/gmap/mibs/gmap-mibs-common) - Generic mib files for the gmap service
+- [gmap-mibs-common](https://gitlab.com/prpl-foundation/components/gmap/mibs/gmap-mibs-common) - Generic mib files for the gmap service
 
 ### Libraries
 
-- [libgmap-client](https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client) - Client library for gmap modules
+- [libgmap-client](https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client) - Client library for gmap modules
 
 ## How to add feed_gmap to your OpenWrt build
 

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 50
+
+config SAH_AMX_GMAP_CLIENT_ONE_PROCESS
+    bool "All gMap client modules run in same process"
+    default y
+
+endmenu
+
+endif

apps/gmap-client/Makefile

@@ -0,0 +1,71 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmap-client
+PKG_VERSION:=v1.0.1
+SHORT_DESCRIPTION:=gMap client plugin
+
+PKG_SOURCE:=gmap-client-v1.0.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-client/-/archive/v1.0.1
+PKG_HASH:=607fe1f75e6db7c60d95236a5d845226f0710c846006f62608bcb0cba64f2927
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-client-v1.0.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)
+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
+  DEPENDS += +gmap-server
+  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 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) 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 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))
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

apps/gmap-mod-ethernet-dev/Makefile

@@ -1,51 +1,35 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-mod-ethernet-dev
-PKG_VERSION:=v0.0.6
+PKG_VERSION:=v1.0.2
 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.6.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-ethernet-dev/-/archive/v0.0.6
-PKG_HASH:=75ce8b185be7cb7073995c666bf0e398c5883acf886a4cb6f4de297527e36d5e
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v0.0.6
+PKG_SOURCE:=gmap-mod-ethernet-dev-v1.0.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-ethernet-dev/-/archive/v1.0.2
+PKG_HASH:=3f5641565b72faaf2e0cb4ee428263a0af80569d7c602c29f7b660c4cf32ee4c
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-ethernet-dev-v1.0.2
 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).so ${PKG_INSTALL_DIR}/etc/rc.d/S73$(COMPONENT).so
-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).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/backup/B10$(COMPONENT).so
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore/R10$(COMPONENT).so
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import/R10$(COMPONENT).so
-endef
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
   CATEGORY:=gmap
   SUBMENU:=Applications
   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 += +libamxo
+  DEPENDS += +libamxj
   DEPENDS += +libgmap-client
   DEPENDS += +libsahtrace
+  DEPENDS += +libdhcpoptions
   MENU:=1
 endef
 
@@ -62,9 +46,6 @@ define Build/Install
 	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)
 endef
 
 define Build/InstallDev
@@ -72,6 +53,9 @@ define Build/InstallDev
 endef
 
 define Package/$(PKG_NAME)/install
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 

apps/gmap-mod-name-selector/Makefile

@@ -0,0 +1,58 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gmap-mod-name-selector
+PKG_VERSION:=v1.0.0
+SHORT_DESCRIPTION:=Name selection module for gmap
+
+PKG_SOURCE:=gmap-mod-name-selector-v1.0.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-name-selector/-/archive/v1.0.0
+PKG_HASH:=c7d1df3ba0960cf458bfa97272ec40e6ca2bf6f5c82e3eabeb2f9ad9173ba8bf
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-name-selector-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:=Applications
+  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
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

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

apps/gmap-mod-self/Makefile

@@ -1,77 +1,64 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-mod-self
-PKG_VERSION:=v0.0.12
-SHORT_DESCRIPTION:=gmap module to fetch information about the hgw itself and the layer 2 'devices' on it
+PKG_VERSION:=v1.0.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.12.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-mod-self/-/archive/v0.0.12
-PKG_HASH:=42cad5951f2d4a09f06d7d5fc431085dde184525ac5420751f88300f17c4ef6b
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v0.0.12
+PKG_SOURCE:=gmap-mod-self-v1.0.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-mod-self/-/archive/v1.0.0
+PKG_HASH:=27d93c368997b9183e7957fb9ddd806ca1d90a3d3a4fba551d3d78b0e2b4c112
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mod-self-v1.0.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).so ${PKG_INSTALL_DIR}/etc/rc.d/S72$(COMPONENT).so
-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).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/backup/B10$(COMPONENT).so
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/restore/R10$(COMPONENT).so
-	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT).so ${PKG_INSTALL_DIR}/usr/lib/hgwcfg/import/R10$(COMPONENT).so
-endef
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
   CATEGORY:=gmap
   SUBMENU:=Applications
   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 += +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 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)
+	$(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_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 {} +;
-
-	$(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) 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)/
 endef
 
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
 $(eval $(call BuildPackage,$(PKG_NAME)))

apps/gmap-server/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-server
-PKG_VERSION:=v0.1.3
+PKG_VERSION:=v1.0.4
 SHORT_DESCRIPTION:=Service implementing the gmap data model
 
-PKG_SOURCE:=gmap-server-v0.1.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/applications/gmap-server/-/archive/v0.1.3
-PKG_HASH:=ab2967c41079a6047820a7b2bab99b2c56dc2cd62007b036ecfa8de9594834a5
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v0.1.3
+PKG_SOURCE:=gmap-server-v1.0.4.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/applications/gmap-server/-/archive/v1.0.4
+PKG_HASH:=5d2021136f28ab3c3c81d240adabb83728cfd507c641cdea30602a0371f346ba
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-server-v1.0.4
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -15,6 +15,7 @@ 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/
@@ -36,7 +37,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=gmap
   SUBMENU:=Applications
   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
@@ -44,6 +45,7 @@ define Package/$(PKG_NAME)
   DEPENDS += +libamxo
   DEPENDS += +libgmap-client
   DEPENDS += +libsahtrace
+  DEPENDS += +libuuid
   MENU:=1
 endef
 
@@ -70,6 +72,9 @@ define Build/InstallDev
 endef
 
 define Package/$(PKG_NAME)/install
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 

configs/gmap-mibs-common/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmap-mibs-common
-PKG_VERSION:=v0.2.1
+PKG_VERSION:=v0.2.3
 SHORT_DESCRIPTION:=Generic mib files for the gmap service
 
-PKG_SOURCE:=gmap-mibs-common-v0.2.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/mibs/gmap-mibs-common/-/archive/v0.2.1
-PKG_HASH:=84a4aad72d2632fb859fa2355459e462f88bc26240448c047e79064add6f806e
-PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.2.1
+PKG_SOURCE:=gmap-mibs-common-v0.2.3.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/mibs/gmap-mibs-common/-/archive/v0.2.3
+PKG_HASH:=d350eac8b25841093149a8fe3313dfa567b024084091c2f6f9355fba0374c50c
+PKG_BUILD_DIR:=$(BUILD_DIR)/gmap-mibs-common-v0.2.3
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE

libs/libgmap-client/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgmap-client
-PKG_VERSION:=v0.2.0
+PKG_VERSION:=v0.4.1
 SHORT_DESCRIPTION:=Client library for gmap modules
 
-PKG_SOURCE:=libgmap-client-v0.2.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/soft.at.home/gmap/libraries/libgmap-client/-/archive/v0.2.0
-PKG_HASH:=e97e78c1c8067d92e00d7154a4688448eaef79e4c4337f49c5081543747ae3fd
-PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v0.2.0
+PKG_SOURCE:=libgmap-client-v0.4.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/gmap/libraries/libgmap-client/-/archive/v0.4.1
+PKG_HASH:=9a480ca0a6da4101d307463c23f50df68a9c9ddf54f17e62760294fac9e42bfc
+PKG_BUILD_DIR:=$(BUILD_DIR)/libgmap-client-v0.4.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -20,13 +20,12 @@ define Package/$(PKG_NAME)
   CATEGORY:=gmap
   SUBMENU:=Libraries
   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 += +libamxp
   DEPENDS += +libamxb
   DEPENDS += +libamxd
   DEPENDS += +libsahtrace
-  DEPENDS += +gmap-server
   MENU:=1
 endef
 
@@ -50,6 +49,9 @@ define Build/InstallDev
 endef
 
 define Package/$(PKG_NAME)/install
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef