[oe-commits] Mike Westerhof : SlugOS: slugos-init - update setup_optware script for new SlugOS 6 optware feeds

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: b07d23a66099382ae362495cad9ee57fe611d4bf
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=b07d23a66099382ae362495cad9ee57fe611d4bf

Author: Mike Westerhof <mike at mwester.net>
Date:   Wed Jul 13 17:56:52 2011 -0500

SlugOS: slugos-init - update setup_optware script for new SlugOS 6 optware feeds
(cherry picked from commit b7b7d61e0711d08ee6b116103e60e2a38a8e6084)

Signed-off-by: Mike Westerhof <mwester at dls.net>

---

 recipes/slugos-init/files/setup-optware.sh |   12 ++++++++----
 recipes/slugos-init/slugos-init_5.0.bb     |    2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/recipes/slugos-init/files/setup-optware.sh b/recipes/slugos-init/files/setup-optware.sh
index d4ae619..7db87ec 100644
--- a/recipes/slugos-init/files/setup-optware.sh
+++ b/recipes/slugos-init/files/setup-optware.sh
@@ -5,13 +5,17 @@ if test 0 != `id -u`; then
     exit 1
 fi
 
-optware_target=slugos5be
+case `uname -m` in
+    armv5te*b)    optware_target=slugos6be;;
+    *)            optware_target=slugos6le;;
+esac
+
 feed=http://ipkg.nslu2-linux.org/feeds/optware/${optware_target}/cross/unstable
 latest_xsh=`wget -q -O- ${feed} | grep '\.xsh' | sed -e 's/.*xsh">//' -e 's/<.*//'`
 
 if test -n "${latest_xsh}"; then
     cd /tmp
-    rm -f ${latest_xsh}
-    wget ${feed}/${latest_xsh}
-    sh ${latest_xsh}
+    rm -f "${latest_xsh}"
+    wget "${feed}/${latest_xsh}"
+    sh "${latest_xsh}"
 fi
diff --git a/recipes/slugos-init/slugos-init_5.0.bb b/recipes/slugos-init/slugos-init_5.0.bb
index dcf184a..019b7c6 100644
--- a/recipes/slugos-init/slugos-init_5.0.bb
+++ b/recipes/slugos-init/slugos-init_5.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS_${PN} = "busybox devio"
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \