[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-336-g220e7de74

[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  220e7de748be08c2c4f2a3b5d72fd5768c63e3fb (commit)
       via  adbc937bca67ed3ead5a4d2bf9424fc82b4de9a8 (commit)
      from  f19f4443cfd66d9982ba6059a40898f6f847cd48 (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 220e7de748be08c2c4f2a3b5d72fd5768c63e3fb
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Jul 26 10:42:43 2022 +0200

    [BSP] Makefile: move .configured file to output dir
    
    This is needed when building out-of-tree.

commit adbc937bca67ed3ead5a4d2bf9424fc82b4de9a8
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Jul 26 10:24:30 2022 +0200

    [BUILDROOT] Bump BR to 2022.02.1

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

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

diff --git a/Makefile b/Makefile
index 95730eeb6..d767b410d 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?= 1
+BUILDROOT_MINOR_VERSION ?= 3
 ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
 BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
 else
@@ -148,7 +148,7 @@ $(BUILDROOT_DIR)/.patched: $(BUILDROOT_DIR)/.unpacked
 
 buildroot-patched: $(BUILDROOT_DIR)/.patched
 
-$(BUILDROOT_DIR)/.configured: $(BUILDROOT_DIR)/.patched
+$(BUILDROOT_OUTPUT_DIR)/.configured: $(BUILDROOT_DIR)/.patched
 	@if [ ! -f $@ ]; then \
 		$(ECHO_CONFIGURATION_NOT_DEFINED) \
 		exit 1; \
@@ -159,10 +159,10 @@ buildauto: $(BUILDROOT_DIR)/.patched
 	# ! Be sure that /local/downloads exists if you want to use automated build !
 	BUILDROOT_DL_DIR=/local/downloads BR2_DL_DIR=/local/downloads $(MAKE) -s -C $(BUILDROOT_DIR)
 
-linux: $(BUILDROOT_DIR)/.configured
+linux: $(BUILDROOT_OUTPUT_DIR)/.configured
 	@$(MAKE) -C $(BUILDROOT_DIR) linux-rebuild
 
-linux-clean: $(BUILDROOT_DIR)/.configured
+linux-clean: $(BUILDROOT_OUTPUT_DIR)/.configured
 	@$(MAKE) -C $(BUILDROOT_DIR) linux-clean
 
 %_defconfig: $(BUILDROOT_DIR)/.patched
@@ -170,7 +170,7 @@ linux-clean: $(BUILDROOT_DIR)/.configured
 		rm -f $(BUILDROOT_CONFIG_DIR)/.config ; \
 		$(MAKE) -C $(BUILDROOT_DIR) $@ ; \
 		$(MAKE) -C $(BUILDROOT_DIR) menuconfig ; \
-		touch $(BUILDROOT_DIR)/.configured ; \
+		touch $(BUILDROOT_OUTPUT_DIR)/.configured ; \
 	else \
 		echo -e "\033[1m\nThis configuration does not exist !!\n\033[0m" ; \
 	fi;
@@ -180,12 +180,12 @@ linux-clean: $(BUILDROOT_DIR)/.configured
 	@if [ -e "$(BUILDROOT_DIR)/configs/$(patsubst %_autoconf,%,$@)_defconfig" ]; then \
 		rm -f $(BUILDROOT_CONFIG_DIR)/.config ; \
 		$(MAKE) -C $(BUILDROOT_DIR) $(patsubst %_autoconf,%,$@)_defconfig ; \
-		touch $(BUILDROOT_DIR)/.configured ; \
+		touch $(BUILDROOT_OUTPUT_DIR)/.configured ; \
 	else \
 		echo -e "\033[1m\nThis configuration does not exist !!\n\033[0m" ; \
 	fi;
 
-all: $(BUILDROOT_DIR)/.configured
+all: $(BUILDROOT_OUTPUT_DIR)/.configured
 	@mkdir -p $(BUILDROOT_OUTPUT_DIR)
 	@echo -n `date +%s` > $(BUILDROOT_OUTPUT_DIR)/before.txt
 	@$(MAKE) -C $(BUILDROOT_DIR) $@
@@ -194,12 +194,12 @@ all: $(BUILDROOT_DIR)/.configured
 	@BEFORE=`cat $(BUILDROOT_OUTPUT_DIR)/before.txt`; AFTER=`cat $(BUILDROOT_OUTPUT_DIR)/after.txt`; BUILD_TIME_IN_SEC=`expr $$AFTER - $$BEFORE`; echo -e "\033[1mBuild time: $$BUILD_TIME_IN_SEC seconds\033[0m"
 	@rm $(BUILDROOT_OUTPUT_DIR)/before.txt $(BUILDROOT_OUTPUT_DIR)/after.txt
 
-menuconfig: $(BUILDROOT_DIR)/.configured
+menuconfig: $(BUILDROOT_OUTPUT_DIR)/.configured
 	@$(MAKE) -C $(BUILDROOT_DIR) $@
 
 # !! .DEFAULT do NOT handle dependencies !!
 .DEFAULT:
-	@if [ ! -e "$(BUILDROOT_DIR)/.configured" ]; then \
+	@if [ ! -e "$(BUILDROOT_OUTPUT_DIR)/.configured" ]; then \
 		$(ECHO_CONFIGURATION_NOT_DEFINED) \
 		exit 1; \
 	fi


hooks/post-receive
-- 
armadeus