From 6f3a05ebb07570a15d0f8d3d7532272e71786781 Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Fri, 2 Apr 2021 00:52:56 +0200 Subject: [PATCH] uboot-envtools: support uci-default config also per subtargets The current version of 'uboot-envtools' package generates dedicated uci-default file only per target. This change makes it possible to use subtarget-specific files, with name pattern: 'target_subtarget' (example: 'ath79_nand'). The subtarget-specific files will take precedence over target-specific one. Signed-off-by: Piotr Dymacz --- package/boot/uboot-envtools/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index 02bca9cea3f..1ace390c40a 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -73,9 +73,13 @@ define Package/uboot-envtools/install $(INSTALL_DIR) $(1)/lib $(INSTALL_DATA) ./files/uboot-envtools.sh $(1)/lib $(INSTALL_DIR) $(1)/etc/uci-defaults - $(if $(wildcard ./files/$(BOARD)), \ - $(INSTALL_DATA) ./files/$(BOARD) \ - $(1)/etc/uci-defaults/30_uboot-envtools \ + $(if $(wildcard ./files/$(BOARD)_$(SUBTARGET)), \ + $(INSTALL_DATA) ./files/$(BOARD)_$(SUBTARGET) \ + $(1)/etc/uci-defaults/30_uboot-envtools, \ + $(if $(wildcard ./files/$(BOARD)), \ + $(INSTALL_DATA) ./files/$(BOARD) \ + $(1)/etc/uci-defaults/30_uboot-envtools \ + ) \ ) endef -- 2.30.2