Skip to content

Commit

Permalink
uboot-envtools: support uci-default config also per subtargets
Browse files Browse the repository at this point in the history
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 <pepe2k@gmail.com>
  • Loading branch information
pepe2k committed May 20, 2021
1 parent 9a99903 commit 6f3a05e
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions package/boot/uboot-envtools/Makefile
Expand Up @@ -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

Expand Down

0 comments on commit 6f3a05e

Please sign in to comment.