Author: richard
Date: Thu Jan 15 09:58:06 2009
New Revision: 3840
URL: http://svn.slimdevices.com?rev=3840&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3833): felix | 2009-01-15 14:54:15 +0000
Bug: n/a
Description: Fix jive build
r3...@harrypotter (orig r3834): felix | 2009-01-15 14:57:01 +0000
Bug: n/a
Description: Fix jive build
r3...@harrypotter (orig r3835): richard | 2009-01-15 15:13:39 +0000
Bug: N/A
Description:
Fix typo.
r3...@harrypotter (orig r3836): felix | 2009-01-15 15:19:12 +0000
Bug: n/a
Description: Adding Marvell WPS app, including bitbake recipes to build from
sources or just copy the binary (default)
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wps_init.conf
(with props)
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wpsapp
(with props)
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/marvell-wps-bin_3.11.bb
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/marvell-wps-src_svn.bb
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeos/poky/build/conf/local.conf.sample
7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/src/jive_bsp.c
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jan 15 09:58:06 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3753
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3822
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3836
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.4/branches/pango/squeezeos/poky/build/conf/local.conf.sample
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/build/conf/local.conf.sample?rev=3840&root=Jive&r1=3839&r2=3840&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeos/poky/build/conf/local.conf.sample (original)
+++ 7.4/branches/pango/squeezeos/poky/build/conf/local.conf.sample Thu Jan 15
09:58:06 2009
@@ -163,15 +163,17 @@
ENABLE_BINARY_LOCALE_GENERATION = "1"
-# Enable the below to build wlan drivers using private source
+# Enable the below to build wlan drivers / wps using private source
#SQUEEZEOS_PRIVATE_SVN = "xxxx"
#PREFERRED_PROVIDER_marvell-wlan-tools = "marvell-wlan-tools-src"
#PREFERRED_PROVIDER_marvell-gspi-module = "marvell-gspi-module-src"
+#PREFERRED_PROVIDER_marvell-wps = "marvell-wps-src"
#SRCREV_pn-marvell-wlan-tools-src = "${AUTOREV}"
#SRCREV_pn-marvell-gspi-module-src = "${AUTOREV}"
-
+#SRCREV_pn-marvell-wps-src = "${AUTOREV}"
# Use cache to prevent checking for package updates in svn
-#BB_SRCREV_POLICY="cache"
+#BB_SRCREV_POLICY="cache"
+
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=3840&root=Jive&r1=3839&r2=3840&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
Thu Jan 15 09:58:06 2009
@@ -63,6 +63,10 @@
PREFERRED_PROVIDER_marvell-wlan-tools ?= "marvell-wlan-tools-bin"
PREFERRED_PROVIDER_marvell-gspi-module ?= "marvell-gspi-module-bin"
+# jive marvell wps app, use binary version
+# to build from source modify your local.conf
+PREFERRED_PROVIDER_marvell-wps ?= "marvell-wps-bin"
+
PREFERRED_VERSION_qemu-native ?= "0.9.1"
PREFERRED_VERSION_busybox = "1.7.0"
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb?rev=3840&root=Jive&r1=3839&r2=3840&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
Thu Jan 15 09:58:06 2009
@@ -2,4 +2,4 @@
require squeezeos-image-boot.bb
-IMAGE_INSTALL += "squeezeplay dropbear patch wireless-tools alsa-utils-aplay
alsa-utils-amixer"
+IMAGE_INSTALL += "squeezeplay dropbear patch wireless-tools alsa-utils-aplay
alsa-utils-amixer marvell-wps"
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wps_init.conf
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wps_init.conf?rev=3840&root=Jive&view=auto
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wps_init.conf
(added)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wps_init.conf
Thu Jan 15 09:58:06 2009
@@ -1,0 +1,81 @@
+#
+# File: wps_init.conf
+#
+# Copyright (C) 2003-2008, Marvell International Ltd.
+# All Rights Reserved
+#
+# WPS configuration file
+# Lines that start with # are treated as comments
+# Each line should not exceed 80 characters
+# Format: TYPE=value
+#
+#################################################################################
+# Enrollee: 1, Registrar: 2
+ROLE=1
+#################################################################################
+# UUID: 16B, in binary format
+UUID=0x31323334353637383930313233343536
+
+# VERSION: 1B, 0x10: Version 1.0
+VERSION=0x10
+
+# DEVICE_NAME: <=32B, describes the product
+DEVICE_NAME=Marvell-Embedded-Client
+
+# MANUFACTURER: <=64B, identifies the manufacturer of the device
+MANUFACTURER=Marvell
+
+# MODEL_NAME: <=32B, identifies the model of the device
+MODEL_NAME=SD-8688
+
+# MODEL_NUMBER: <=32B, provides additional description of the device
+MODEL_NUMBER=0001
+
+# SERIAL_NUMBER: <=32B, identifies the serial number of the Enrollee or
Registrar
+SERIAL_NUMBER=0001
+
+# Configuration Methods: 2B
+# 0x0001 : USBA
+# 0x0002 : Ethernet
+# 0x0004 : Label
+# 0x0008 : Display
+# 0x0010 : Ethernet NFC Token
+# 0x0020 : Integrated NFC Token
+# 0x0040 : NFC Interface
+# 0x0080 : Push Button
+# 0x0100 : Keypad
+CONFIG_METHODS=0x0008
+
+# RF_BAND: 1B, 2.4GHz=1, 5.0GHz=2
+RF_BAND=1
+
+# OS_VER: 4B, indicates what operating system is running on the device
+# The most significant bit is reserved and always set to one
+OS_VER=0xFFFFFFFF
+
+# Value for Message transmit, timeout unit is msec
+MAX_RETRY=30
+MSG_TIMEOUT=5000
+
+#################################################################################
+# For Registrar Only
+# EMBEDDED_ADHOC_REGISTRAR: 1B, network mode
+# 0 : Infrastructure mode, 1 : Ad-hoc mode
+EMBEDDED_ADHOC_REGISTRAR=0
+
+# SSID: <=32B, SSID of the network
+SSID=Marvell_Wps_Test
+
+# AUTHENTICATION_TYPE: 2B, 0x0001 : Open, 0x0002 : WPA-PSK, 0x0004 : Shared
+# 0x0010 : WPA2, 0x0020 : WPA2-PSK
+AUTHENTICATION_TYPE=0x0002
+
+# ENCRYPTION_TYPE: 2B, 0x0001 : None, 0x0002 : WEP
+# 0x0004 : TKIP, 0x0008 : AES
+ENCRYPTION_TYPE=0x0004
+
+# NETWORK_KEY_INDEX: 1B, using in encryption type as WEP such as: 1/2/3/4
+NETWORK_KEY_INDEX=1
+
+# NETWORK_KEY: Encryption Key for WEP: 10 or 26 Hex characters
+NETWORK_KEY=1234567890
Propchange:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wps_init.conf
------------------------------------------------------------------------------
svn:executable = *
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wpsapp
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wpsapp?rev=3840&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wpsapp
------------------------------------------------------------------------------
svn:executable = *
Propchange:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wpsapp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/marvell-wps-bin_3.11.bb
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/marvell-wps-bin_3.11.bb?rev=3840&root=Jive&view=auto
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/marvell-wps-bin_3.11.bb
(added)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/marvell-wps-bin_3.11.bb
Thu Jan 15 09:58:06 2009
@@ -1,0 +1,28 @@
+DESCRIPTION = "Marvell wps app"
+SECTION = "base"
+LICENSE = "binary only"
+
+#PR = "r0"
+
+PROVIDES = "marvell-wps"
+
+SRC_URI=" \
+ file://wpsapp \
+ file://wps_init.conf \
+ "
+
+do_install() {
+ install -m 0755 -d ${D}${sbindir}
+
+ # Install wpsapp
+ install -m 0755 -d ${D}${sbindir}/wps
+ install -m 0755 -d ${D}${sbindir}/wps/config
+
+ install -m 0755 ${WORKDIR}/wpsapp ${D}${sbindir}/wps/wpsapp
+ install -m 0755 ${WORKDIR}/wps_init.conf
${D}${sbindir}/wps/config/wps_init.conf
+}
+
+PACKAGES = "marvell-wps-dbg marvell-wps"
+
+FILES_marvell-wps = "${sbindir}"
+FILES_marvell-wps-dbg = "${sbindir}/wps/.debug"
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/marvell-wps-src_svn.bb
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/marvell-wps-src_svn.bb?rev=3840&root=Jive&view=auto
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/marvell-wps-src_svn.bb
(added)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/marvell-wps/marvell-wps-src_svn.bb
Thu Jan 15 09:58:06 2009
@@ -1,0 +1,44 @@
+DESCRIPTION = "Marvell wps app"
+SECTION = "base"
+LICENSE = "binary only"
+
+PV = "3.11"
+#PR = "r1"
+
+PROVIDES = "marvell-wps"
+
+SRC_URI="${SQUEEZEOS_PRIVATE_SVN};module=src_wps"
+
+S = "${WORKDIR}/src_wps"
+
+do_compile() {
+ # Compile encrypt_lib
+# oe_runmake encrypt_src
+ cd ${S}/encrypt_src
+# make clean
+ make build
+
+ # Compile wpsapp
+# oe_runmake .
+ cd ${S}/.
+ make clean
+ make build
+}
+
+do_install() {
+ install -m 0755 -d ${D}${sbindir}
+
+ # Install wpsapp
+ install -m 0755 -d ${D}${sbindir}/wps
+ install -m 0755 -d ${D}${sbindir}/wps/config
+
+ install -m 0755 ${S}/wps/wpsapp ${D}${sbindir}/wps/wpsapp
+ install -m 0755 ${S}/wps/config/wps_init.conf
${D}${sbindir}/wps/config/wps_init.conf
+
+}
+
+PACKAGES = "marvell-wps-dbg marvell-wps"
+
+FILES_marvell-wps = "${sbindir}"
+FILES_marvell-wps-dbg = "${sbindir}/wps/.debug"
+
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb?rev=3840&root=Jive&r1=3839&r2=3840&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
Thu Jan 15 09:58:06 2009
@@ -2,7 +2,7 @@
LICENSE = "Logitech Public Source License"
PV = "${DISTRO_VERSION}+svnr${SRCREV}"
-PR = "r16"
+PR = "r8"
DEPENDS += "squeezeplay"
@@ -12,7 +12,7 @@
inherit autotools
-CFLAGS_prepend = '-DSQUEEZEPLAY_RELEASE=\\"${DISTRO_VERSION}\\"
-DSQUEEZEPLAY_REVISION=\\"${SQUEEZEOS_REVISION}\\"'
+CFLAGS_prepend = '-I${STAGING_INCDIR}/squeezeplay'
CFLAGS += -I${STAGING_INCDIR}/glib-2.0
-I${STAGING_INCDIR}/../lib/glib-2.0/include -I${STAGING_INCDIR}/pango-1.0
-I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/cairo
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=3840&root=Jive&r1=3839&r2=3840&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
Thu Jan 15 09:58:06 2009
@@ -320,8 +320,8 @@
obj.heloPacket = heloPacket
obj.heloPacket.mac = string.lower(obj.heloPacket.mac)
- obj:capability("model", obj.heloPacket.model)
- obj:capability("modelName", obj.heloPacket.modelName)
+ obj:capability("Model", obj.heloPacket.model)
+ obj:capability("ModelName", obj.heloPacket.modelName)
obj.statusCallback = _defaultStatusCallback
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay_jive/src/jive_bsp.c
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_jive/src/jive_bsp.c?rev=3840&root=Jive&r1=3839&r2=3840&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay_jive/src/jive_bsp.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay_jive/src/jive_bsp.c Thu Jan
15 09:58:06 2009
@@ -6,7 +6,7 @@
#include "common.h"
-#include "jive.h"
+#include "ui/jive.h"
#include <linux/input.h>
#include <sys/soundcard.h>
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
