Author: blogic Date: 2014-06-19 16:13:34 +0200 (Thu, 19 Jun 2014) New Revision: 41276
Added: trunk/target/linux/imx6/base-files/lib/functions/ trunk/target/linux/imx6/base-files/lib/functions/imx6.sh Removed: trunk/target/linux/imx6/base-files/lib/imx6.sh Modified: trunk/target/linux/imx6/base-files/etc/uci-defaults/02_network Log: imx6: the script populating /tmp/sysinfo/ was in the wrong path Signed-off-by: John Crispin <[email protected]> Modified: trunk/target/linux/imx6/base-files/etc/uci-defaults/02_network =================================================================== --- trunk/target/linux/imx6/base-files/etc/uci-defaults/02_network 2014-06-19 14:13:30 UTC (rev 41275) +++ trunk/target/linux/imx6/base-files/etc/uci-defaults/02_network 2014-06-19 14:13:34 UTC (rev 41276) @@ -8,7 +8,7 @@ touch /etc/config/network . /lib/functions/uci-defaults.sh -. /lib/imx6.sh +. /lib/functions/imx6.sh board=$(imx6_board_name) Copied: trunk/target/linux/imx6/base-files/lib/functions/imx6.sh (from rev 41275, trunk/target/linux/imx6/base-files/lib/imx6.sh) =================================================================== --- trunk/target/linux/imx6/base-files/lib/functions/imx6.sh (rev 0) +++ trunk/target/linux/imx6/base-files/lib/functions/imx6.sh 2014-06-19 14:13:34 UTC (rev 41276) @@ -0,0 +1,63 @@ +#!/bin/sh +# +# Copyright (C) 2010-2013 OpenWrt.org +# + +IMX6_BOARD_NAME= +IMX6_MODEL= + +imx6_board_detect() { + local machine + local name + + machine=$(cat /proc/device-tree/model) + + case "$machine" in + "Gateworks Ventana i.MX6 DualLite/Solo GW51XX" |\ + "Gateworks Ventana i.MX6 Dual/Quad GW51XX") + name="gw51xx" + ;; + + "Gateworks Ventana i.MX6 DualLite/Solo GW52XX" |\ + "Gateworks Ventana i.MX6 Dual/Quad GW52XX") + name="gw52xx" + ;; + + "Gateworks Ventana i.MX6 DualLite/Solo GW53XX" |\ + "Gateworks Ventana i.MX6 Dual/Quad GW53XX") + name="gw53xx" + ;; + + "Gateworks Ventana i.MX6 DualLite/Solo GW54XX" |\ + "Gateworks Ventana i.MX6 Dual/Quad GW54XX" |\ + "Gateworks Ventana GW5400-A") + name="gw54xx" + ;; + + "Wandboard i.MX6 Dual Lite Board") + name="wandboard" + ;; + + *) + name="generic" + ;; + esac + + [ -z "$IMX6_BOARD_NAME" ] && IMX6_BOARD_NAME="$name" + [ -z "$IMX6_MODEL" ] && IMX6_MODEL="$machine" + + [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" + + echo "$IMX6_BOARD_NAME" > /tmp/sysinfo/board_name + echo "$IMX6_MODEL" > /tmp/sysinfo/model +} + +imx6_board_name() { + local name + + [ -f /tmp/sysinfo/board_name ] || imx6_board_detect + [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name) + [ -z "$name" ] && name="unknown" + + echo "$name" +} Deleted: trunk/target/linux/imx6/base-files/lib/imx6.sh =================================================================== --- trunk/target/linux/imx6/base-files/lib/imx6.sh 2014-06-19 14:13:30 UTC (rev 41275) +++ trunk/target/linux/imx6/base-files/lib/imx6.sh 2014-06-19 14:13:34 UTC (rev 41276) @@ -1,63 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2010-2013 OpenWrt.org -# - -IMX6_BOARD_NAME= -IMX6_MODEL= - -imx6_board_detect() { - local machine - local name - - machine=$(cat /proc/device-tree/model) - - case "$machine" in - "Gateworks Ventana i.MX6 DualLite/Solo GW51XX" |\ - "Gateworks Ventana i.MX6 Dual/Quad GW51XX") - name="gw51xx" - ;; - - "Gateworks Ventana i.MX6 DualLite/Solo GW52XX" |\ - "Gateworks Ventana i.MX6 Dual/Quad GW52XX") - name="gw52xx" - ;; - - "Gateworks Ventana i.MX6 DualLite/Solo GW53XX" |\ - "Gateworks Ventana i.MX6 Dual/Quad GW53XX") - name="gw53xx" - ;; - - "Gateworks Ventana i.MX6 DualLite/Solo GW54XX" |\ - "Gateworks Ventana i.MX6 Dual/Quad GW54XX" |\ - "Gateworks Ventana GW5400-A") - name="gw54xx" - ;; - - "Wandboard i.MX6 Dual Lite Board") - name="wandboard" - ;; - - *) - name="generic" - ;; - esac - - [ -z "$IMX6_BOARD_NAME" ] && IMX6_BOARD_NAME="$name" - [ -z "$IMX6_MODEL" ] && IMX6_MODEL="$machine" - - [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" - - echo "$IMX6_BOARD_NAME" > /tmp/sysinfo/board_name - echo "$IMX6_MODEL" > /tmp/sysinfo/model -} - -imx6_board_name() { - local name - - [ -f /tmp/sysinfo/board_name ] || imx6_board_detect - [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name) - [ -z "$name" ] && name="unknown" - - echo "$name" -} _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
