gandalf/secubox-openwrt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: standardize Makefile includes for GitHub Actions compatibility

Browse Source 
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
This commit is contained in:
CyberMind-FR 2025-12-25 19:57:01 +01:00
parent e67df835e2
commit 0b824fc5b1
7 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
luci-app-auth-guardian/Makefile
View File

@ -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 <contact@cybermind.fr>
PKG_LICENSE:=MIT
PKG_MAINTAINER:=CyberMind <contact@cybermind.fr>
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

2
luci-app-bandwidth-manager/Makefile
View File

@ -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

2
luci-app-ksm-manager/Makefile
View File

@ -16,6 +16,6 @@ LUCI_PKGARCH:=all
PKG_MAINTAINER:=SecuBox Project <secubox@example.com>
PKG_LICENSE:=Apache-2.0
include ../../luci.mk
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature

2
luci-app-media-flow/Makefile
View File

@ -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

2
luci-app-system-hub/Makefile
View File

@ -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

2
luci-app-traffic-shaper/Makefile
View File

@ -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

2
luci-app-vhost-manager/Makefile
View File

@ -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