[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-467-g07db983

[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  07db983346d95439043c00d58b068ed98776fbba (commit)
       via  52d3427c53ba03325153305c348fb568883cb879 (commit)
      from  7a78cea47f77b75b8aba64ada816940eb9d05780 (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 07db983346d95439043c00d58b068ed98776fbba
Author: Sébastien Szymanski <ss...@us...>
Date:   Thu Oct 30 15:31:47 2014 +0100

    [BUILDROOT] apf6: Use BR2_CPU_NAME to disable U-BOOT hooks

commit 52d3427c53ba03325153305c348fb568883cb879
Author: Sébastien Szymanski <ss...@us...>
Date:   Thu Oct 30 15:29:54 2014 +0100

    [BUILDROOT] Create /etc/machine file in post_build.sh

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

Summary of changes:
 buildroot/target/device/armadeus/Makefile.in       |    2 +-
 .../target/device/armadeus/rootfs/post_build.sh    |    3 +++
 .../target_skeleton/etc/init.d/S00machine_name     |   11 -----------
 3 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100755 buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S00machine_name

diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index dcb59d9..57aaf1f 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -16,7 +16,7 @@ define UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
 endef
 UBOOT_POST_PATCH_HOOKS += UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
 
-ifneq ($(BR2_BOARD_NAME), "apf6")
+ifneq ($(BR2_CPU_NAME), "imx6")
 define UBOOT_UPDATE_CONFIG_HEADER
 	$(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
 		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index 2939f40..04c053d 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -50,4 +50,7 @@ ln -sf /tmp $1/var/tmp
 # /boot
 mkdir -p $1/boot
 
+# Not using $2 because it can be changed for customers' BSP
+echo "APF"${3//[!0-9]/} > $1/etc/machine
+
 exit 0
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S00machine_name b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S00machine_name
deleted file mode 100755
index 43ab260..0000000
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S00machine_name
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-FILE=/etc/machine
-
-if [ ! -f "$FILE" ]; then
-        MACHINE=`cat /proc/cpuinfo | grep Hardware`
-        echo ${MACHINE:20} > $FILE
-fi
-
-exit 0
-


hooks/post-receive
-- 
armadeus