Author: titmuss
Date: Thu Nov 27 02:33:44 2008
New Revision: 3452
URL: http://svn.slimdevices.com?rev=3452&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix init script.
Build squeezeplay-squeezeos package for jive.
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.4/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
Modified: 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=3452&root=Jive&r1=3451&r2=3452&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf Thu Nov
27 02:33:44 2008
@@ -33,6 +33,7 @@
# SqueezePlay application
SRCREV_pn-squeezeplay ?= "${AUTOREV}"
SRCREV_pn-squeezeplay-jive ?= "${AUTOREV}"
+SRCREV_pn-squeezeplay-squeezeos ?= "${AUTOREV}"
# SqueezePlay dependancies
SRCREV_pn-libsdl-image ?= "${AUTOREV}"
Modified: 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf?rev=3452&root=Jive&r1=3451&r2=3452&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf (original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf Thu Nov 27
02:33:44 2008
@@ -15,6 +15,7 @@
IMAGE_INSTALL += "jivetest"
IMAGE_INSTALL += "marvell-gspi-module marvell-wlan-tools"
IMAGE_INSTALL += "squeezeplay-jive"
+IMAGE_INSTALL += "squeezeplay-squeezeos"
IMAGE_SQUEEZEOS_UPGRADE = "1"
Modified: 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS?rev=3452&root=Jive&r1=3451&r2=3452&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS Thu
Nov 27 02:33:44 2008
@@ -101,7 +101,7 @@
export SQUEEZEPLAY_HOME=/etc/squeezeplay
for dir in /media/*/squeezeplay; do
if [ -d $dir ]; then
- LUA_PATH=$LUA_PATH;$dir/?.lua
+ LUA_PATH="$LUA_PATH;$dir/?.lua"
fi
done
export LUA_PATH
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb?rev=3452&root=Jive&r1=3451&r2=3452&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
Thu Nov 27 02:33:44 2008
@@ -2,7 +2,7 @@
LICENSE = "Logitech Public Source License"
PV = "${DISTRO_VERSION}+svnr${SRCREV}"
-PR = "r6"
+PR = "r7"
DEPENDS += "squeezeplay"
@@ -24,8 +24,6 @@
rm ${D}${libdir}/*
mkdir -p ${D}${libdir}/lua/5.1
install -m 0755 .libs/jiveBSP.so ${D}${libdir}/lua/5.1/jiveBSP.so
- install -m 0755 .libs/jiveWireless.so
${D}${libdir}/lua/5.1/jiveWireless.so
- install -m 0755 .libs/jiveWatchdog.so
${D}${libdir}/lua/5.1/jiveWatchdog.so
}
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb?rev=3452&root=Jive&view=auto
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
(added)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
Thu Nov 27 02:33:44 2008
@@ -1,0 +1,32 @@
+DESCRIPTION = "SqueezePlay - SqueezeOS specific code"
+LICENSE = "Logitech Public Source License"
+
+PV = "${DISTRO_VERSION}+svnr${SRCREV}"
+#PR = "r0"
+
+DEPENDS += "squeezeplay"
+
+SRC_URI="${SQUEEZEPLAY_SCM};module=squeezeplay_squeezeos"
+
+S = "${WORKDIR}/squeezeplay_squeezeos"
+
+inherit autotools
+
+CFLAGS_prepend = '-DSQUEEZEPLAY_RELEASE=\\"${DISTRO_VERSION}\\"
-DSQUEEZEPLAY_REVISION=\\"${SQUEEZEOS_REVISION}\\"'
+
+EXTRA_OEMAKE = "all lua-lint"
+
+
+do_install() {
+ autotools_do_install
+
+ # move lua libraries to correct location
+ rm ${D}${libdir}/*
+ mkdir -p ${D}${libdir}/lua/5.1
+ install -m 0755 .libs/jiveWireless.so
${D}${libdir}/lua/5.1/jiveWireless.so
+ install -m 0755 .libs/jiveWatchdog.so
${D}${libdir}/lua/5.1/jiveWatchdog.so
+}
+
+
+FILES_${PN} += "${datadir} ${libdir}/lua/5.1"
+FILES_${PN}-dbg += "${libdir}/lua/5.1/.debug"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
