From e4274b9c15a218ad30ace3f07ffd629c2d70411e Mon Sep 17 00:00:00 2001 From: Vivek Dutta Date: Tue, 21 Oct 2025 12:20:30 +0530 Subject: [PATCH] userinterface: vendor extension for FirstLogin (cherry picked from commit 0cb9aac1f1217cd7a5584d5ebf50d9fc49bbd76b) Co-authored-by: Vivek Kumar Dutta --- userinterface/Config.in | 12 ++++++++++++ userinterface/Makefile | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/userinterface/Config.in b/userinterface/Config.in index 46c532d91..35a024d35 100644 --- a/userinterface/Config.in +++ b/userinterface/Config.in @@ -20,4 +20,16 @@ config USERINTERFACE_HTTPACCESS_MIGRATE_NGINX_CONFIG default n help Migrate nginx to userinterface on firmware upgrade + +config USERINTERFACE_VENDOR_EXTENSIONS + bool "Include vendor extensions for UserInterface object" + default y + help + Includes datamodel Vendor extensions for UserIntercace object + +config USERINTERFACE_VENDOR_PREFIX + depends on USERINTERFACE_VENDOR_EXTENSIONS + string "Vendor Prefix for userinterface datamodel extensions" + default "" + endif diff --git a/userinterface/Makefile b/userinterface/Makefile index d64221532..a997a2dc0 100644 --- a/userinterface/Makefile +++ b/userinterface/Makefile @@ -11,7 +11,7 @@ LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/userinterface.git -PKG_SOURCE_VERSION:=a5970a83b8ac79c4577edc6a994b850cdbe1c82f +PKG_SOURCE_VERSION:=52f8bff5941c5e91d7ed8eed33cf5adf364960c5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif @@ -42,6 +42,15 @@ define Package/$(PKG_NAME)/config source "$(SOURCE)/Config.in" endef +ifeq ($(CONFIG_USERINTERFACE_VENDOR_EXTENSIONS),y) +TARGET_CFLAGS += -DUSERINTERFACE_VENDOR_EXTENSIONS +ifeq ($(CONFIG_USERINTERFACE_VENDOR_PREFIX),"") +TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\" +else +TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_USERINTERFACE_VENDOR_PREFIX)\\\" +endif +endif + ifeq ($(LOCAL_DEV),1) define Build/Prepare $(CP) -rf ~/git/userinterface/* $(PKG_BUILD_DIR)/