[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-343-g8f6d5e6a7

[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  8f6d5e6a7d225ae9a63533da126bd58d69cadce5 (commit)
      from  4e488ac5d69113ce30f9a1f80f9177f944d76b51 (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 8f6d5e6a7d225ae9a63533da126bd58d69cadce5
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Sep 27 17:33:23 2022 +0200

    [BUILD] Makefile.in: fix libc library name detection
    
    It was broken for ages...
    Use BR2_TOOLCHAIN_USES_{UCLIBC,MUSL,GLIBC} macro and drop libc version.

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

Summary of changes:
 Makefile                    |  1 -
 Makefile.in                 | 13 ++++---------
 scripts/show_build_infos.sh |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 3a0947778..0e6523415 100644
--- a/Makefile
+++ b/Makefile
@@ -239,7 +239,6 @@ shell_env:
 	@echo ARMADEUS_QT_DIR=$(ARMADEUS_QT_DIR) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_GCC_VERSION=$(ARMADEUS_GCC_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_LIBC_NAME=$(ARMADEUS_LIBC_NAME) >> $(ARMADEUS_ENV_FILE)
-	@echo ARMADEUS_LIBC_VERSION=$(ARMADEUS_LIBC_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_BUSYBOX_VERSION=$(ARMADEUS_BUSYBOX_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_BSP_VERSION=$(ARMADEUS_BSP_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_BOARD_NAME=$(ARMADEUS_BOARD_NAME) >> $(ARMADEUS_ENV_FILE)
diff --git a/Makefile.in b/Makefile.in
index cc8b995ce..1a9915873 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,16 +39,11 @@ ARMADEUS_LINUX_MAIN_VERSION:=$(shell echo $(ARMADEUS_LINUX_VERSION) | cut -d . -
 ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_TARGET_UBOOT_VERSION))
 ARMADEUS_U_BOOT_CUSTOM_VERSION = $(shell echo $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) | awk '{ print substr( $$0, length($$0) - 6, 7 ) }')
 ARMADEUS_LIBC_NAME=unknown
-ARMADEUS_LIBC_VERSION=X.Y
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 ARMADEUS_LIBC_NAME=uClibc
-ARMADEUS_LIBC_VERSION:=$(shell echo $(BR2_UCLIBC_VERSION_STRING))
-endif
-ifeq ($(BR2_TOOLCHAIN_CTNG),y)
-ARMADEUS_LIBC_NAME:=$(BR2_TOOLCHAIN_CTNG_LIBC)
-ARMADEUS_LIBC_VERSION:=$(shell grep CT_LIBC_VERSION $(BUILDROOT_DIR)/$(BR2_TOOLCHAIN_CTNG_CONFIG) | cut -d = -f 2)
-endif
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
+ARMADEUS_LIBC_NAME=musl
+else ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
 ARMADEUS_LIBC_NAME=glibc
 endif
 
diff --git a/scripts/show_build_infos.sh b/scripts/show_build_infos.sh
index d1ddba0ae..e2b9c9890 100755
--- a/scripts/show_build_infos.sh
+++ b/scripts/show_build_infos.sh
@@ -14,7 +14,7 @@ echo ""
 echo "Your Armadeus BSP (version "$ARMADEUS_BSP_VERSION" for "$ARMADEUS_BOARD_NAME") was successfully built !"
 echo "    Buildroot: "$ARMADEUS_BUILDROOT_VERSION""
 echo "    gcc: "$ARMADEUS_GCC_VERSION""
-echo "    libc: "$ARMADEUS_LIBC_NAME $ARMADEUS_LIBC_VERSION""
+echo "    libc: "$ARMADEUS_LIBC_NAME""
 echo "    busybox: "$ARMADEUS_BUSYBOX_VERSION""
 echo "    U-Boot: "$ARMADEUS_U_BOOT_VERSION""
 echo "    Linux: "$ARMADEUS_LINUX_VERSION""


hooks/post-receive
-- 
armadeus