kirkwood: move kirkwood.sh to /lib/ for consistency

Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 41338

diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds b/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
index cdaac813f8e5c7346e49afa0b2a91e81c89f0d7c..07c1a0ec0096e3fc0a3de3becb0c9b9c3cde2c20 100644 (file)
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds
@@ -4,7 +4,7 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/functions/kirkwood.sh
+. /lib/kirkwood.sh
 
 board=$(kirkwood_board_name)
 

diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
index 949e4d71a700b2cf2abe351ba73e803aac1234b4..e795d65dc19bbb67cea793ff77787976e176fab7 100644 (file)
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
@@ -21,7 +21,7 @@ EOF
 }
 
 . /lib/functions/uci-defaults.sh
-. /lib/functions/kirkwood.sh
+. /lib/kirkwood.sh
 
 board=$(kirkwood_board_name)
 

diff --git a/target/linux/kirkwood/base-files/lib/functions/kirkwood.sh b/target/linux/kirkwood/base-files/lib/functions/kirkwood.sh
deleted file mode 100755 (executable)
index ba080f4..0000000
--- a/target/linux/kirkwood/base-files/lib/functions/kirkwood.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/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"
-}

diff --git a/target/linux/kirkwood/base-files/lib/kirkwood.sh b/target/linux/kirkwood/base-files/lib/kirkwood.sh
new file mode 100755 (executable)
index 0000000..ba080f4
--- /dev/null
+++ b/target/linux/kirkwood/base-files/lib/kirkwood.sh
@@ -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"
+}