[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-332-ge5d5857e6

[Julien B a. A. <ar...@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  e5d5857e63a71df3063c5b58ad7bdd7e95e609a5 (commit)
      from  ec1dc1f9d8167aa8c4e11b24c11d574e6d5ce3dd (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 e5d5857e63a71df3063c5b58ad7bdd7e95e609a5
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Wed Jun 1 11:40:40 2022 +0200

    [BUILD] Makes scripts/export_linux_config.sh works with BR2_EXTERNAL BSP too.

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

Summary of changes:
 Makefile.in | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 1ca11afca..cc8b995ce 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,12 +105,19 @@ endif
 
 ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
 ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
-ifneq ($(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE),)
-TEMP_ARMADEUS_LINUX_CONFIG = $(shell echo $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) | rev | cut -d "/" -f 1 | rev)
-ARMADEUS_LINUX_CONFIG = $(ARMADEUS_BOARD_DIR)/$(TEMP_ARMADEUS_LINUX_CONFIG)
+
+ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
+ifeq ($(shell test -e $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) && echo -n yes),yes)
+  # Absolute path in config
+  ARMADEUS_LINUX_CONFIG=$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
+ else
+  TEMP_ARMADEUS_LINUX_CONFIG = $(shell echo $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) | rev | cut -d "/" -f 1 | rev)
+  ARMADEUS_LINUX_CONFIG = $(ARMADEUS_BOARD_DIR)/$(TEMP_ARMADEUS_LINUX_CONFIG)
+  endif
 else
-ARMADEUS_LINUX_CONFIG = $(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
+  ARMADEUS_LINUX_CONFIG = $(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
 endif
+
 ARMADEUS_U_BOOT_CONFIG:=$(BUILDROOT_DIR)/$(shell echo $(BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE))
 ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
 ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_HOST_DIR)/usr/bin


hooks/post-receive
-- 
armadeus