Author: luka
Date: 2014-06-26 12:13:47 +0200 (Thu, 26 Jun 2014)
New Revision: 41338

Added:
   trunk/target/linux/kirkwood/base-files/lib/kirkwood.sh
Removed:
   trunk/target/linux/kirkwood/base-files/lib/functions/
Modified:
   trunk/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
   trunk/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
Log:
kirkwood: move kirkwood.sh to /lib/ for consistency

Signed-off-by: Luka Perkov <[email protected]>

Modified: trunk/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
===================================================================
--- trunk/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds     
2014-06-25 08:32:14 UTC (rev 41337)
+++ trunk/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds     
2014-06-26 10:13:47 UTC (rev 41338)
@@ -4,7 +4,7 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/functions/kirkwood.sh
+. /lib/kirkwood.sh
 
 board=$(kirkwood_board_name)
 

Modified: trunk/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
===================================================================
--- trunk/target/linux/kirkwood/base-files/etc/uci-defaults/02_network  
2014-06-25 08:32:14 UTC (rev 41337)
+++ trunk/target/linux/kirkwood/base-files/etc/uci-defaults/02_network  
2014-06-26 10:13:47 UTC (rev 41338)
@@ -21,7 +21,7 @@
 }
 
 . /lib/functions/uci-defaults.sh
-. /lib/functions/kirkwood.sh
+. /lib/kirkwood.sh
 
 board=$(kirkwood_board_name)
 

Copied: trunk/target/linux/kirkwood/base-files/lib/kirkwood.sh (from rev 41337, 
trunk/target/linux/kirkwood/base-files/lib/functions/kirkwood.sh)
===================================================================
--- trunk/target/linux/kirkwood/base-files/lib/kirkwood.sh                      
        (rev 0)
+++ trunk/target/linux/kirkwood/base-files/lib/kirkwood.sh      2014-06-26 
10:13:47 UTC (rev 41338)
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+
+KIRKWOOD_BOARD_NAME=
+KIRKWOOD_MODEL=
+
+kirkwood_board_detect() {
+       local machine
+       local name
+
+       machine=$(cat /proc/device-tree/model)
+
+       case "$machine" in
+       "Seagate FreeAgent Dockstar")
+               name="dockstar"
+               ;;
+
+       "Iomega Iconnect")
+               name="iconnect"
+               ;;
+
+       "RaidSonic ICY BOX IB-NAS62x0 (Rev B)")
+               name="ib62x0"
+               ;;
+
+       "Cloud Engines Pogoplug E02")
+               name="pogo_e02"
+               ;;
+
+       "Linksys EA4500")
+               name="ea4500"
+               ;;
+
+       *)
+               name="generic"
+               ;;
+       esac
+
+       [ -z "$KIRKWOOD_BOARD_NAME" ] && KIRKWOOD_BOARD_NAME="$name"
+       [ -z "$KIRKWOOD_MODEL" ] && KIRKWOOD_MODEL="$machine"
+
+       [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
+
+       echo "$KIRKWOOD_BOARD_NAME" > /tmp/sysinfo/board_name
+       echo "$KIRKWOOD_MODEL" > /tmp/sysinfo/model
+}
+
+kirkwood_board_name() {
+       local name
+
+       [ -f /tmp/sysinfo/board_name ] || kirkwood_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

Reply via email to