From 0b824fc5b17c12fd9d640c11e8ec2cdc95f61f94 Mon Sep 17 00:00:00 2001 From: CyberMind-FR Date: Thu, 25 Dec 2025 19:57:01 +0100 Subject: [PATCH] fix: standardize Makefile includes for GitHub Actions compatibility Standardizes all Makefile include paths to use $(TOPDIR)/feeds/luci/luci.mk instead of relative paths (../../luci.mk). This fixes firmware build failures on GitHub Actions while maintaining local build compatibility. Problem: - Local builds worked with relative paths (../../luci.mk) - GitHub Actions builds failed because packages are copied to openwrt/package/secubox/ where relative paths don't work - Inconsistent includes across packages caused build failures Solution: - Use absolute path: $(TOPDIR)/feeds/luci/luci.mk - Works in both environments (local feed development AND GitHub Actions) - Simplifies auth-guardian Makefile to use LuCI.mk template Changes: - auth-guardian: Converted to LuCI.mk template format - bandwidth-manager, ksm-manager, media-flow: Updated includes - system-hub, traffic-shaper, vhost-manager: Updated includes All 15 packages now use consistent Makefile format. Fixes: Firmware generation on GitHub Actions Related: v0.1.2-alpha --- luci-app-auth-guardian/Makefile | 47 +++++------------------------ luci-app-bandwidth-manager/Makefile | 2 +- luci-app-ksm-manager/Makefile | 2 +- luci-app-media-flow/Makefile | 2 +- luci-app-system-hub/Makefile | 2 +- luci-app-traffic-shaper/Makefile | 2 +- luci-app-vhost-manager/Makefile | 2 +- 7 files changed, 13 insertions(+), 46 deletions(-) diff --git a/luci-app-auth-guardian/Makefile b/luci-app-auth-guardian/Makefile index 22970440..63438be6 100644 --- a/luci-app-auth-guardian/Makefile +++ b/luci-app-auth-guardian/Makefile @@ -3,47 +3,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-auth-guardian PKG_VERSION:=1.0.0 PKG_RELEASE:=1 -PKG_MAINTAINER:=CyberMind PKG_LICENSE:=MIT +PKG_MAINTAINER:=CyberMind -include $(INCLUDE_DIR)/package.mk +LUCI_TITLE:=Auth Guardian - Authentication & Session Manager +LUCI_DESCRIPTION:=Comprehensive authentication and session management with captive portal, OAuth2/OIDC integration, voucher system, and time-based access control +LUCI_DEPENDS:=+luci-base +rpcd +nodogsplash +LUCI_PKGARCH:=all -define Package/luci-app-auth-guardian - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=Auth Guardian - Authentication & Session Manager - DEPENDS:=+luci-base +rpcd +nodogsplash - PKGARCH:=all -endef +include $(TOPDIR)/feeds/luci/luci.mk -define Package/luci-app-auth-guardian/description - Comprehensive authentication and session management: - - Captive portal with customizable splash pages - - OAuth2/OIDC integration (Google, GitHub, etc.) - - Cookie-based session management - - MAC authentication bypass - - Voucher/ticket system - - Time-based access control - - User/device tracking -endef - -define Build/Compile -endef - -define Package/luci-app-auth-guardian/install - $(INSTALL_DIR) $(1)/usr/libexec/rpcd - $(INSTALL_BIN) ./root/usr/libexec/rpcd/luci.auth-guardian $(1)/usr/libexec/rpcd/ - $(INSTALL_DIR) $(1)/usr/share/luci/menu.d - $(INSTALL_DATA) ./root/usr/share/luci/menu.d/*.json $(1)/usr/share/luci/menu.d/ - $(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d - $(INSTALL_DATA) ./root/usr/share/rpcd/acl.d/*.json $(1)/usr/share/rpcd/acl.d/ - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./root/etc/config/authguard $(1)/etc/config/ - $(INSTALL_DIR) $(1)/www/luci-static/resources/view/auth-guardian - $(INSTALL_DATA) ./htdocs/luci-static/resources/view/auth-guardian/*.js $(1)/www/luci-static/resources/view/auth-guardian/ - $(INSTALL_DIR) $(1)/www/luci-static/resources/auth-guardian - $(INSTALL_DATA) ./htdocs/luci-static/resources/auth-guardian/*.js $(1)/www/luci-static/resources/auth-guardian/ -endef - -$(eval $(call BuildPackage,luci-app-auth-guardian)) +# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-bandwidth-manager/Makefile b/luci-app-bandwidth-manager/Makefile index 9349c9ea..40511664 100644 --- a/luci-app-bandwidth-manager/Makefile +++ b/luci-app-bandwidth-manager/Makefile @@ -11,6 +11,6 @@ LUCI_DESCRIPTION:=Advanced bandwidth management with QoS rules, client quotas, a LUCI_DEPENDS:=+luci-base +rpcd +tc +kmod-sched-core +kmod-sched-cake +kmod-ifb +sqm-scripts +iptables +iptables-mod-conntrack-extra +ip-full LUCI_PKGARCH:=all -include ../../luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-ksm-manager/Makefile b/luci-app-ksm-manager/Makefile index 4d37d832..6bf69395 100644 --- a/luci-app-ksm-manager/Makefile +++ b/luci-app-ksm-manager/Makefile @@ -16,6 +16,6 @@ LUCI_PKGARCH:=all PKG_MAINTAINER:=SecuBox Project PKG_LICENSE:=Apache-2.0 -include ../../luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-media-flow/Makefile b/luci-app-media-flow/Makefile index 1af00e6c..16b6e8b9 100644 --- a/luci-app-media-flow/Makefile +++ b/luci-app-media-flow/Makefile @@ -14,6 +14,6 @@ LUCI_DESCRIPTION:=Real-time detection and monitoring of streaming services (Netf LUCI_DEPENDS:=+luci-base +rpcd +netifyd +luci-app-netifyd-dashboard LUCI_PKGARCH:=all -include ../../luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-system-hub/Makefile b/luci-app-system-hub/Makefile index 6f0756c5..e91348b0 100644 --- a/luci-app-system-hub/Makefile +++ b/luci-app-system-hub/Makefile @@ -11,6 +11,6 @@ LUCI_DESCRIPTION:=Central system control with monitoring, services, logs, and ba LUCI_DEPENDS:=+luci-base +rpcd +coreutils +coreutils-base64 LUCI_PKGARCH:=all -include ../../luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-traffic-shaper/Makefile b/luci-app-traffic-shaper/Makefile index 76e99b16..40c961e2 100644 --- a/luci-app-traffic-shaper/Makefile +++ b/luci-app-traffic-shaper/Makefile @@ -10,6 +10,6 @@ LUCI_TITLE:=Traffic Shaper - Advanced QoS Control LUCI_DESCRIPTION:=Advanced traffic shaping with TC/CAKE for precise bandwidth control LUCI_DEPENDS:=+luci-base +rpcd +tc +kmod-sched-core +kmod-sched-cake -include ../../luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-vhost-manager/Makefile b/luci-app-vhost-manager/Makefile index 8af20357..40bedb72 100644 --- a/luci-app-vhost-manager/Makefile +++ b/luci-app-vhost-manager/Makefile @@ -14,6 +14,6 @@ LUCI_DESCRIPTION:=Nginx reverse proxy manager with Let's Encrypt SSL certificate LUCI_DEPENDS:=+luci-base +rpcd +nginx-ssl +acme +curl LUCI_PKGARCH:=all -include ../../luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature