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 08:04:11 +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
14 changed files with 142 additions and 63 deletions
--- a/apps/amxo-cg/Makefile
+++ b/apps/amxo-cg/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=amxo-cg-v1.5.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amxo-cg/-/archive/v1.5.3
-PKG_HASH:=c6a4865e1757ea2f5374d1753dc454a36d05f9900a6fa18bb6e58b33351a3939
-PKG_BUILD_DIR:=$(BUILD_DIR)/amxo-cg-v1.5.3
+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
--- a/apps/amxrt/Makefile
+++ b/apps/amxrt/Makefile
@@ -1,20 +1,27 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=amxrt-v2.1.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/applications/amxrt/-/archive/v2.1.3
-PKG_HASH:=a414dbf2d596753641456e755521448f52d71b1f3418d9f5dba88d70b0be7678
-PKG_BUILD_DIR:=$(BUILD_DIR)/amxrt-v2.1.3
+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

+COMPONENT:=amxrt

 PKG_RELEASE:=1

+define SAHInit/Install
+	install -d ${PKG_INSTALL_DIR}/etc/rc.d/
+	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/amx-shutdown-wait ${PKG_INSTALL_DIR}/etc/rc.d/S90amx-shutdown-wait
+	ln -sfr ${PKG_INSTALL_DIR}/etc/init.d/amx-shutdown-wait ${PKG_INSTALL_DIR}/etc/rc.d/K90amx-shutdown-wait
+endef
+
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
@@ -44,6 +51,8 @@ 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 SAHInit/Install)
 endef

 define Build/InstallDev
--- a/libs/libamxa/Makefile
+++ b/libs/libamxa/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=libamxa-v0.11.0.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxa/-/archive/v0.11.0
-PKG_HASH:=18bdeaf99a56530c7b2725cc3bced0eb92e04e54c57ae0f3aa98ac4c005588a9
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxa-v0.11.0
+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
--- a/libs/libamxb/Makefile
+++ b/libs/libamxb/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libamxb
-PKG_VERSION:=v4.10.3
+PKG_VERSION:=dev_skip_version_check
 SHORT_DESCRIPTION:=Bus agnostic C API (mediator)

-PKG_SOURCE:=libamxb-v4.10.3.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxb/-/archive/v4.10.3
-PKG_HASH:=8a2643438284c3a08dae8dc19e563c4cf6584de5ee4df6dd3f96e53a908d31db
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxb-v4.10.3
+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,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=libamxc-v2.0.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxc/-/archive/v2.0.2
-PKG_HASH:=448a032cc7288a4cd7009d9364a133a9ecc2466c47954b9ad9789600428cdaf6
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxc-v2.0.2
+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/libamxj/Makefile
+++ b/libs/libamxj/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=libamxj-v1.0.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxj/-/archive/v1.0.2
-PKG_HASH:=85e64559b84e88d63bfacb4db8b361b58175b9eecad8e545105209df303dfba8
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxj-v1.0.2
+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,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=libamxm-v0.0.68.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxm/-/archive/v0.0.68
-PKG_HASH:=67191dcf269aeeeb7ecba3eabaacd830a2f35312bf9ff4a66355391adfd1a7f9
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxm-v0.0.68
+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,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=libamxo-v5.0.1.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxo/-/archive/v5.0.1
-PKG_HASH:=0f79ad13e6623edbc2aeec27422908f808c814fa2a13ca5a6c3f2a8c62e08855
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxo-v5.0.1
+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
--- a/libs/libamxp/Makefile
+++ b/libs/libamxp/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=libamxp-v2.1.2.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxp/-/archive/v2.1.2
-PKG_HASH:=1a1ad4718029e0b9c4cc9b1174217fb9bfd3c4153eb5f1b91e717141c59b7c4b
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxp-v2.1.2
+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
--- a/libs/libamxrt/Config.in
+++ b/libs/libamxrt/Config.in
@@ -10,11 +10,23 @@ menu "Select libamxrt build options"
 config SAH_LIB_AMXRT
    bool "Build libamxrt"
    default y
+    select KERNEL_EXT4_FS_SECURITY if USES_EXT4 || PACKAGE_kmod-fs-ext4
+    select KERNEL_JFFS2_FS_SECURITY if USES_JFFS2 || USES_JFFS2_NAND
+    select KERNEL_UBIFS_FS_SECURITY if USES_UBIFS
+    select KERNEL_F2FS_FS_SECURITY if PACKAGE_mkf2fs

 config SAH_AMXRT_RWDATAPATH
    string "Persistent storage location"
    default "/etc/config"

+config FORCE_RUNNING_AS_ROOT
+    bool "INSECURE: This options forces ambiorix components to run as the root user, even if they request to run as a different user"
+    default y
+
+config REMOVE_CAPS_ODLS
+    bool "INSECURE: This option removes all the capability ODLs (*_caps.odl) from /etc/amx and subdirectories during first boot. This will also force all components to run as root"
+    default y
+
 endmenu

 endif
--- a/libs/libamxrt/Makefile
+++ b/libs/libamxrt/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=libamxrt-v0.5.5.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/libraries/libamxrt/-/archive/v0.5.5
-PKG_HASH:=b88a2d1a70360fb5177b0ce067217e451d51f24f108d448b78635420a19bdf1a
-PKG_BUILD_DIR:=$(BUILD_DIR)/libamxrt-v0.5.5
+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
@@ -38,15 +38,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 CONFIG_SAH_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH))
+	$(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_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/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_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH))
+	$(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_SAH_AMXRT_RWDATAPATH=$(CONFIG_SAH_AMXRT_RWDATAPATH))
+	$(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/libamxtui/Makefile
+++ b/libs/libamxtui/Makefile
@@ -0,0 +1,58 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libamxtui
+PKG_VERSION:=v0.1.7
+SHORT_DESCRIPTION:=Libamxtui is a library that provides terminal user interface widgets based on ncurses
+
+PKG_SOURCE:=libamxtui-v0.1.7.tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/amxlab/tui/libraries/libamxtui/-/archive/v0.1.7
+PKG_HASH:=6bf9aa7276417534471d09925e31f99276e290348bbfced3534f7f5075622824
+PKG_BUILD_DIR:=$(BUILD_DIR)/libamxtui-v0.1.7
+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:=prpl Foundation
+  SUBMENU:=Ambiorix
+  TITLE:=$(SHORT_DESCRIPTION)
+  URL:=https://gitlab.com/prpl-foundation/components/ambiorix/amxlab/tui/libraries/libamxtui
+  DEPENDS += +libamxc
+  DEPENDS += +libamxt
+  DEPENDS += +libamxp
+  DEPENDS += +libncurses
+  MENU:=1
+endef
+
+define Package/$(PKG_NAME)/description
+	Libamxtui is a library that provides terminal user interface widgets based on ncurses.
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default, STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+endef
+
+define Build/Install
+	$(call Build/Install/Default, install INSTALL=install D=$(PKG_INSTALL_DIR) DEST=$(PKG_INSTALL_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+endef
+
+define Build/InstallDev
+	$(call Build/Install/Default, install INSTALL=install D=$(STAGING_DIR) DEST=$(STAGING_DIR) STAGINGDIR=$(STAGING_DIR) CONFIGDIR=$(STAGING_DIR) PV=$(PKG_VERSION) PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig LIBDIR=/usr/lib INSTALL_LIB_DIR=/lib INSTALL_BIN_DIR=/bin RAW_VERSION=$(PKG_VERSION) HARDCO_HAL_DIR=$(STAGING_DIR)/usr/include)
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	if [ -d ./files ]; then \
+		$(CP) ./files/* $(1)/; \
+	fi
+	find $(1) -name *.a -exec rm {} +;
+	find $(1) -name *.h -exec rm {} +;
+	find $(1) -name *.pc -exec rm {} +;
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/mods/mod-amxb-pcb/Makefile
+++ b/mods/mod-amxb-pcb/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=mod-amxb-pcb
-PKG_VERSION:=v3.10.7
+PKG_VERSION:=v3.12.0
 SHORT_DESCRIPTION:=PCB backend implementation for amxb

-PKG_SOURCE:=amxb_pcb-v3.10.7.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amxb_backends/amxb_pcb/-/archive/v3.10.7
-PKG_HASH:=27956b91c44660bdbe4b9d4bbff8fea62b8f338618400cfa07914f92e1d665f4
-PKG_BUILD_DIR:=$(BUILD_DIR)/amxb_pcb-v3.10.7
+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
--- a/mods/mod-amxb-ubus/Makefile
+++ b/mods/mod-amxb-ubus/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

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

-PKG_SOURCE:=amxb_ubus-v3.3.6.tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/prpl-foundation/components/ambiorix/modules/amxb_backends/amxb_ubus/-/archive/v3.3.6
-PKG_HASH:=7fa5ec15350995e95e0e3e49e80bfb07d46573d0608458f5a4ef66aee084ae5c
-PKG_BUILD_DIR:=$(BUILD_DIR)/amxb_ubus-v3.3.6
+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
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
sahbot	7e21539857	Integrating libamxm to master_v0.1.0 Issue: HOP-7173 Fix example in libamxm Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: c7f8ebdc8d791431ce7ecf55a7358f26e0d4bf59	2024-07-26 05:40:57 +00:00
sahbot	74c7af74de	Integrating libamxc to master_v2.1.0 Issue: HOP-7172 Remove length argument of hash functions Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: f4df85292da1ae36e8bb29741a1512d5e6e790f8	2024-07-26 05:40:57 +00:00
sahbot	0a011c310c	Integrating mod-amxb-ubus to master_v3.4.0 Issue: NET-6007 Bus statistics: basic counters Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: 3d07525c9a3d7c17f585be5585908a2b6ef6e682	2024-07-26 05:40:57 +00:00
sahbot	8aaa1fe230	Integrating mod-amxb-pcb to master_v3.12.0 Issue: NET-6006 Bus statistics: basic counters Signed-off-by: sahbot <sahbot@softathome.com> GitOrigin-RevId: c31d2c41abefc3624dda515eb950a1cb6cba2db7	2024-07-26 05:40:57 +00:00
sahbot	97eaa1872d	Integrating libamxb to master_v4.11.1 Issue: NET-6005 Bus statistics: backend interface, client interface, basic common stats GitOrigin-RevId: 71745cd89febcedd7a405198b6bf1f7fbe4e0e08	2024-07-26 05:40:57 +00:00
sahbot	1e1a5f1518	Integrating libamxb to master_v4.11.0 Issue: NET-6005 Bus statistics: backend interface, client interface, basic common stats GitOrigin-RevId: 96a5203d57a60e98260bf725bb5c3c08c3e04fe0	2024-07-26 05:40:57 +00:00
sahbot	f6c159fe68	Integrating mod-amxb-pcb to master_v3.11.1 Issue: HOP-6876 [AMX] Lib amxb crashes due to doube free call GitOrigin-RevId: c99e716e98ce37e2ce3ee48f0754f674c2dc407c	2024-07-18 05:53:10 +00:00
sahbot	c226e0b916	Integrating amxrt to master_v2.2.0 Issue: HOP-4680 Move amx init functions to related component [fix] GitOrigin-RevId: 987f4ea266464774e8d49fa76fbad065a8141660	2024-07-18 05:53:10 +00:00
sahbot	a4bcdd95dc	Integrating mod-amxb-pcb to master_v3.11.0 Issue: HOP-7093 [AMXB] Introduce depth and event_types parameters for subscriptions GitOrigin-RevId: 93c8772a4121f029925400b3cea7444e06bda42f	2024-07-17 05:14:32 +00:00
sahbot	05ee5f793c	Integrating libamxp to master_v2.2.0 Issue: HOP-7084 amxp: add amxp_subproc_close_fd(amxp_subproc_t* proc, int fd) Issue: HOP-7091 amxp: fds from amxp_subproc_open_fd() must not be O_NONBLOCK for the child GitOrigin-RevId: 8ac6cf2d88f67082fc39240e77e5ff3bb079acdd	2024-07-17 05:14:32 +00:00
sahbot	a7679e02d5	Integrating libamxrt to master_v0.6.1 Issue: HOP-5530 [USP][AMX] Add connection retry mechanism for broken connections Issue: HOP-7090 - Apply process capabilities after obtaining the required plugin objects [fix] GitOrigin-RevId: e399df380f5e65042a72691a67cc2ec23a97cb86	2024-07-17 05:14:32 +00:00
sahbot	f60624e13d	Integrating libamxrt to master_v0.6.0 Issue: HOP-5530 [USP][AMX] Add connection retry mechanism for broken connections GitOrigin-RevId: ebb19e77a2a5623dbeb751f7c605194fad7aaf73	2024-07-17 05:14:32 +00:00
sahbot	c9c291e6b5	Integrating libamxo to master_v5.0.2 Issue: NET-5979 [AMX] User flags must be saved for key parameters GitOrigin-RevId: 33e3564ae4a6465a682547b53908b902c6ffcae7	2024-07-17 05:14:32 +00:00
sahbot	bddfc9de08	Integrating amxo-cg to master_v1.5.4 Issue: DUMMY-0000 - No associated bugs found GitOrigin-RevId: 4b251046216d648428e360c71b7f617b99de3ea9	2024-07-17 05:14:32 +00:00
sahbot	15f852c997	Integrating libamxj to master_v1.0.3 Issue: HOP-7007 Improve documentation and unit tests for amxj_write [other] GitOrigin-RevId: cad515c51bc6291e57d5812c31903c581805fcb3	2024-07-17 05:14:32 +00:00
sahbot	b5ed6fc2a4	share libamxtui on gitlab.com GitOrigin-RevId: 5ad02a90ea73c43e65601aca8b8e1ba01e925f64	2024-07-05 07:42:31 +00:00
sahbot	edbe825a22	Integrating mod-amxb-pcb to master_v3.10.9 Issue: DUMMY-0000 - No associated bugs found GitOrigin-RevId: 7bdf70ed0c222788f50290673ae95d84751fff09	2024-07-05 06:55:40 +00:00