aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Westerhof <mike@mwester.net>2011-07-13 17:56:52 -0500
committerMike Westerhof <mike@mwester.net>2011-07-13 17:56:52 -0500
commitb7b7d61e0711d08ee6b116103e60e2a38a8e6084 (patch)
tree8f92e8f999cb2ea82f119ab0310375d673de22a6
parent0cdeac241f08f34a4d854e743893ea7a1e48123c (diff)
downloadopenembedded-slugos/slugos6.0-beta.tar.gz
SlugOS: slugos-init - update setup_optware script for new SlugOS 6 optware feedsslugos/slugos6.0-beta
-rw-r--r--recipes/slugos-init/files/setup-optware.sh12
-rw-r--r--recipes/slugos-init/slugos-init_5.0.bb2
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 d4ae619491..7db87ec6b7 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 dcf184aae8..019b7c6230 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 \