[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2446-g2d4dde6
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2011-08-05 09:38:14
|
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 2d4dde646bd4b5b19c808b025242da5d558ff0d9 (commit)
from a0ec624dc0eb1b9c0df6da95fa8df1b03d26b01f (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 2d4dde646bd4b5b19c808b025242da5d558ff0d9
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 5 11:36:56 2011 +0200
[BUILD] Add some refinements when displaying successfull BSP build (show most important components version)
-----------------------------------------------------------------------
Summary of changes:
Makefile | 11 ++++++++---
Makefile.in | 4 +++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 98b9c4f..a73849a 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,12 @@ ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
ARMADEUS_BSP_VERSION=$(shell cat $(BUILDROOT_DIR)/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version)
ECHO_BUILD_IS_OK:= echo -en "\033[1m"; \
echo ""; \
- echo "Your Armadeus BSP (version "$(ARMADEUS_BSP_VERSION)") was successfully built !"; \
+ echo "Your Armadeus BSP (version "$(ARMADEUS_BSP_VERSION)" for "$(ARMADEUS_BOARD_NAME)") was successfully built !"; \
+ echo " gcc: "$(ARMADEUS_GCC_VERSION)""; \
+ echo " uClibc: "$(ARMADEUS_UCLIBC_VERSION)""; \
+ echo " busybox: "$(ARMADEUS_BUSYBOX_VERSION)""; \
+ echo " U-Boot: "$(ARMADEUS_U_BOOT_VERSION)""; \
+ echo " Linux: "$(ARMADEUS_LINUX_VERSION)""; \
echo ""; \
echo -en "\033[0m";
@@ -99,14 +104,14 @@ help:
$(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE):
mkdir -p $(BUILDROOT_FILE_PATH)
- wget --passive-ftp -P $(BUILDROOT_FILE_PATH) $(BUILDROOT_SITE)/$(BUILDROOT_SOURCE)
+ wget --passive-ftp -P $(BUILDROOT_FILE_PATH) $(BUILDROOT_SITE)/$(BUILDROOT_SOURCE)
buildroot-sources: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE)
$(BUILDROOT_DIR)/.unpacked: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) $(BUILDROOT_PATCH_DIR)/*.patch
$(BUILDROOT_PATCH_DIR)/cleanup_buildroot.sh
bzcat $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) | \
- tar -C $(BUILDROOT_DIR) $(TAR_OPTIONS) -
+ tar -C $(BUILDROOT_DIR) $(TAR_OPTIONS) -
touch $@
buildroot-unpacked: $(BUILDROOT_DIR)/.unpacked
diff --git a/Makefile.in b/Makefile.in
index c589c85..fc0171a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,8 @@ BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX_KERNEL_VERSION))
ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_TARGET_UBOOT_VERSION))
ARMADEUS_UCLIBC_VERSION:=$(shell echo $(BR2_UCLIBC_VERSION_STRING))
-ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
+ARMADEUS_GCC_VERSION:=$(shell echo $(BR2_GCC_VERSION))
+ARMADEUS_BUSYBOX_VERSION:=$(shell echo $(BR2_BUSYBOX_VERSION))
ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
@@ -25,6 +26,7 @@ endif
ARMADEUS_XENOMAI_VERSION:=$(shell grep "XENOMAI_VERSION:=" $(BUILDROOT_DIR)/package/xenomai/xenomai.mk 2>/dev/null | cut -d = -f 2)
+ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
ARMADEUS_QT_VERSION:=$(shell grep "QT_VERSION:=" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d = -f 2)
ifeq ($(ARMADEUS_QT_VERSION),)
ARMADEUS_QT_VERSION:=QT_NOT_INSTALLED
hooks/post-receive
--
armadeus
|