From 668c7d76caba5ac1bf10ea12fdfe9e95018ff216 Mon Sep 17 00:00:00 2001 From: CyberMind-FR Date: Wed, 31 Dec 2025 14:23:49 +0100 Subject: [PATCH] fix(secubox): use Package/luci/install macro for proper htdocs/root handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replace manual CP commands with - This ensures proper integration with luci.mk build system - Fixes appstore files not being included in built packages - Bump version to 0.7.0-6 The issue was that manually copying htdocs and root bypassed luci.mk's install logic. Now we call the parent installer first, then add our custom /usr/share/secubox directories. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 --- luci-app-secubox/Makefile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/luci-app-secubox/Makefile b/luci-app-secubox/Makefile index af9313fb..6d9783a9 100644 --- a/luci-app-secubox/Makefile +++ b/luci-app-secubox/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-secubox PKG_VERSION:=0.7.0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind @@ -24,17 +24,10 @@ PKG_FILE_MODES:=/usr/libexec/rpcd/luci.secubox:root:root:755 \ include $(TOPDIR)/feeds/luci/luci.mk define Package/$(PKG_NAME)/install - # Standard LuCI package install (htdocs, root, etc.) - $(INSTALL_DIR) $(1)/usr - $(INSTALL_DIR) $(1)/usr/share - $(INSTALL_DIR) $(1)/usr/share/rpcd - $(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d - $(INSTALL_DIR) $(1)/www - $(INSTALL_DIR) $(1)/etc - $(CP) ./htdocs/* $(1)/www/ - $(CP) ./root/* $(1)/ + # Call parent LuCI installer for htdocs and root + $(call Package/luci/install,$(1)) - # Install SecuBox data directories (MUST be explicit, not via luci.mk) + # Install SecuBox data directories (custom, not handled by luci.mk) $(INSTALL_DIR) $(1)/usr/share/secubox $(INSTALL_DIR) $(1)/usr/share/secubox/profiles $(INSTALL_DIR) $(1)/usr/share/secubox/appstore