CyberMind-FR
5afb02c815
Resolves package conflict where both luci-app-secubox and secubox-core were providing /usr/libexec/rpcd/luci.secubox. Changes: - Remove RPCD backend (luci.secubox) from luci-app-secubox - Add secubox-core as a dependency - Update Makefile to reflect new architecture - Remove RPCD file references from helper scripts - Update documentation Architecture: - secubox-core (v0.8.0): Provides framework + RPCD backend - luci-app-secubox (v0.7.0): Provides LuCI web UI only 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
85 lines
3.0 KiB
Makefile
85 lines
3.0 KiB
Makefile
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=luci-app-secubox
|
|
PKG_VERSION:=0.7.0
|
|
PKG_RELEASE:=6
|
|
PKG_LICENSE:=Apache-2.0
|
|
PKG_MAINTAINER:=CyberMind <contact@cybermind.fr>
|
|
|
|
LUCI_TITLE:=LuCI - SecuBox Hub (Central Dashboard)
|
|
LUCI_DESCRIPTION:=Central control hub for all SecuBox modules. Provides unified dashboard, module status, system health monitoring, and quick actions.
|
|
LUCI_DEPENDS:=+luci-base +rpcd +curl +jq +secubox-core
|
|
LUCI_PKGARCH:=all
|
|
|
|
# File permissions (CRITICAL: Helper scripts MUST be executable 755)
|
|
# Format: path:owner:group:mode
|
|
# - Helper scripts: 755 (if executable)
|
|
# - Data files: 644 (readable by all - INSTALL_DATA sets this automatically)
|
|
# - Directories: 755 (set automatically by INSTALL_DIR)
|
|
# - CSS/JS files: 644 (set automatically by luci.mk)
|
|
# Note: RPCD backend is now provided by secubox-core package
|
|
PKG_FILE_MODES:=/usr/libexec/secubox/fix-permissions.sh:root:root:755
|
|
|
|
include $(TOPDIR)/feeds/luci/luci.mk
|
|
|
|
define Package/$(PKG_NAME)/install
|
|
# Call parent LuCI installer for htdocs and root
|
|
$(call Package/luci/install,$(1))
|
|
|
|
# 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
|
|
|
|
# Install profiles
|
|
$(INSTALL_DATA) ./profiles/*.json $(1)/usr/share/secubox/profiles/ 2>/dev/null || true
|
|
|
|
# Install appstore catalog
|
|
$(INSTALL_DATA) ./appstore/apps.json $(1)/usr/share/secubox/appstore/apps.json
|
|
endef
|
|
|
|
define Package/$(PKG_NAME)/postinst
|
|
#!/bin/sh
|
|
# SecuBox post-installation script
|
|
# Ensures appstore catalog and permissions are correct
|
|
|
|
[ -n "$${IPKG_INSTROOT}" ] || {
|
|
# Check if appstore catalog exists
|
|
if [ ! -f /usr/share/secubox/appstore/apps.json ]; then
|
|
echo "WARNING: SecuBox appstore catalog not found at /usr/share/secubox/appstore/apps.json"
|
|
|
|
# Try to restore from package ROM overlay
|
|
if [ -f /rom/usr/share/secubox/appstore/apps.json ]; then
|
|
echo " Restoring from package overlay..."
|
|
mkdir -p /usr/share/secubox/appstore
|
|
cp /rom/usr/share/secubox/appstore/apps.json /usr/share/secubox/appstore/apps.json
|
|
echo " ✓ Restored appstore catalog"
|
|
else
|
|
echo " ERROR: Appstore catalog not found in package!"
|
|
echo " The app store will be empty until this is fixed."
|
|
echo " Try: opkg remove luci-app-secubox && opkg install luci-app-secubox"
|
|
fi
|
|
fi
|
|
|
|
# Set proper permissions (safe even if files don't exist)
|
|
chmod 755 /usr/share/secubox 2>/dev/null || true
|
|
chmod 755 /usr/share/secubox/appstore 2>/dev/null || true
|
|
chmod 644 /usr/share/secubox/appstore/apps.json 2>/dev/null || true
|
|
chmod 755 /usr/share/secubox/profiles 2>/dev/null || true
|
|
|
|
# Reload RPCD to pick up new methods
|
|
/etc/init.d/rpcd reload 2>/dev/null || true
|
|
|
|
echo "SecuBox: Installation complete"
|
|
if [ -f /usr/share/secubox/appstore/apps.json ]; then
|
|
echo " ✓ Appstore catalog: /usr/share/secubox/appstore/apps.json"
|
|
else
|
|
echo " ✗ Appstore catalog: MISSING"
|
|
fi
|
|
echo " ✓ RPCD methods available via: ubus call luci.secubox"
|
|
}
|
|
exit 0
|
|
endef
|
|
|
|
# call BuildPackage - OpenWrt buildroot
|