[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2626-ga4800e7
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2626-ga4800e7
|
From: Julien B a. A. <ar...@us...> - 2011-12-08 16:02:38
|
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 a4800e7355a42b054ca5d70678f01135aca74264 (commit)
from 9fae894595e79761f5f246ba7fceb95ad5960b6a (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 a4800e7355a42b054ca5d70678f01135aca74264
Author: Julien Boibessot <jul...@ar...>
Date: Thu Dec 8 17:00:18 2011 +0100
[BUILD] Cleanup main Makefile and move build infos display to scripts/ (fixes bug of gcc version not displayed at first build)
-----------------------------------------------------------------------
Summary of changes:
Makefile | 45 ++++++++++++++++++------------------------
scripts/show_build_infos.sh | 21 ++++++++++++++++++++
2 files changed, 40 insertions(+), 26 deletions(-)
create mode 100755 scripts/show_build_infos.sh
diff --git a/Makefile b/Makefile
index 1636f29..4b1bd23 100644
--- a/Makefile
+++ b/Makefile
@@ -51,26 +51,17 @@ ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
echo -en "\033[0m";
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)" for "$(ARMADEUS_BOARD_NAME)") was successfully built !"; \
- echo " gcc: "$(ARMADEUS_GCC_VERSION)""; \
- echo " libc: "$(ARMADEUS_LIBC_NAME) $(ARMADEUS_LIBC_VERSION)""; \
- echo " busybox: "$(ARMADEUS_BUSYBOX_VERSION)""; \
- echo " U-Boot: "$(ARMADEUS_U_BOOT_VERSION)""; \
- echo " Linux: "$(ARMADEUS_LINUX_VERSION)""; \
- echo ""; \
- echo -en "\033[0m";
+
default: all
help:
@echo 'First, choose the platform:'
- @echo ' apf9328_defconfig - get default config for an APF9328 board'
- @echo ' apf28_defconfig - get default config for an APF28 board'
- @echo ' apf27_defconfig - get default config for an APF27 board'
- @echo ' pps_defconfig - get default config for an APF27_PPS board'
- @echo ' apf51_defconfig - get default config for an APF51 board'
+ @echo ' apf9328_defconfig - get default config for an APF9328+Dev kit'
+ @echo ' apf28_defconfig - get default config for an APF28+Dev kit'
+ @echo ' apf27_defconfig - get default config for an APF27+Dev kit'
+ @echo ' pps_defconfig - get default config for an APF27+PPS system'
+ @echo ' apf51_defconfig - get default config for an APF51+Dev kit'
@echo ''
@echo 'Cleaning:'
@echo ' buildroot-clean - delete all non-source files in buildroot'
@@ -85,7 +76,7 @@ help:
@echo ' Global:'
@echo ' menuconfig - interactive curses-based configurator'
@echo ' oldconfig - resolve any unresolved symbols in .config'
- @echo ' Specific:'
+ @echo ' Specific (after first build was successful):'
@echo ' linux-menuconfig - configure Linux parameters'
@echo ' uclibc-menuconfig - configure uClibc library parameters'
@echo ' busybox-menuconfig - configure Busybox shell parameters'
@@ -136,20 +127,15 @@ buildauto: $(BUILDROOT_DIR)/.patched
echo "ey" | $(MAKE) -C $(BUILDROOT_DIR) menuconfig
$(MAKE) -C $(BUILDROOT_DIR)
-linux-menuconfig:
- @if [ -e "$(ARMADEUS_LINUX_DIR)/.patched" ] ; then \
- $(MAKE) -C $(BUILDROOT_DIR) linux26-menuconfig ; \
- fi;
-
linux26 linux: $(BUILDROOT_DIR)/.configured
@-touch $(ARMADEUS_LINUX_DIR)/.config
@$(MAKE) -C $(BUILDROOT_DIR) $@
-linux26-clean: $(BUILDROOT_DIR)/.configured
+linux26-clean linux-clean: $(BUILDROOT_DIR)/.configured
ifneq (,$(filter $(BUILDROOT_VERSION),20081103 2010.05))
@$(MAKE) -C $(BUILDROOT_DIR) linux26clean
else
- @$(MAKE) -C $(BUILDROOT_DIR) linux26-clean
+ @$(MAKE) -C $(BUILDROOT_DIR) $@
endif
%_defconfig: $(BUILDROOT_DIR)/.patched
@@ -177,7 +163,7 @@ all: $(BUILDROOT_DIR)/.configured
@ls -al /bin/sh | grep bash
@echo -n `date +%s` > before.txt
@$(MAKE) -C $(BUILDROOT_DIR) $@
- @$(ECHO_BUILD_IS_OK)
+ @./scripts/show_build_infos.sh
@echo -n `date +%s` > after.txt
@BEFORE=`cat before.txt`; AFTER=`cat after.txt`; BUILD_TIME_IN_SEC=`expr $$AFTER - $$BEFORE`; echo -e "\033[1mBuild time: $$BUILD_TIME_IN_SEC seconds\033[0m"
@rm before.txt after.txt
@@ -185,7 +171,7 @@ all: $(BUILDROOT_DIR)/.configured
menuconfig: $(BUILDROOT_DIR)/.configured
@$(MAKE) -C $(BUILDROOT_DIR) $@
-# !! .DEFAULT do NOT handle dependancies !!
+# !! .DEFAULT do NOT handle dependencies !!
.DEFAULT:
@if [ ! -e "$(BUILDROOT_DIR)/.configured" ]; then \
$(ECHO_CONFIGURATION_NOT_DEFINED) \
@@ -206,6 +192,7 @@ shell_env:
@echo ARMADEUS_LINUX_DIR=$(ARMADEUS_LINUX_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_PATCH_DIR=$(ARMADEUS_LINUX_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_CONFIG=$(ARMADEUS_LINUX_CONFIG) >> $(ARMADEUS_ENV_FILE)
+ @echo ARMADEUS_LINUX_VERSION=$(ARMADEUS_LINUX_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_MAIN_VERSION=$(ARMADEUS_LINUX_MAIN_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_DIR=$(ARMADEUS_U_BOOT_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_VERSION=$(ARMADEUS_U_BOOT_VERSION) >> $(ARMADEUS_ENV_FILE)
@@ -217,9 +204,15 @@ shell_env:
@echo ARMADEUS_XENOMAI_DIR=$(ARMADEUS_XENOMAI_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_QT_DIR=$(ARMADEUS_QT_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_SDL_DIR=$(ARMADEUS_SDL_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)
-PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
+PHONY_TARGETS+=dummy all linux26 linux26-clean buildroot-clean buildroot-dirclean
PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config shell_env buildroot-sources buildroot-unpacked
PHONY_TARGETS+=buildroot-patched
.PHONY: $(PHONY_TARGETS)
diff --git a/scripts/show_build_infos.sh b/scripts/show_build_infos.sh
new file mode 100755
index 0000000..e5dd44b
--- /dev/null
+++ b/scripts/show_build_infos.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+MYDIR=`dirname $0`
+
+if [ ! -f "$MYDIR/../armadeus_env.sh" ]; then
+ make shell_env -C $MYDIR/..
+fi
+
+source $MYDIR/../armadeus_env.sh
+
+echo -en "\033[1m"
+echo ""
+echo "Your Armadeus BSP (version "$ARMADEUS_BSP_VERSION" for "$ARMADEUS_BOARD_NAME") was successfully built !"
+echo " gcc: "$ARMADEUS_GCC_VERSION""
+echo " libc: "$ARMADEUS_LIBC_NAME $ARMADEUS_LIBC_VERSION""
+echo " busybox: "$ARMADEUS_BUSYBOX_VERSION""
+echo " U-Boot: "$ARMADEUS_U_BOOT_VERSION""
+echo " Linux: "$ARMADEUS_LINUX_VERSION""
+echo ""
+echo -en "\033[0m"
+
hooks/post-receive
--
armadeus
|
