diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 440ce07f..946480e4 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -167,7 +167,11 @@ "Bash(timeout 300 make:*)", "Bash(timeout 120 make:*)", "Bash(ln:*)", - "Bash(tee:*)" + "Bash(tee:*)", + "Bash(feeds/packages/net/crowdsec/patches/)", + "Bash(feeds/packages/net/crowdsec/files/)", + "Bash(feeds/packages/net/crowdsec/Makefile)", + "Bash(feeds/packages/net/crowdsec/patches/002-fix_go_version.patch)" ] } } diff --git a/package/secubox/nodogsplash/Makefile b/package/secubox/secubox-app-nodogsplash/Makefile similarity index 94% rename from package/secubox/nodogsplash/Makefile rename to package/secubox/secubox-app-nodogsplash/Makefile index 9f180682..9d2aa9a1 100644 --- a/package/secubox/nodogsplash/Makefile +++ b/package/secubox/secubox-app-nodogsplash/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=nodogsplash +PKG_NAME:=secubox-app-nodogsplash PKG_VERSION:=5.0.2 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=nodogsplash-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/nodogsplash/nodogsplash/archive/refs/tags PKG_HASH:=908d3674e93726fdcefb4c3b6705c745753435df9d46425781a57e3f6b417797 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/nodogsplash-$(PKG_VERSION) PKG_BUILD_PARALLEL:=1 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/nodogsplash/files/nodogsplash.init b/package/secubox/secubox-app-nodogsplash/files/nodogsplash.init similarity index 100% rename from package/secubox/nodogsplash/files/nodogsplash.init rename to package/secubox/secubox-app-nodogsplash/files/nodogsplash.init diff --git a/secubox-tools/local-build.sh b/secubox-tools/local-build.sh index 200b907f..3250b356 100755 --- a/secubox-tools/local-build.sh +++ b/secubox-tools/local-build.sh @@ -619,6 +619,7 @@ copy_packages() { print_info "Packages in feed:" ls -d "$feed_dir/luci-app-"*/ 2>/dev/null || true ls -d "$feed_dir/luci-theme-"*/ 2>/dev/null || true + ls -d "$feed_dir/secubox-app-"*/ 2>/dev/null || true # Update the secubox feed echo "" @@ -650,6 +651,15 @@ copy_packages() { fi done + # Install secubox-app-* packages + for pkg in "$feed_dir"/secubox-app-*/; do + if [[ -d "$pkg" ]]; then + local pkg_name=$(basename "$pkg") + echo " Installing $pkg_name..." + ./scripts/feeds install "$pkg_name" 2>&1 | grep -v "WARNING:" || true + fi + done + # Install secubox core packages for pkg_name in "${core_pkg_names[@]}"; do local pkg_path="$feed_dir/$pkg_name" @@ -704,6 +714,15 @@ configure_packages() { print_success "$pkg_name enabled" fi done + + # Enable all SecuBox app packages from feed (secubox-app-*) + for pkg in feeds/secubox/secubox-app-*/; do + if [[ -d "$pkg" ]]; then + local pkg_name=$(basename "$pkg") + echo "CONFIG_PACKAGE_${pkg_name}=m" >> .config + print_success "$pkg_name enabled" + fi + done fi # Disable problematic packages that fail to compile in SDK @@ -1547,7 +1566,7 @@ USAGE: COMMANDS: validate Run validation only (lint, syntax checks) build Build all packages for x86_64 - build Build single package + build Build single package (luci-app-*, luci-theme-*, secubox-app-*) build --arch Build for specific architecture build-firmware Build full firmware image for device debug-firmware Debug firmware build (check config without building) @@ -1578,9 +1597,12 @@ EXAMPLES: # Build all packages for x86_64 $0 build - # Build single package + # Build single LuCI package $0 build luci-app-system-hub + # Build single SecuBox app package + $0 build secubox-app-nodogsplash + # Build for specific architecture $0 build --arch aarch64-cortex-a72 @@ -1636,7 +1658,7 @@ main() { arch_specified=true shift 2 ;; - luci-app-*|luci-theme-*) + luci-app-*|luci-theme-*|secubox-app-*) single_package="$1" shift ;;