Author: titmuss
Date: Fri Jul 18 08:51:41 2008
New Revision: 2718
URL: http://svn.slimdevices.com?rev=2718&root=Jive&view=rev
Log:
Bug: N/A
Description:
Added native lua receipe.
Added squeezeplay-jive receipe.
Enaabled lua-lint checks for squeezeplay and squeezeplay-jive.
Fixed permissions for if_mapping in base files.
Added aplay for testing.
Fixed link in uboot tools.
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua-native_svn.bb
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua.inc
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
Modified:
7.2/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.2/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua_svn.bb
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/uboot-tools/uboot-env_1.0.bb
Modified: 7.2/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=2718&root=Jive&r1=2717&r2=2718&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.2/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf Fri Jul
18 08:51:41 2008
@@ -27,7 +27,6 @@
SRCREV_pn-libsdl = "${AUTOREV}"
SRCREV_pn-libsdl-ttf = "${AUTOREV}"
SRCREV_pn-libsdl-gfx = "${AUTOREV}"
-SRCREV_pn-squeezeplay = "${AUTOREV}"
SRCREV_pn-freefont = "${AUTOREV}"
SRCREV_pn-luaprofiler = "${AUTOREV}"
SRCREV_pn-luasocket = "${AUTOREV}"
@@ -36,11 +35,15 @@
SRCREV_pn-luafilesystem = "${AUTOREV}"
SRCREV_pn-luazipfilter = "${AUTOREV}"
SRCREV_pn-lua = "${AUTOREV}"
+SRCREV_pn-lua-native = "${AUTOREV}"
SRCREV_pn-luasyslog = "${AUTOREV}"
SRCREV_pn-lualogging = "${AUTOREV}"
SRCREV_pn-luatolua++ = "${AUTOREV}"
SRCREV_pn-portaudio = "${AUTOREV}"
+SRCREV_pn-squeezeplay = "${AUTOREV}"
+SRCREV_pn-squeezeplay-jive = "${AUTOREV}"
+
SRCREV_pn-linux-jive = "${AUTOREV}"
PREFERRED_VERSION_busybox ?= "1.7.0"
Modified: 7.2/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf?rev=2718&root=Jive&r1=2717&r2=2718&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf (original)
+++ 7.2/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf Fri Jul 18
08:51:41 2008
@@ -12,6 +12,7 @@
SERIAL_CONSOLE = "-L 115200 tts/0"
IMAGE_INSTALL += "uboot-env"
-#IMAGE_INSTALL += "marvell-gspi-jive"
+#IMAGE_INSTALL += "marvell-gspi-src-jive"
+IMAGE_INSTALL += "squeezeplay-jive"
require conf/machine/include/tune-arm926ejs.inc
Modified:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=2718&root=Jive&r1=2717&r2=2718&view=diff
==============================================================================
---
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Fri Jul 18 08:51:41 2008
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r7"
+PR = "r8"
SRC_URI = " \
file://config \
@@ -99,7 +99,7 @@
install -m 0755 -d ${D}${sysconfdir}/network/if-pre-up.d
install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/network/config
install -m 0644 ${WORKDIR}/interfaces
${D}${sysconfdir}/network/interfaces
- install -m 0644 ${WORKDIR}/if_mapping
${D}${sysconfdir}/network/if_mapping
+ install -m 0755 ${WORKDIR}/if_mapping
${D}${sysconfdir}/network/if_mapping
install -m 0755 ${WORKDIR}/udhcpc_action
${D}${sysconfdir}/network/udhcpc_action
install -m 0755 ${WORKDIR}/wpa_action
${D}${sysconfdir}/network/wpa_action
Modified:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb?rev=2718&root=Jive&r1=2717&r2=2718&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
(original)
+++ 7.2/trunk/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
Fri Jul 18 08:51:41 2008
@@ -2,4 +2,4 @@
require squeezeos-image-boot.bb
-IMAGE_INSTALL += "squeezeplay dropbear patch wireless-tools"
+IMAGE_INSTALL += "squeezeplay dropbear patch wireless-tools alsa-utils-aplay"
Added: 7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua-native_svn.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua-native_svn.bb?rev=2718&root=Jive&view=auto
==============================================================================
--- 7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua-native_svn.bb
(added)
+++ 7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua-native_svn.bb Fri
Jul 18 08:51:41 2008
@@ -1,0 +1,9 @@
+require lua.inc
+
+inherit native
+
+PR="r3"
+
+do_stage() {
+ install -m 0755 src/lua src/luac ${STAGING_BINDIR}/
+}
Added: 7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua.inc
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua.inc?rev=2718&root=Jive&view=auto
==============================================================================
--- 7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua.inc (added)
+++ 7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua.inc Fri Jul 18
08:51:41 2008
@@ -1,0 +1,32 @@
+DESCRIPTION = "LUA"
+SECTION = "libs"
+LICENSE = "MIT"
+
+BV = "5.1.1"
+
+PV = "${BV}+svnr${SRCREV}"
+
+SRC_URI="${SQUEEZEPLAY_SCM};module=lua-${BV}"
+
+S = "${WORKDIR}/lua-${BV}"
+
+EXTRA_OEMAKE = "squeezeos"
+
+do_stage() {
+ oe_libinstall -C src liblua ${STAGING_LIBDIR}/
+ install -m 0644 src/lua.h src/lualib.h src/lauxlib.h src/luaconf.h
${STAGING_INCDIR}/
+ install -m 0755 src/lua src/luac ${STAGING_BINDIR}/
+}
+
+do_install() {
+ mkdir ${D}/usr
+ oe_runmake install INSTALL_TOP=${D}/usr
+}
+
+PACKAGES = "liblua5.1-dbg liblua5.1-dev liblua5.1 ${PN}-dbg ${PN}-doc ${PN}"
+
+FILES_${PN} = "${bindir}"
+FILES_${PN}-doc = "${mandir}"
+
+FILES_liblua5.1 = "${libdir}/liblua.so.*"
+FILES_liblua5.1-dev = "${libdir}/liblua.* ${includedir}"
Modified: 7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua_svn.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua_svn.bb?rev=2718&root=Jive&r1=2717&r2=2718&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua_svn.bb (original)
+++ 7.2/trunk/squeezeos/poky/meta-squeezeos/packages/lua/lua_svn.bb Fri Jul 18
08:51:41 2008
@@ -1,32 +1,3 @@
-DESCRIPTION = "LUA"
-SECTION = "libs"
-LICENSE = "MIT"
+require lua.inc
-BV = "5.1.1"
-
-PV = "${BV}+svnr${SRCREV}"
-#PR="r0"
-
-SRC_URI="${SQUEEZEPLAY_SCM};module=lua-${BV}"
-
-S = "${WORKDIR}/lua-${BV}"
-
-EXTRA_OEMAKE = "squeezeos"
-
-do_install() {
- mkdir ${D}/usr
- oe_runmake install INSTALL_TOP=${D}/usr
-}
-
-do_stage() {
- oe_libinstall -C src liblua ${STAGING_LIBDIR}/
- install -m 0644 src/lua.h src/lualib.h src/lauxlib.h src/luaconf.h
${STAGING_INCDIR}/
-}
-
-PACKAGES = "liblua5.1-dbg liblua5.1-dev liblua5.1 ${PN}-dbg ${PN}-doc ${PN}"
-
-FILES_${PN} = "${bindir}"
-FILES_${PN}-doc = "${mandir}"
-
-FILES_liblua5.1 = "${libdir}/liblua.so.*"
-FILES_liblua5.1-dev = "${libdir}/liblua.* ${includedir}"
+PR="r3"
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb?rev=2718&root=Jive&view=auto
==============================================================================
---
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
(added)
+++
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
Fri Jul 18 08:51:41 2008
@@ -1,0 +1,32 @@
+DESCRIPTION = "SqueezePlay - Jive specific code"
+LICENSE = "Logitech Public Source License"
+
+PV = "7.2+svnr${SRCREV}"
+PR = "r5"
+
+DEPENDS += "squeezeplay"
+
+SRC_URI="${SQUEEZEPLAY_SCM};module=squeezeplay_jive"
+
+S = "${WORKDIR}/squeezeplay_jive"
+
+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/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
+}
+
+
+FILES_${PN} += "${datadir} ${libdir}/lua/5.1"
+FILES_${PN}-dbg += "${libdir}/lua/5.1/.debug"
Modified:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb?rev=2718&root=Jive&r1=2717&r2=2718&view=diff
==============================================================================
---
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
(original)
+++
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Fri Jul 18 08:51:41 2008
@@ -2,12 +2,12 @@
LICENSE = "Logitech Public Source License"
PV = "7.2+svnr${SRCREV}"
-PR = "r2"
+PR = "r4"
DEPENDS += "libsdl libsdl-ttf libsdl-gfx libsdl-image"
RDEPENDS += "libsdl libsdl-ttf libsdl-gfx libsdl-image"
-DEPENDS += "lua luatolua++"
+DEPENDS += "lua lua-native luatolua++"
RDEPENDS += "liblua5.1-socket liblua5.1-json liblua5.1-zipfilter
liblua5.1-loop liblua5.1-logging liblua5.1-syslog liblua5.1-filesystem
liblua5.1-profiler liblua5.1-tolua++"
# FIXME should be libflac but this does not work?
@@ -23,4 +23,10 @@
CFLAGS_prepend = '-DSQUEEZEPLAY_RELEASE=\\"${DISTRO_VERSION}\\"
-DSQUEEZEPLAY_REVISION=\\"${SQUEEZEOS_REVISION}\\"'
+EXTRA_OEMAKE = "all lua-lint"
+
+do_stage() {
+ install -m 0644 src/ui/jive.h ${STAGING_INCDIR}/
+}
+
FILES_${PN} += "${datadir}"
Modified:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/uboot-tools/uboot-env_1.0.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/uboot-tools/uboot-env_1.0.bb?rev=2718&root=Jive&r1=2717&r2=2718&view=diff
==============================================================================
---
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/uboot-tools/uboot-env_1.0.bb
(original)
+++
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/uboot-tools/uboot-env_1.0.bb
Fri Jul 18 08:51:41 2008
@@ -2,7 +2,7 @@
SECTION = "base"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
SRC_URI=" \
file://Makefile \
@@ -18,5 +18,5 @@
do_install() {
install -m 0755 -d ${D}${sbindir}
install -m 0755 ${WORKDIR}/fw_printenv ${D}${sbindir}/fw_printenv
- ln -s fw_printenv.c ${D}${sbindir}/fw_setenv
+ ln -s fw_printenv ${D}${sbindir}/fw_setenv
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
