From c1534d3008ffc34ae590e9e80682bc22ee2f8c5c Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Tue, 16 Jun 2015 11:30:17 +0200
Subject: base-files/u-boot-toradex-fw-utils: move MMC unlock

The mmc unlock function causes troubles when using Poky reference
distribution since Poky uses the busybox shell:
/etc/rc5.d/S09xserver-nodm: /etc/profile.d/fw_unlock_mmc.sh: line 2: syntax error: unexpected "("

This avoids X getting at all.

This patch does not solve the underlying problem, but works around it
by moving the script to the u-boot-toradex-fw-utils recipe, which is
not installed by the Poky images by default.
---
 recipes-bsp/u-boot/files/fw_unlock_mmc.sh             | 6 ++++++
 recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb     | 8 +++++++-
 recipes/base-files/base-files/tegra3/fw_unlock_mmc.sh | 6 ------
 recipes/base-files/base-files_3.0.14.bbappend         | 7 -------
 4 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 recipes-bsp/u-boot/files/fw_unlock_mmc.sh
 delete mode 100644 recipes/base-files/base-files/tegra3/fw_unlock_mmc.sh

diff --git a/recipes-bsp/u-boot/files/fw_unlock_mmc.sh b/recipes-bsp/u-boot/files/fw_unlock_mmc.sh
new file mode 100644
index 0000000..8982640
--- /dev/null
+++ b/recipes-bsp/u-boot/files/fw_unlock_mmc.sh
@@ -0,0 +1,6 @@
+# Give fw_setenv mmcblk0boot1 write permissions
+function fw_setenv() {
+    echo 0 > /sys/block/mmcblk0boot1/force_ro
+    /sbin/fw_setenv "$@"
+    echo 1 > /sys/block/mmcblk0boot1/force_ro
+}
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb
index 4226958..029fc92 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb
@@ -14,7 +14,8 @@ DEFAULT_PREFERENCE_colibri-t30 = "1"
 FILESPATHPKG =. "git:"
 S="${WORKDIR}/git"
 SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=2015.04-toradex"
-SRC_URI += "file://fw_env.config"
+SRC_URI += "file://fw_env.config \
+    file://fw_unlock_mmc.sh"
 # This revision is based on upstream "v2015.04"
 SRCREV = "06ee8db6422e02337242e43b8573359443db59ea"
 
@@ -44,6 +45,11 @@ do_install () {
     install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/
 }
 
+do_install_append_tegra3() {
+    install -d ${D}${sysconfdir}/profile.d/
+    install -m 0644 ${WORKDIR}/fw_unlock_mmc.sh ${D}${sysconfdir}/profile.d/fw_unlock_mmc.sh
+}
+
 pkg_postinst_${PN}_colibri-t20 () {
     # can't do this offline
     if [ "x$D" != "x" ]; then
diff --git a/recipes/base-files/base-files/tegra3/fw_unlock_mmc.sh b/recipes/base-files/base-files/tegra3/fw_unlock_mmc.sh
deleted file mode 100644
index 8982640..0000000
--- a/recipes/base-files/base-files/tegra3/fw_unlock_mmc.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Give fw_setenv mmcblk0boot1 write permissions
-function fw_setenv() {
-    echo 0 > /sys/block/mmcblk0boot1/force_ro
-    /sbin/fw_setenv "$@"
-    echo 1 > /sys/block/mmcblk0boot1/force_ro
-}
diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend
index f423488..af82436 100644
--- a/recipes/base-files/base-files_3.0.14.bbappend
+++ b/recipes/base-files/base-files_3.0.14.bbappend
@@ -1,14 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/base-files:"
 
-SRC_URI_append_tegra3 = "file://fw_unlock_mmc.sh"
-
 do_install_append () {
         echo "search colibri.net"  > ${D}${sysconfdir}/resolv.conf
         echo "nameserver 8.8.8.8" >> ${D}${sysconfdir}/resolv.conf
         echo "nameserver 8.8.4.4" >> ${D}${sysconfdir}/resolv.conf
 }
-
-do_install_append_tegra3() {
-	install -d ${D}${sysconfdir}/profile.d/
-	install -m 0644 ${WORKDIR}/fw_unlock_mmc.sh ${D}${sysconfdir}/profile.d/fw_unlock_mmc.sh
-}
-- 
cgit v1.2.3