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 <john@phrozen.org> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
parent
402a49e995
commit
f13f7501a1
@ -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/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user