[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-389-g6a43e12

[Julien B a. A. <ar...@sf...>]

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  6a43e12493c0074f4575ffcd31f64be4c5365658 (commit)
      from  bedfd801e2a5a25a68a44abe10e424dc19687e43 (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 6a43e12493c0074f4575ffcd31f64be4c5365658
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Tue Mar 6 16:07:16 2018 +0100

    [ROOTFS] Fixes /etc/init.d/S11firstboot for usage on OPOS6ULNANO. Add it /etc/fw_env.config installation while we are at it...

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

Summary of changes:
 ...w_env_opos6ul.config => fw_env_opos6ulnano.config} |  2 +-
 .../rootfs/target_overlay/etc/init.d/S11firstboot     | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)
 copy buildroot/target/device/armadeus/rootfs/target_overlay/etc/{fw_env_opos6ul.config => fw_env_opos6ulnano.config} (94%)

diff --git a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ul.config b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ulnano.config
similarity index 94%
copy from buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ul.config
copy to buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ulnano.config
index e5a3cf9..307ea0f 100644
--- a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ul.config
+++ b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos6ulnano.config
@@ -1,4 +1,4 @@
-# Configuration file for fw_(printenv/saveenv) utility on >>> OPOS6UL <<<.
+# Configuration file for fw_(printenv/saveenv) utility on >>> OPOS6ULNANO <<<.
 # Up to two entries are valid, in this case the redundant environment sector is
 # assumed present.
 
diff --git a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot
index 668b28b..88cbd65 100755
--- a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot
+++ b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot
@@ -1,6 +1,5 @@
 #!/bin/sh
 #
-# needs to be run after mdev as it uses /dev/root
 
 FIRST_BOOT=/boot/.first_boot
 
@@ -10,7 +9,7 @@ start()
 		echo "Executing First Boot script"
 
 		# Resize rootfs (if on eMMC)
-		ROOTFS=`readlink /dev/root`
+		ROOTFS=`lsblk | grep /$ | cut -d - -f 2 | cut -d " " -f 1`
 		case "$ROOTFS" in
 			mmcblk*)
 				echo -n "Resizing eMMC ROOTFS partition (/dev/$ROOTFS): "
@@ -25,9 +24,19 @@ start()
 		esac
 
 		# Update framebuffer modes config file, if needed (required by SDL)
-		FILE=/etc/fb.modes
-		if [ ! -f "$FILE" ]; then
-		        fbset > $FILE
+		if [ -c /dev/fb0 ]; then
+			FILE=/etc/fb.modes
+			if [ ! -f "$FILE" ]; then
+			        fbset > $FILE
+			fi
+		fi
+
+		# Set correct config file for fw_printenv/setenv commands
+		MACHINE=`cat /etc/machine`
+		machine=`echo "$MACHINE" | tr '[:upper:]' '[:lower:]'`
+		if [ -f "/etc/fw_env_${machine}.config" ]; then
+			echo "Installing /etc/fw_env_${machine}.config as /etc/fw_env.config"
+			cp /etc/fw_env_${machine}.config /etc/fw_env.config
 		fi
 
 		rm $FIRST_BOOT


hooks/post-receive
-- 
armadeus