Use amxb dev branch

Merge branch 'dev_bump_libamxn' into 'mainline-3.2'
libamxb: bump to mainline-3.2_v0.1.0 See merge request prpl-foundation/prplos/feeds/feed_amx!6
2026-01-11 16:13:28 +08:00 · 2025-01-10 22:39:01 +01:00 · 2025-01-10 08:22:08 +00:00 · 2025-01-10 09:19:37 +01:00 · 2024-12-20 11:13:52 +01:00 · 2024-12-18 11:56:38 +01:00
21 changed files with 163 additions and 155 deletions
--- a/apps/acl-manager/Makefile
+++ b/apps/acl-manager/Makefile
@@ -1,15 +1,13 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/applications/acl-manager/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=acl-manager
-PKG_VERSION:=v0.7.2
+PKG_VERSION:=v0.7.0
 SHORT_DESCRIPTION:=The ACL manager monitors ACL directory and merges ACL files

-PKG_SOURCE:=acl-manager-v0.7.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/acl-manager/-/archive/v0.7.2
-PKG_HASH:=85664738bc5de52a43b3f091ca61ba7bcabe454f53cd0664b5e397dd17cca2fe
-PKG_BUILD_DIR:=$(BUILD_DIR)/acl-manager-v0.7.2
+PKG_SOURCE:=acl-manager-v0.7.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/acl-manager/-/archive/v0.7.0
+PKG_HASH:=7be45288a37c1ca2f27b0b20be175dee8fb32d2071fc3168942926db5ebea1f1
+PKG_BUILD_DIR:=$(BUILD_DIR)/acl-manager-v0.7.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/apps/amx-cli/Makefile
+++ b/apps/amx-cli/Makefile
@@ -1,15 +1,13 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/applications/amx-cli/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=amx-cli
-PKG_VERSION:=v0.5.5
+PKG_VERSION:=v0.5.1
 SHORT_DESCRIPTION:=Ambiorix interactive CLI

-PKG_SOURCE:=amx-cli-v0.5.5.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amx-cli/-/archive/v0.5.5
-PKG_HASH:=4e976d7e7fef86fb851d3f89969c43ed645636cfab466f5a60972e461d7235ad
-PKG_BUILD_DIR:=$(BUILD_DIR)/amx-cli-v0.5.5
+PKG_SOURCE:=amx-cli-v0.5.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amx-cli/-/archive/v0.5.1
+PKG_HASH:=74f98759b38c9154c7af757713942bdbbfeb51c2f2548c1248c03dfd44f6980e
+PKG_BUILD_DIR:=$(BUILD_DIR)/amx-cli-v0.5.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -43,11 +41,11 @@ define Build/Compile
 endef

 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_ACCESSPOINT=$(CONFIG_PRPL_CPE_OPMODE_EXTENDER) CONFIG_GATEWAY=$(CONFIG_PRPL_CPE_OPMODE_GATEWAY))
+	$(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 CONFIG_ACCESSPOINT=$(CONFIG_PRPL_CPE_OPMODE_EXTENDER) CONFIG_GATEWAY=$(CONFIG_PRPL_CPE_OPMODE_GATEWAY))
+	$(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
--- a/apps/amx-fcgi/Makefile
+++ b/apps/amx-fcgi/Makefile
@@ -1,15 +1,13 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/applications/amx-fcgi/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=amx-fcgi
-PKG_VERSION:=v1.3.15
+PKG_VERSION:=v1.3.9
 SHORT_DESCRIPTION:=Ambiorix Fast CGI app for web-servers

-PKG_SOURCE:=amx-fcgi-v1.3.15.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amx-fcgi/-/archive/v1.3.15
-PKG_HASH:=c09d18074e9ba65bd7bf1613a71c33f23969d9e10770b6bc72347feb140bf9e7
-PKG_BUILD_DIR:=$(BUILD_DIR)/amx-fcgi-v1.3.15
+PKG_SOURCE:=amx-fcgi-v1.3.9.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amx-fcgi/-/archive/v1.3.9
+PKG_HASH:=8dafdcf8cd619c2913db3aae81b298050e9413b4411ede2a45fa839ecaf670e8
+PKG_BUILD_DIR:=$(BUILD_DIR)/amx-fcgi-v1.3.9
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -24,6 +22,15 @@ define SAHInit/Install
 	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/$(COMPONENT) ${PKG_INSTALL_DIR}/etc/rc.d/K10$(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)
@@ -56,6 +63,7 @@ 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 SAHInit/Install)
+	$(call SAHBackupRestore/Install)
 endef

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

 PKG_NAME:=amxo-cg
-PKG_VERSION:=v1.6.6
+PKG_VERSION:=v1.5.4
 SHORT_DESCRIPTION:=Object Definition Language Compiler/Generator

-PKG_SOURCE:=amxo-cg-v1.6.6.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amxo-cg/-/archive/v1.6.6
-PKG_HASH:=5f737da52d27533b41db387d008e3723d762090a42d28a76296ccc6577e063a7
-PKG_BUILD_DIR:=$(BUILD_DIR)/amxo-cg-v1.6.6
+PKG_SOURCE:=amxo-cg-v1.5.4.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amxo-cg/-/archive/v1.5.4
+PKG_HASH:=243753b8bbf8d789bd6ef0e742fc1dc9f7fa0152c6f1033d4bdfb324235573e9
+PKG_BUILD_DIR:=$(BUILD_DIR)/amxo-cg-v1.5.4
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -31,7 +29,6 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxo
  DEPENDS += +libxml2
  DEPENDS += +yajl
-  DEPENDS += +libamxs
  MENU:=1
 endef

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

 PKG_NAME:=amxrt
-PKG_VERSION:=v2.2.4
+PKG_VERSION:=v2.2.0
 SHORT_DESCRIPTION:=Data model runtime

-PKG_SOURCE:=amxrt-v2.2.4.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amxrt/-/archive/v2.2.4
-PKG_HASH:=44a4086d169cb5369635ea131a35ab5dc4befeaf59c92dc92bdfac9bca24e62b
-PKG_BUILD_DIR:=$(BUILD_DIR)/amxrt-v2.2.4
+PKG_SOURCE:=amxrt-v2.2.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amxrt/-/archive/v2.2.0
+PKG_HASH:=0bd6e83da66bd45127c49d686c7de62bd6f183cf9991259117db564a04a81f8f
+PKG_BUILD_DIR:=$(BUILD_DIR)/amxrt-v2.2.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/libs/libamxa/Makefile
+++ b/libs/libamxa/Makefile
@@ -1,15 +1,13 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxa/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libamxa
-PKG_VERSION:=v0.11.9
+PKG_VERSION:=v0.11.1
 SHORT_DESCRIPTION:=Access control verification

-PKG_SOURCE:=libamxa-v0.11.9.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxa/-/archive/v0.11.9
-PKG_HASH:=1197300157ef7c1e7b340c5909727caf9eba6754a80067f0354b46880edcf8eb
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxa-v0.11.9
+PKG_SOURCE:=libamxa-v0.11.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxa/-/archive/v0.11.1
+PKG_HASH:=c4ce80b236e2e6bef000e6c90df0b4be995e8ce689f88bbbbc1a3dcf6199d664
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxa-v0.11.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -40,11 +38,11 @@ define Build/Compile
 endef

 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_ACCESSPOINT=$(CONFIG_PRPL_CPE_OPMODE_EXTENDER) CONFIG_GATEWAY=$(CONFIG_PRPL_CPE_OPMODE_GATEWAY))
+	$(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 CONFIG_ACCESSPOINT=$(CONFIG_PRPL_CPE_OPMODE_EXTENDER) CONFIG_GATEWAY=$(CONFIG_PRPL_CPE_OPMODE_GATEWAY))
+	$(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
--- a/libs/libamxb/Makefile
+++ b/libs/libamxb/Makefile
@@ -1,16 +1,13 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxb/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libamxb
-PKG_VERSION:=Dev_ppw-967
+PKG_VERSION:=dev_skip_version_check
 SHORT_DESCRIPTION:=Bus agnostic C API (mediator)

-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=Dev_ppw-967
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxb.git
-PKG_MIRROR_HASH:=skip
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=libamxb-dev_skip_version_check.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxb/-/archive/dev_skip_version_check
+PKG_HASH:=88cd03307a798f740b67df1e039468781017cb183bda9117264f659065c70f1d
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxb-dev_skip_version_check
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/libs/libamxc/Makefile
+++ b/libs/libamxc/Makefile
@@ -1,15 +1,13 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxc/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libamxc
-PKG_VERSION:=v2.3.9
+PKG_VERSION:=v2.1.0
 SHORT_DESCRIPTION:=library providing generic reusable data containers

-PKG_SOURCE:=libamxc-v2.3.9.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxc/-/archive/v2.3.9
-PKG_HASH:=d403d934597f13ca982d74aee9d34c321026a792707cf3cf1ea5015c4aa067c0
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxc-v2.3.9
+PKG_SOURCE:=libamxc-v2.1.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxc/-/archive/v2.1.0
+PKG_HASH:=1a8dc9c9912703f334e6265526157bd39af8867a142b6046be0c1b7490056f77
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxc-v2.1.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/libs/libamxd/Makefile
+++ b/libs/libamxd/Makefile
@@ -1,15 +1,13 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxd/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libamxd
-PKG_VERSION:=v6.7.6
+PKG_VERSION:=v6.5.5
 SHORT_DESCRIPTION:=Data model C-API

-PKG_SOURCE:=libamxd-v6.7.6.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxd/-/archive/v6.7.6
-PKG_HASH:=5a155a8019fc6cc6ed45aa9facf40206df35bcd996607d9593aa6e9db73ae6ae
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxd-v6.7.6
+PKG_SOURCE:=libamxd-v6.5.5.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxd/-/archive/v6.5.5
+PKG_HASH:=fbf6f70e954dccc867fba532e8a1d4d4fcbe215f739103974ad74a7c29fed89f
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxd-v6.5.5
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/libs/libamxj/Makefile
+++ b/libs/libamxj/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libamxj
-PKG_VERSION:=v1.0.4
+PKG_VERSION:=v1.0.3
 SHORT_DESCRIPTION:=JSON parser & generator using yajl and libamxc variants

-PKG_SOURCE:=libamxj-v1.0.4.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxj/-/archive/v1.0.4
-PKG_HASH:=4caa4c4c1505ee2eab189042058b978875f3e03cead3a115eb8eba08a168f865
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxj-v1.0.4
+PKG_SOURCE:=libamxj-v1.0.3.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxj/-/archive/v1.0.3
+PKG_HASH:=583647d91000377dc13711e26b2de2aa024895182d05e4b7f704e8be099b0e58
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxj-v1.0.3
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/libs/libamxm/Makefile
+++ b/libs/libamxm/Makefile
@@ -1,15 +1,13 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxm/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libamxm
-PKG_VERSION:=v0.1.1
+PKG_VERSION:=v0.1.0
 SHORT_DESCRIPTION:=modularity API, simplifies creation of plug-ins

-PKG_SOURCE:=libamxm-v0.1.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxm/-/archive/v0.1.1
-PKG_HASH:=abf2a9d6daab5103198666ae05231cf5d3db8a555ac644d6756f9c1fdb3ff33c
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxm-v0.1.1
+PKG_SOURCE:=libamxm-v0.1.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxm/-/archive/v0.1.0
+PKG_HASH:=b98980d2cf88c34a674f9a62cc2e71dc1cf9e94d2f38c52f513958669deb21f5
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxm-v0.1.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/libs/libamxo/Makefile
+++ b/libs/libamxo/Makefile
@@ -1,21 +1,21 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxo/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libamxo
-PKG_VERSION:=v5.3.11
+PKG_VERSION:=v5.0.2
 SHORT_DESCRIPTION:=Ambiorix Object Definition Language library

-PKG_SOURCE:=libamxo-v5.3.11.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxo/-/archive/v5.3.11
-PKG_HASH:=536c8e69cece51fb66d73c106b1d795d03215e59b356346d7c0ae4608685bfd8
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxo-v5.3.11
+PKG_SOURCE:=libamxo-v5.0.2.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxo/-/archive/v5.0.2
+PKG_HASH:=60cce73fd5c37f2eb4e21588cbc8864b86bbf70cc8b75e9aae91b6ced7e4d295
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxo-v5.0.2
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE


 PKG_RELEASE:=1
+PKG_BUILD_DEPENDS += bison/host
+PKG_BUILD_DEPENDS += flex/host

 include $(INCLUDE_DIR)/package.mk

@@ -40,11 +40,11 @@ define Build/Compile
 endef

 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_ACCESSPOINT=$(CONFIG_PRPL_CPE_OPMODE_EXTENDER) CONFIG_GATEWAY=$(CONFIG_PRPL_CPE_OPMODE_GATEWAY))
+	$(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 CONFIG_ACCESSPOINT=$(CONFIG_PRPL_CPE_OPMODE_EXTENDER) CONFIG_GATEWAY=$(CONFIG_PRPL_CPE_OPMODE_GATEWAY))
+	$(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
--- a/libs/libamxp/Makefile
+++ b/libs/libamxp/Makefile
@@ -1,21 +1,21 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxp/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libamxp
-PKG_VERSION:=v2.7.15
+PKG_VERSION:=v2.3.0
 SHORT_DESCRIPTION:=Common patterns implementation

-PKG_SOURCE:=libamxp-v2.7.15.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxp/-/archive/v2.7.15
-PKG_HASH:=30f1badc41c090146c65ae161aa6d14e07b4336aae85b4c6dfa2d065de7e43c2
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxp-v2.7.15
+PKG_SOURCE:=libamxp-v2.3.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxp/-/archive/v2.3.0
+PKG_HASH:=c207832d9bea0c5149dab16afa6f13bcd7d4b85efa20ad5592cec1a32465930d
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxp-v2.3.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE


 PKG_RELEASE:=1
+PKG_BUILD_DEPENDS += bison/host
+PKG_BUILD_DEPENDS += flex/host

 include $(INCLUDE_DIR)/package.mk

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

 PKG_NAME:=libamxrt
-PKG_VERSION:=v0.6.9
+PKG_VERSION:=mainline-3.2_v0.1.1
 SHORT_DESCRIPTION:=Ambiorix Run Time API

-PKG_SOURCE:=libamxrt-v0.6.9.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxrt/-/archive/v0.6.9
-PKG_HASH:=0a0625f310a18e81b0688a589dc0240b60c9440f62d00d487ce58bdba80df897
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxrt-v0.6.9
+PKG_SOURCE:=libamxrt-mainline-3.2_v0.1.1.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxrt/-/archive/mainline-3.2_v0.1.1
+PKG_HASH:=28c6aa7ede9b1e2686be9d61000f80189b194312c50b482d7b0073b2ed6e2fde
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxrt-mainline-3.2_v0.1.1
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -44,11 +42,11 @@ define Build/Compile
 endef

 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_ACCESSPOINT=$(CONFIG_PRPL_CPE_OPMODE_EXTENDER) CONFIG_GATEWAY=$(CONFIG_PRPL_CPE_OPMODE_GATEWAY) CONFIG_SAH_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH) CONFIG_FORCE_RUNNING_AS_ROOT=$(CONFIG_FORCE_RUNNING_AS_ROOT) CONFIG_REMOVE_CAPS_ODLS=$(CONFIG_REMOVE_CAPS_ODLS))
+	$(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_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH) CONFIG_FORCE_RUNNING_AS_ROOT=$(CONFIG_FORCE_RUNNING_AS_ROOT) CONFIG_REMOVE_CAPS_ODLS=$(CONFIG_REMOVE_CAPS_ODLS))
 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_ACCESSPOINT=$(CONFIG_PRPL_CPE_OPMODE_EXTENDER) CONFIG_GATEWAY=$(CONFIG_PRPL_CPE_OPMODE_GATEWAY) CONFIG_SAH_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH) CONFIG_FORCE_RUNNING_AS_ROOT=$(CONFIG_FORCE_RUNNING_AS_ROOT) CONFIG_REMOVE_CAPS_ODLS=$(CONFIG_REMOVE_CAPS_ODLS))
+	$(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_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH) CONFIG_FORCE_RUNNING_AS_ROOT=$(CONFIG_FORCE_RUNNING_AS_ROOT) CONFIG_REMOVE_CAPS_ODLS=$(CONFIG_REMOVE_CAPS_ODLS))
 endef

 define Package/$(PKG_NAME)/install
--- a/libs/libamxs/Makefile
+++ b/libs/libamxs/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libamxs
-PKG_VERSION:=v0.8.3
+PKG_VERSION:=v0.6.4
 SHORT_DESCRIPTION:=Data model synchronization C-API

-PKG_SOURCE:=libamxs-v0.8.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxs/-/archive/v0.8.3
-PKG_HASH:=42409fe4b135b8274e9f4595c269dcc66c076aadcbfe0ee99a8c274805fcdab0
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxs-v0.8.3
+PKG_SOURCE:=libamxs-v0.6.4.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxs/-/archive/v0.6.4
+PKG_HASH:=f5a296b30c2b27ef2d05d3f05465e5f9c4549f6fcbfd194bfd264face6c6282d
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxs-v0.6.4
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/libs/libamxt/Makefile
+++ b/libs/libamxt/Makefile
@@ -1,15 +1,13 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxt/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libamxt
-PKG_VERSION:=v1.0.3
+PKG_VERSION:=v1.0.0
 SHORT_DESCRIPTION:=Common patterns implementation

-PKG_SOURCE:=libamxt-v1.0.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxt/-/archive/v1.0.3
-PKG_HASH:=01a8daf45ea9f3962a12e1166a91b30db22eb796c8cf5352042199316f991cb7
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxt-v1.0.3
+PKG_SOURCE:=libamxt-v1.0.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxt/-/archive/v1.0.0
+PKG_HASH:=3afe221384abf13b05b3ad88577573977ac83063dead584a114fc8633c2dd5cf
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxt-v1.0.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -38,11 +36,11 @@ define Build/Compile
 endef

 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include CONFIG_ACCESSPOINT=$(CONFIG_PRPL_CPE_OPMODE_EXTENDER) CONFIG_GATEWAY=$(CONFIG_PRPL_CPE_OPMODE_GATEWAY))
+	$(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 CONFIG_ACCESSPOINT=$(CONFIG_PRPL_CPE_OPMODE_EXTENDER) CONFIG_GATEWAY=$(CONFIG_PRPL_CPE_OPMODE_GATEWAY))
+	$(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
--- a/mods/mod-amxb-pcb/Config.in
+++ b/mods/mod-amxb-pcb/Config.in
@@ -0,0 +1,20 @@
+config PACKAGE_mod-amxb-pcb
+    tristate
+    select SAH_MOD_AMXB_PCB
+
+if PACKAGE_mod-amxb-pcb
+
+menu "Select mod-amxb-pcb build options"
+    depends on PACKAGE_mod-amxb-pcb
+
+config SAH_MOD_AMXB_PCB
+    bool "Build pcb backend for ambiorix"
+    default y
+
+config SAH_MOD_AMXB_PCB_ORDER
+    string "Backend load order"
+    default "10-"
+
+endmenu
+
+endif
--- a/mods/mod-amxb-pcb/Makefile
+++ b/mods/mod-amxb-pcb/Makefile
@@ -1,49 +1,53 @@
 include $(TOPDIR)/rules.mk

-PKG_NAME:=mod-busstats
-PKG_VERSION:=v0.3.0
-SHORT_DESCRIPTION:=Bus statistics
+PKG_NAME:=mod-amxb-pcb
+PKG_VERSION:=v3.12.0
+SHORT_DESCRIPTION:=PCB backend implementation for amxb

-PKG_SOURCE:=mod-busstats-v0.3.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amx_dm_mods/mod-busstats/-/archive/v0.3.0
-PKG_HASH:=9170310e598d70a165c163cb09f7733416e5bcd27461ba8945d54324b514f7d5
-PKG_BUILD_DIR:=$(BUILD_DIR)/mod-busstats-v0.3.0
+PKG_SOURCE:=amxb_pcb-v3.12.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amxb_backends/amxb_pcb/-/archive/v3.12.0
+PKG_HASH:=b548b01b599111650021d14b81a4ab6d854426bc75a4d23674e48de0c94499d8
+PKG_BUILD_DIR:=$(BUILD_DIR)/amxb_pcb-v3.12.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE


 PKG_RELEASE:=1
-PKG_BUILD_DEPENDS += libamxo
-PKG_BUILD_DEPENDS += libsahtrace

 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
  CATEGORY:=prpl Foundation
-  SUBMENU:=Modules
+  SUBMENU:=Ambiorix
  TITLE:=$(SHORT_DESCRIPTION)
-  URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amx_dm_mods/mod-busstats
+  URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amxb_backends/amxb_pcb
  DEPENDS += +libamxc
+  DEPENDS += +libamxj
+  DEPENDS += +libamxp
  DEPENDS += +libamxd
  DEPENDS += +libamxb
+  DEPENDS += +libpcb
+  DEPENDS += +libamxa
+  DEPENDS += +libusermngt
+  DEPENDS += +yajl
  MENU:=1
 endef

 define Package/$(PKG_NAME)/description
-	Bus statistics
+	PCB backend implementation for amxb
 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_MOD_AMXB_PCB_ORDER=$(CONFIG_SAH_MOD_AMXB_PCB_ORDER))
 endef

 define Build/Install
-	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+	$(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_MOD_AMXB_PCB_ORDER=$(CONFIG_SAH_MOD_AMXB_PCB_ORDER))
 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_MOD_AMXB_PCB_ORDER=$(CONFIG_SAH_MOD_AMXB_PCB_ORDER))
 endef

 define Package/$(PKG_NAME)/install
@@ -56,4 +60,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/mods/mod-amxb-ubus/Makefile
+++ b/mods/mod-amxb-ubus/Makefile
@@ -1,15 +1,13 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/modules/amxb_backends/amxb_ubus/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=mod-amxb-ubus
-PKG_VERSION:=v3.9.2
+PKG_VERSION:=v3.4.0
 SHORT_DESCRIPTION:=Ubus Backend

-PKG_SOURCE:=amxb_ubus-v3.9.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amxb_backends/amxb_ubus/-/archive/v3.9.2
-PKG_HASH:=ec0b36a2c515788382f687971942ac31bf2b85c9ead3c9f3c251d1597fc86fb0
-PKG_BUILD_DIR:=$(BUILD_DIR)/amxb_ubus-v3.9.2
+PKG_SOURCE:=amxb_ubus-v3.4.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amxb_backends/amxb_ubus/-/archive/v3.4.0
+PKG_HASH:=0efd490118038c3e86f47b0f579af1fab73b939725f0abd0ae8084a0191e078b
+PKG_BUILD_DIR:=$(BUILD_DIR)/amxb_ubus-v3.4.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
@@ -27,7 +25,7 @@ define Package/$(PKG_NAME)
  DEPENDS += +libamxc
  DEPENDS += +libamxb
  DEPENDS += +libamxd
-  DEPENDS += +libubus
+  DEPENDS += +ubus
  MENU:=1
 endef

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

 PKG_NAME:=mod-ba-cli
-PKG_VERSION:=v0.14.2
+PKG_VERSION:=v0.13.0
 SHORT_DESCRIPTION:=Bus Agnostic Command Line Interface

-PKG_SOURCE:=mod-ba-cli-v0.14.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amx_cli/mod-ba-cli/-/archive/v0.14.2
-PKG_HASH:=9e079a410e748a3fff36c0ab95c58ff4601823707b5f3e68451f77d22b3e7d34
-PKG_BUILD_DIR:=$(BUILD_DIR)/mod-ba-cli-v0.14.2
+PKG_SOURCE:=mod-ba-cli-v0.13.0.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amx_cli/mod-ba-cli/-/archive/v0.13.0
+PKG_HASH:=0f204f48506c0556fed7676d4cb23c84ba088f7fc328c80d8563b7c93f713d7e
+PKG_BUILD_DIR:=$(BUILD_DIR)/mod-ba-cli-v0.13.0
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
--- a/utilities/lua-amx/Makefile
+++ b/utilities/lua-amx/Makefile
@@ -1,15 +1,13 @@
-# WARNING: Automatically generated file using BAF (Build system Agnostic File) tooling
-# WARNING: You should contribute changes to https://gitlab.com/prpl-foundation/components/ambiorix/bindings/lua/lua-amx/-/blob/main/baf.yml instead
 include $(TOPDIR)/rules.mk

 PKG_NAME:=lua-amx
-PKG_VERSION:=v0.5.6
+PKG_VERSION:=v0.5.5
 SHORT_DESCRIPTION:=LUA AMX Bindings 

-PKG_SOURCE:=lua-amx-v0.5.6.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/bindings/lua/lua-amx/-/archive/v0.5.6
-PKG_HASH:=4c5e95f5534ddfedc056070c6bd90ba258e6470994f9dc27b3b2fccd0d234326
-PKG_BUILD_DIR:=$(BUILD_DIR)/lua-amx-v0.5.6
+PKG_SOURCE:=lua-amx-v0.5.5.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/bindings/lua/lua-amx/-/archive/v0.5.5
+PKG_HASH:=2c1af69c65a4f9edb9c8d5a53cd771400d2935e2d6448226b6228577d4e30c1b
+PKG_BUILD_DIR:=$(BUILD_DIR)/lua-amx-v0.5.5
 PKG_MAINTAINER:=Soft At Home <support.opensource@softathome.com>
 PKG_LICENSE:=BSD-2-Clause-Patent
 PKG_LICENSE_FILES:=LICENSE
Author	SHA1	Message	Date
Toon Caeyers	edc6f03121	Use amxb dev branch	2025-01-10 22:39:01 +01:00
Matthias Franck	0caaef5dd0	Merge branch 'dev_bump_libamxn' into 'mainline-3.2' libamxb: bump to mainline-3.2_v0.1.0 See merge request prpl-foundation/prplos/feeds/feed_amx!6	2025-01-10 08:22:08 +00:00
Matthias Franck	28342711ad	libamxb: bump to mainline-3.2_v0.1.0 Fixes issue on sometimes missing app:start events on ubus. References: PPW-62, HOP-7528 Signed-off-by: Matthias Franck <matthias.franck@softathome.com>	2025-01-10 09:19:37 +01:00
Matthias FRANCK	6ea4756b34	libamxrt: include fixes for prplos-3.2 1266d7c ("Allow forcing components to run as root (PPW-185)", 2024-12-18) a4aa414 ("baf: introduce the baf.yml file", 2024-12-19) e1d06fd ("ci: use new gitlab-ci templates", 2024-12-19) 922620d ("baf: fix libcap-ng issues on various filesystems", 2024-12-20) Signed-off-by: Matthias FRANCK <matthias.franck@softathome.com>	2024-12-20 11:13:52 +01:00
Petr Štetiar	fcf51b9865	libamxrt: fix libcap-ng issues on F2FS, JFFS2 and UBIFS based overlays Commit `3dc4681f9b` ("Integrating libamxp to master_v2.1.1") added handling of subprocess capabilities via libcap-ng, which on targets utilizing ext4 filesystem needs EXT4_FS_SECURITY kernel config symbol enabled for proper support of extended filesystem attributes via fsetxattr(): amxp_subproc_start() `-amxp_subproc_vstart() `-amxp_subproc_exec_child() `-amxp_subproc_set_capabilities() `-capng_apply_caps_fd() `-fsetxattr() open("/usr/sbin/unbound", O_RDWR\|O_LARGEFILE) = 3 ... fsetxattr(3, "security.capability", "\1\0\0\2\0\0\0\0$\0\200\0\0\0\0\0\0\0", 20, 0) = -1 EOPNOTSUPP (Not supported) This failure then leads to missing CAP_NET_BIND_SERVICE capability and thus unbound can't start: [1726337363] unbound[30984:0] error: can't bind socket: Permission denied for 0.0.0.0 port 53 [1726337363] unbound[30984:0] error: can't bind socket: Permission denied for :: port 53 [1726337363] unbound[30984:0] fatal error: could not open ports ... tr181-dns: dns - [i]Started Unbound (1 times) - (start_unbound@modunbound_main.c:455) tr181-dns: dns - [i]wait for wait:done - (start_unbound@modunbound_main.c:457) tr181-dns: dns - [x]Unbound stopped! - (unbound_stopped@modunbound_main.c:373) That was fixed in commit `995891f8ca` ("libamxrt: fix libcap-ng issues on ext4 by enabling EXT4_FS_SECURITY"). Lately it was found out, that on some targets, like RPI the same issue appeared again. It was found out, that it was due to the fact, that RPI is using f2fs based rootfs_data overlay, because procd/fstools creates f2fs based rootfs_data overlays if the available storage space is bigger then 100MiB, in other cases its going to use ext4 filesystem. So lets fix it for good for all the targets supported by underlying OpenWrt system, by selecting the corresponding KERNEL__FS_SECURITY config symbols. Unfortunatelly for f2fs we can't use target's specific USES_F2FS as its not available, but we could probably use mkf2fs for that purpose as every target seems to include it, so it should work. Cc: stable-3.1 Fixes: PCF-1456 References: PCF-1411, PPW-74 Fixes: `3dc4681f9b` ("Integrating libamxp to master_v2.1.1") Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org>	2024-12-18 11:56:38 +01:00
Yüce Kürüm	d2857bb993	libamxp: upstep to 2.3.0 This upstep includes following fixes: - Issue: PPW-65 - [USP][CDRouter][Random] Some datamodel path are missing in USP hl-api tests Signed-off-by: Yüce Kürüm <yuce.kurum@mind.be> Signed-off-by: Yüce Kürüm <yuce.kurum_ext@softathome.com>	2024-09-23 12:33:02 +02:00
Yüce Kürüm	b528eebbca	libamxrt: upstep to 0.6.3 This upstep includes following fixes: - Issue: PPW-65 - [USP][CDRouter][Random] Some datamodel path are missing in USP hl-api tests - Issue: NET-6038 Avoid double USP connections to the same sockets Signed-off-by: Yüce Kürüm <yuce.kurum@mind.be> Signed-off-by: Yüce Kürüm <yuce.kurum_ext@softathome.com>	2024-09-23 12:32:48 +02:00
Petr Štetiar	35a1122c88	libamxrt: fix libcap-ng issues on ext4 by enabling EXT4_FS_SECURITY Commit `3dc4681f9b` ("Integrating libamxp to master_v2.1.1") added handling of subprocess capabilities via libcap-ng, which on targets utilizing ext4 filesystem needs EXT4_FS_SECURITY kernel config symbol enabled for proper support of extended filesystem attributes via fsetxattr(): amxp_subproc_start() `-amxp_subproc_vstart() `-amxp_subproc_exec_child() `-amxp_subproc_set_capabilities() `-capng_apply_caps_fd() `-fsetxattr() open("/usr/sbin/unbound", O_RDWR\|O_LARGEFILE) = 3 ... fsetxattr(3, "security.capability", "\1\0\0\2\0\0\0\0*$\0\200\0\0\0\0\0\0\0", 20, 0) = -1 EOPNOTSUPP (Not supported) This failure then leads to missing CAP_NET_BIND_SERVICE capability and thus unbound can't start: [1726337363] unbound[30984:0] error: can't bind socket: Permission denied for 0.0.0.0 port 53 [1726337363] unbound[30984:0] error: can't bind socket: Permission denied for :: port 53 [1726337363] unbound[30984:0] fatal error: could not open ports ... tr181-dns: dns - [i]Started Unbound (1 times) - (start_unbound@modunbound_main.c:455) tr181-dns: dns - [i]wait for wait:done - (start_unbound@modunbound_main.c:457) tr181-dns: dns - [x]Unbound stopped! - (unbound_stopped@modunbound_main.c:373) So lets fix it by selecting KERNEL_EXT4_FS_SECURITY config symbol if either target uses ext4 filesystem or kmod-fs-ext4 package is selected. Fixes: PPW-74 References: PCF-1411 Fixes: `3dc4681f9b` ("Integrating libamxp to master_v2.1.1") Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org> GitOrigin-RevId: 85e0e6f92a8112ba9c3e102fc9f39341f17de3ae (cherry picked from commit `825c023cd8`)	2024-09-18 18:48:35 +00:00
sahbot	a685e3c251	Integrating libamxa to master_v0.11.1 Issue: SOFA-435 amxa resolver go into infinite loop if a invalid path is used Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 05f478ed2cedfe60595dcecc78674c2aff59bb2a (cherry picked from commit `1729efedca`)	2024-09-18 18:48:34 +00:00