From f13f7501a1b73087912938fb0a6f17db501ad221 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 20 Sep 2024 08:18:22 +0200 Subject: [PATCH] base-files: allow concurrent build with wifi-scripts A feed might provide the new wifi-scripts package that moved the wifi script files to a dedicated package. Add support for this by tweaking base-files package and check if wifi-scripts is getting compiled. In such case, remove the base-files file in favor of feed package. Signed-off-by: John Crispin Signed-off-by: Christian Marangi --- package/base-files/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 0d2ec1a12d..6e85b4f007 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -17,6 +17,7 @@ PKG_RELEASE:=$(COMMITCOUNT) PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_BUILD_DEPENDS:=usign/host ucert/host +PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_wifi-scripts PKG_LICENSE:=GPL-2.0 # Extend depends from version.mk @@ -249,6 +250,8 @@ endif $(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \ rm -f $(1)/etc/banner.failsafe,) + $(if $(CONFIG_PACKAGE_wifi-scripts), \ + rm -f $(1)/sbin/wifi,) ifneq ($(CONFIG_USE_APK),) mkdir -p $(1)/etc/apk/