[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-99-g9f82aab36

[Sébastien S. <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  9f82aab36dd626b9c5ed31fa6d091087ae93c488 (commit)
      from  8ce9ce1f3af56cf1dc5ede1bd8ee2b69abd2ed34 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9f82aab36dd626b9c5ed31fa6d091087ae93c488
Author: Sébastien Szymanski <seb...@ar...>
Date:   Thu Jul 11 16:53:47 2019 +0200

    [BSP] Makefile: use BUILDROOT_CONFIG_DIR when deleting .config file

-----------------------------------------------------------------------

Summary of changes:
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b60d7b204..72f722bba 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,7 @@ linux-clean: $(BUILDROOT_DIR)/.configured
 
 %_defconfig: $(BUILDROOT_DIR)/.patched
 	@if [ -e "$(ARMADEUS_CONFIG_DIR)/$@" ] || [ -e "$(ARMADEUS_CONFIG_DIR)/$(patsubst %_defconfig,%,$@)/$@" ] || [ -e "$(BR2_EXTERNAL)/configs/$@" ]; then \
-		rm -f $(BUILDROOT_DIR)/.config ; \
+		rm -f $(BUILDROOT_CONFIG_DIR)/.config ; \
 		$(MAKE) -C $(BUILDROOT_DIR) $@ ; \
 		$(MAKE) -C $(BUILDROOT_DIR) menuconfig ; \
 		touch $(BUILDROOT_DIR)/.configured ; \
@@ -158,7 +158,7 @@ linux-clean: $(BUILDROOT_DIR)/.configured
 # for the one who doesn't want config menu:
 %_autoconf: $(BUILDROOT_DIR)/.patched
 	@if [ -e "$(BUILDROOT_DIR)/configs/$(patsubst %_autoconf,%,$@)_defconfig" ]; then \
-		rm -f $(BUILDROOT_DIR)/.config ; \
+		rm -f $(BUILDROOT_CONFIG_DIR)/.config ; \
 		$(MAKE) -C $(BUILDROOT_DIR) $(patsubst %_autoconf,%,$@)_defconfig ; \
 		touch $(BUILDROOT_DIR)/.configured ; \
 	else \
@@ -226,7 +226,7 @@ shell_env:
 	@echo ARMADEUS_DL_DIR=$(ARMADEUS_DL_DIR) >> $(ARMADEUS_ENV_FILE)
 
 PHONY_TARGETS+=dummy all linux linux-clean buildroot-clean buildroot-dirclean
-PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config shell_env buildroot-sources buildroot-unpacked
+PHONY_TARGETS+=menuconfig $(BUILDROOT_CONFIG_DIR)/.config shell_env buildroot-sources buildroot-unpacked
 PHONY_TARGETS+=buildroot-patched 
 .PHONY: $(PHONY_TARGETS)
 


hooks/post-receive
-- 
armadeus