Author: titmuss
Date: Wed Jul 23 03:20:05 2008
New Revision: 2724
URL: http://svn.slimdevices.com?rev=2724&root=Jive&view=rev
Log:
Bug: N/A
Description:
Added receipes for building wlan modules and tools. Building from the private
source code can be enabled in the
local.conf file, otherwise for public builds rebuilt binary files are used.
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi.ko
(with props)
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi8686.bin
(with props)
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi8xxx.ko
(with props)
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/helper_gspi.bin
(with props)
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wlanconfig
(with props)
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wpa_cli
(with props)
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wpa_supplicant
(with props)
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-bin_1.0.bb
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-src_svn.bb
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-wlan-tools-bin_1.0.bb
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-wlan-tools-src_svn.bb
Modified:
7.2/trunk/squeezeos/poky/build/conf/local.conf.sample
7.2/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.2/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf
Modified: 7.2/trunk/squeezeos/poky/build/conf/local.conf.sample
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/build/conf/local.conf.sample?rev=2724&root=Jive&r1=2723&r2=2724&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/poky/build/conf/local.conf.sample (original)
+++ 7.2/trunk/squeezeos/poky/build/conf/local.conf.sample Wed Jul 23 03:20:05
2008
@@ -31,8 +31,8 @@
BBMASK = ""
# The machine to target
-#MACHINE ?= "logitech-jive"
-MACHINE ?= "qemuarm"
+MACHINE ?= "jive"
+#MACHINE ?= "qemuarm"
# Other supported machines
#MACHINE ?= "qemux86"
@@ -147,3 +147,13 @@
#ASSUME_PROVIDED += "gtk+-native libglade-native"
ENABLE_BINARY_LOCALE_GENERATION = "1"
+
+
+# Enable the below to build wlan drivers 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"
+
+#SRCREV_pn-marvell-wlan-tools-src = "${AUTOREV}"
+#SRCREV_pn-marvell-gspi-module-src = "${AUTOREV}"
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=2724&root=Jive&r1=2723&r2=2724&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 Wed Jul
23 03:20:05 2008
@@ -19,32 +19,40 @@
DISTRO_FEATURES = "alsa usbgadget usbhost wifi nfs zeroconf"
# SqueezeOS/SqueezePlay SCM
-SQUEEZEOS_SVN =
"svn://svn.slimdevices.com/repos/jive/${DISTRO_VERSION}/trunk/squeezeos/src/"
-SQUEEZEPLAY_SCM =
"svn://svn.slimdevices.com/repos/jive/${DISTRO_VERSION}/trunk/squeezeplay/src;proto=http"
+SQUEEZEOS_SVN ?=
"svn://svn.slimdevices.com/repos/jive/${DISTRO_VERSION}/trunk/squeezeos/src/"
+SQUEEZEPLAY_SCM ?=
"svn://svn.slimdevices.com/repos/jive/${DISTRO_VERSION}/trunk/squeezeplay/src;proto=http"
-# Versions
-SRCREV_pn-libsdl-image = "${AUTOREV}"
-SRCREV_pn-libsdl = "${AUTOREV}"
-SRCREV_pn-libsdl-ttf = "${AUTOREV}"
-SRCREV_pn-libsdl-gfx = "${AUTOREV}"
-SRCREV_pn-freefont = "${AUTOREV}"
-SRCREV_pn-luaprofiler = "${AUTOREV}"
-SRCREV_pn-luasocket = "${AUTOREV}"
-SRCREV_pn-lualoop = "${AUTOREV}"
-SRCREV_pn-luajson = "${AUTOREV}"
-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}"
+# SqueezePlay application
+SRCREV_pn-squeezeplay ?= "${AUTOREV}"
+SRCREV_pn-squeezeplay-jive ?= "${AUTOREV}"
-SRCREV_pn-squeezeplay = "${AUTOREV}"
-SRCREV_pn-squeezeplay-jive = "${AUTOREV}"
+# SqueezePlay dependancies
+SRCREV_pn-libsdl-image ?= "${AUTOREV}"
+SRCREV_pn-libsdl ?= "${AUTOREV}"
+SRCREV_pn-libsdl-ttf ?= "${AUTOREV}"
+SRCREV_pn-libsdl-gfx ?= "${AUTOREV}"
+SRCREV_pn-freefont ?= "${AUTOREV}"
+SRCREV_pn-luaprofiler ?= "${AUTOREV}"
+SRCREV_pn-luasocket ?= "${AUTOREV}"
+SRCREV_pn-lualoop ?= "${AUTOREV}"
+SRCREV_pn-luajson ?= "${AUTOREV}"
+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-linux-jive = "${AUTOREV}"
+# SqueezeOS
+SRCREV_pn-linux-jive ?= "${AUTOREV}"
+
+
+# jive marvell wlan driver, use binary version
+# to build from source modify your local.conf
+PREFERRED_PROVIDER_marvell-wlan-tools ?= "marvell-wlan-tools-bin"
+PREFERRED_PROVIDER_marvell-gspi-module ?= "marvell-gspi-module-bin"
PREFERRED_VERSION_busybox ?= "1.7.0"
PREFERRED_VERSION_qemu-native ?= "0.9.1"
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=2724&root=Jive&r1=2723&r2=2724&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 Wed Jul 23
03:20:05 2008
@@ -12,7 +12,7 @@
SERIAL_CONSOLE = "-L 115200 tts/0"
IMAGE_INSTALL += "uboot-env"
-#IMAGE_INSTALL += "marvell-gspi-src-jive"
+IMAGE_INSTALL += "marvell-gspi-module marvell-wlan-tools"
IMAGE_INSTALL += "squeezeplay-jive"
require conf/machine/include/tune-arm926ejs.inc
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi.ko
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi.ko?rev=2724&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi.ko
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi8686.bin
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi8686.bin?rev=2724&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi8686.bin
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi8xxx.ko
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi8xxx.ko?rev=2724&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi8xxx.ko
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/helper_gspi.bin
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/helper_gspi.bin?rev=2724&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/helper_gspi.bin
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wlanconfig
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wlanconfig?rev=2724&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wlanconfig
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wpa_cli
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wpa_cli?rev=2724&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wpa_cli
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wpa_supplicant
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wpa_supplicant?rev=2724&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/wpa_supplicant
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-bin_1.0.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-bin_1.0.bb?rev=2724&root=Jive&view=auto
==============================================================================
---
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-bin_1.0.bb
(added)
+++
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-bin_1.0.bb
Wed Jul 23 03:20:05 2008
@@ -1,0 +1,36 @@
+DESCRIPTION = "Marvell 88W8686 gspi wlan drivers"
+SECTION = "base"
+LICENSE = "binary only"
+
+#PR = "r0"
+
+PROVIDES = "marvell-gspi-module"
+
+RDEPENDS = "wireless-tools"
+
+SRC_URI=" \
+ file://gspi.ko \
+ file://gspi8686.bin \
+ file://gspi8xxx.ko \
+ file://helper_gspi.bin \
+ "
+
+inherit module-base
+
+dirs = "/lib /lib/modules /lib/modules/${KERNEL_VERSION} /lib/firmware"
+
+do_install() {
+ for d in ${dirs}; do
+ install -m 0755 -d ${D}$d
+ done
+
+ install -m 0755 ${WORKDIR}/gspi.ko
${D}/lib/modules/${KERNEL_VERSION}/gspi.ko
+ install -m 0755 ${WORKDIR}/gspi8xxx.ko
${D}/lib/modules/${KERNEL_VERSION}/gspi8xxx.ko
+ install -m 0755 ${WORKDIR}/gspi8686.bin ${D}/lib/firmware/gspi8686.bin
+ install -m 0755 ${WORKDIR}/helper_gspi.bin
${D}/lib/firmware/helper_gspi.bin
+}
+
+PACKAGES = "marvell-gspi-module-dbg marvell-gspi-module"
+
+FILES_marvell-gspi-module = "${base_libdir}/modules/${KERNEL_VERSION}
${base_libdir}/firmware"
+FILES_marvell-gspi-module-dbg =
"${base_libdir}/modules/${KERNEL_VERSION}/.debug"
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-src_svn.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-src_svn.bb?rev=2724&root=Jive&view=auto
==============================================================================
---
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-src_svn.bb
(added)
+++
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-src_svn.bb
Wed Jul 23 03:20:05 2008
@@ -1,0 +1,42 @@
+DESCRIPTION = "Marvell 88W8686 gspi wlan driver"
+SECTION = "base"
+LICENSE = "binary only"
+
+PV = "1.0"
+#PR = "r0"
+
+PROVIDES = "marvell-gspi-module"
+
+DEPENDS = "virtual/kernel"
+RDEPENDS = "wireless-tools marvell-wlan-tools"
+
+SRC_URI="${SQUEEZEOS_PRIVATE_SVN};module=src_gspi8686"
+
+S = "${WORKDIR}/src_gspi8686"
+
+inherit module-base
+
+CFLAGS_prepend += "-I${S}/os/linux"
+CFLAGS_prepend += "-I${S}/wlan"
+
+do_compile() {
+ # Compile kernel modules
+ # ${KERNEL_LD} doesn't understand the LDFLAGS, so suppress them
+ oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" LDFLAGS=""
KERNELDIR=${KERNEL_SOURCE} MODDIR=/${base_libdir}/modules/${KERNEL_VERSION}
+}
+
+do_install() {
+ # Install kernel modules
+ install -m 0755 -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}
+ oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" LDFLAGS=""
KERNELDIR=${KERNEL_SOURCE} MODDIR=${D}/${base_libdir}/modules/${KERNEL_VERSION}
install
+
+ # Install wlan firmware
+ install -m 0755 -d ${D}/${base_libdir}/firmware
+ install -m 0644 ${S}/FwImage/gspi8686.bin
${D}/${base_libdir}/firmware/gspi8686.bin
+ install -m 0644 ${S}/FwImage/helper_gspi.bin
${D}/${base_libdir}/firmware/helper_gspi.bin
+}
+
+PACKAGES = "marvell-gspi-module-dbg marvell-gspi-module"
+
+FILES_marvell-gspi-module = "${base_libdir}/modules/${KERNEL_VERSION}
${base_libdir}/firmware"
+FILES_marvell-gspi-module-dbg =
"${base_libdir}/modules/${KERNEL_VERSION}/.debug"
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-wlan-tools-bin_1.0.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-wlan-tools-bin_1.0.bb?rev=2724&root=Jive&view=auto
==============================================================================
---
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-wlan-tools-bin_1.0.bb
(added)
+++
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-wlan-tools-bin_1.0.bb
Wed Jul 23 03:20:05 2008
@@ -1,0 +1,30 @@
+DESCRIPTION = "Marvell 8686 wlan tools"
+SECTION = "base"
+LICENSE = "binary only"
+
+#PR = "r0"
+
+PROVIDES = "marvell-wlan-tools"
+
+SRC_URI=" \
+ file://wlanconfig \
+ file://wpa_cli \
+ file://wpa_supplicant \
+ "
+
+dirs = "/usr /usr/sbin"
+
+do_install() {
+ for d in ${dirs}; do
+ install -m 0755 -d ${D}$d
+ done
+
+ install -m 0755 ${WORKDIR}/wlanconfig ${D}${sbindir}/wlanconfig
+ install -m 0755 ${WORKDIR}/wpa_cli ${D}${sbindir}/wpa_cli
+ install -m 0755 ${WORKDIR}/wpa_supplicant ${D}${sbindir}/wpa_supplicant
+}
+
+PACKAGES = "marvell-wlan-tools-dbg marvell-wlan-tools"
+
+FILES_marvell-wlan-tools = "${sbindir}"
+FILES_marvell-wlan-tools-dbg = "${sbindir}/.debug"
Added:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-wlan-tools-src_svn.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-wlan-tools-src_svn.bb?rev=2724&root=Jive&view=auto
==============================================================================
---
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-wlan-tools-src_svn.bb
(added)
+++
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-wlan-tools-src_svn.bb
Wed Jul 23 03:20:05 2008
@@ -1,0 +1,40 @@
+DESCRIPTION = "Marvell 8686 wlan tools"
+SECTION = "base"
+LICENSE = "binary only"
+
+PV = "1.0"
+#PR = "r0"
+
+PROVIDES = "marvell-wlan-tools"
+
+SRC_URI="${SQUEEZEOS_PRIVATE_SVN};module=src_gspi8686"
+
+S = "${WORKDIR}/src_gspi8686"
+
+CFLAGS_prepend += "-I${S}/os/linux"
+CFLAGS_prepend += "-I${S}/wlan"
+
+do_compile() {
+ # Compile wlanconfig
+ oe_runmake app/wlanconfig
+
+ # Compile wpa_supplicant. oe_runmake fails here, just use make
+ cd ${S}/app/wpa_supplicant-0.5.7
+ make
+}
+
+do_install() {
+ install -m 0755 -d ${D}${sbindir}
+
+ # Install wlanconfig
+ install -m 0755 ${S}/app/wlanconfig/wlanconfig ${D}${sbindir}/wlanconfig
+
+ # Install wpa_supplicant
+ install -m 0755 ${S}/app/wpa_supplicant-0.5.7/wpa_cli
${D}${sbindir}/wpa_cli
+ install -m 0755 ${S}/app/wpa_supplicant-0.5.7/wpa_supplicant
${D}${sbindir}/wpa_supplicant
+}
+
+PACKAGES = "marvell-wlan-tools-dbg marvell-wlan-tools"
+
+FILES_marvell-wlan-tools = "${sbindir}"
+FILES_marvell-wlan-tools-dbg = "${sbindir}/.debug"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
