[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-27-g4b40e91

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  4b40e916a922b6b3e8e9ff7e3440ace918174e6c (commit)
       via  2f8c5a73204cd49eece09a28f692935332ff7e1f (commit)
       via  3f078e3530f9acb469e1ea6adcd9ee89c0333f9e (commit)
      from  8cf5c213debe7c988e97283f45772f7e646968d6 (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 4b40e916a922b6b3e8e9ff7e3440ace918174e6c
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Jan 13 10:00:16 2014 +0100

    [BUILDROOT] APF27: fixes ccache dirname to allow successive and parallel builds

commit 2f8c5a73204cd49eece09a28f692935332ff7e1f
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Jan 13 09:58:00 2014 +0100

    [BUILDROOT] Fixes images symlink generation to unbreak automatic build

commit 3f078e3530f9acb469e1ea6adcd9ee89c0333f9e
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Jan 13 09:40:49 2014 +0100

    [BUILDROOT] APF51: fixes ccache dirname to allow successive and parallel builds

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

Summary of changes:
 buildroot/configs/apf27_defconfig                  |    1 +
 buildroot/configs/apf27_webradio_defconfig         |    1 +
 buildroot/configs/apf27test_defconfig              |    2 ++
 buildroot/configs/apf51_defconfig                  |    1 +
 buildroot/configs/apf51test_defconfig              |    2 ++
 buildroot/configs/pps51_defconfig                  |    1 +
 buildroot/configs/pps_defconfig                    |    1 +
 .../device/armadeus/rootfs/post_image_creation.sh  |   18 ++++++++++++------
 8 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index f8a121c..2de1fc3 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -3,6 +3,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index d441a1b..28a56a0 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -3,6 +3,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 3a54784..96a6adc 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -2,6 +2,8 @@ BR2_arm=y
 BR2_WGET="wget --passive-ftp --tries=3"
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index bd725f1..db06d14 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -4,6 +4,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 83b9105..c845d01 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -3,6 +3,8 @@ BR2_cortex_a8=y
 BR2_WGET="wget --passive-ftp --tries=3"
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 79e75ad..82a3cd1 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -4,6 +4,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_STRIP_sstrip=y
 BR2_OPTIMIZE_2=y
 BR2_KERNEL_HEADERS_VERSION=y
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index f7f596c..8c3c367 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -3,6 +3,7 @@ BR2_WGET="wget --passive-ftp --tries=3"
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
 BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 1b32ccb..f8a067a 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -4,26 +4,32 @@
 # arg2: board name
 # arg3: i.MX processor type
 
-#BR2_CPU_NAME
-
 if [ ! -d "$1" ]; then
 	echo "Images directory ($1) not valid !"
 	exit 1
 fi
 
+symlink_image()
+{
+	# $1 = dir, $2 = filename, $3 = symlink
+	if [ -f "$1/$2" ]; then
+		cd $1; ln -sf $2 $3
+	fi
+}
+
 # images symbolic links according to board name, for compatibility with older armadeus versions:
 if [ "$2" != "" ]; then
 	# New BR
 
 	# Cleanup if previous build
-	rm $1/$2*
+	rm -f $1/$2*
 	# rootfs
 	for rootfstype in ubi ubifs tar jffs2; do
-		cd $1; ln -sf rootfs.$rootfstype $2-rootfs.$rootfstype
+		symlink_image $1 rootfs.$rootfstype $2-rootfs.$rootfstype
 	done
 	# linux
-	cd $1; ln -sf uImage $2-linux.bin
-	cd $1; ln -sf $3-$2dev.dtb $2.dtb
+	symlink_image $1 uImage $2-linux.bin
+	symlink_image $1 $3-$2dev.dtb $2.dtb
 else
 	# Old BR compat
 	BOARD_NAME=`grep 'BR2_BOARD_NAME=' $BUILDROOT_CONFIG | cut -d = -f 2 | sed s/\"//g`


hooks/post-receive
-- 
armadeus


