Author: richard
Date: Thu Apr 30 13:38:08 2009
New Revision: 5569
URL: http://svn.slimdevices.com/jive?rev=5569&view=rev
Log:
r5...@harrypotter (orig r5549): felix | 2009-04-30 12:55:22 +0100
Bug: n/a
Description: Switch to mirror site for alsa-lib and alsa-tools.
r5...@harrypotter (orig r5552): richard | 2009-04-30 17:18:39 +0100
Bug: N/A
Description:
Fix build problem with marvell binary module.
r5...@harrypotter (orig r5561): mwise | 2009-04-30 18:49:00 +0100
Jive build scripts for Parabuild
r5...@harrypotter (orig r5562): mwise | 2009-04-30 19:45:23 +0100
make it source the script, not just run it. also got rid of a typo
r5...@harrypotter (orig r5564): mwise | 2009-04-30 20:19:14 +0100
Make clean.sh only remove machine specific files...
Added:
7.4/trunk/squeezeos/poky/parabuild/
7.4/trunk/squeezeos/poky/parabuild/build.sh (with props)
7.4/trunk/squeezeos/poky/parabuild/clean.sh (with props)
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-lib_1.0.18.bb
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils_1.0.18.bb
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-bin_1.0.bb
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Apr 30 13:38:08 2009
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
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:5497
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5564
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/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-lib_1.0.18.bb
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-lib_1.0.18.bb?rev=5569&r1=5568&r2=5569&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-lib_1.0.18.bb
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-lib_1.0.18.bb
Thu Apr 30 13:38:08 2009
@@ -11,7 +11,7 @@
#FIXME: remove the following
ARM_INSTRUCTION_SET = "arm"
-SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
+SRC_URI =
"ftp://ftp.task.gda.pl/pub/linux/misc/alsa/lib/alsa-lib-${PV}.tar.bz2 \
file://fix-tstamp-declaration.patch;patch=1"
inherit autotools pkgconfig
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils_1.0.18.bb
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils_1.0.18.bb?rev=5569&r1=5568&r2=5569&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils_1.0.18.bb
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils_1.0.18.bb
Thu Apr 30 13:38:08 2009
@@ -4,7 +4,7 @@
LICENSE = "GPL"
DEPENDS = "alsa-lib ncurses"
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
+SRC_URI =
"ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/alsa-utils-${PV}.tar.bz2 \
file://no-midi.patch;patch=1"
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-bin_1.0.bb
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-bin_1.0.bb?rev=5569&r1=5568&r2=5569&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-bin_1.0.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/marvell-gspi-module-bin_1.0.bb
Thu Apr 30 13:38:08 2009
@@ -6,6 +6,7 @@
PROVIDES = "marvell-gspi-module"
+DEPENDS = "virtual/kernel"
RDEPENDS = "wireless-tools"
SRC_URI=" \
Added: 7.4/trunk/squeezeos/poky/parabuild/build.sh
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/parabuild/build.sh?rev=5569&view=auto
==============================================================================
--- 7.4/trunk/squeezeos/poky/parabuild/build.sh (added)
+++ 7.4/trunk/squeezeos/poky/parabuild/build.sh Thu Apr 30 13:38:08 2009
@@ -1,0 +1,85 @@
+#!/bin/sh
+
+PARABUILD_ENV_SCRIPT="/home/parabuild/private-env-7.3.sh"
+
+# Figure out how many CPUs we have, and set our multithreading
+# options accordingly.
+CPUCOUNT=`cat /proc/cpuinfo | grep processor | wc -l`
+DOUBLECPUCOUNT=`echo "$CPUCOUNT * 2" | bc`
+
+# Function to make sure we call bitbake the same way everywhere
+function run_bitbake {
+ bitbake -vvv $*
+}
+
+echo "*** Setting poky environment ***"
+source poky-init-build-env
+
+if [ -f $PARABUILD_ENV_SCRIPT ]
+then
+ source $PARABUILD_ENV_SCRIPT
+else
+ echo "ERROR: No $PARABUILD_ENV_SCRIPT found. Can Not Continue"
+ exit 1
+fi
+
+echo "*** Clean cache and squeezeplay ***"
+
+# Clean the cache to ensure poky checks out updated packages from SVN
+rm -rf tmp/cache
+
+# Clean squeezeplay to ensure that the firmware revision number is correct
+run_bitbake "squeezeplay -c clean"
+
+echo "*** Update the local.conf file ***"
+if [ "x${SQUEEZEOS_PRIVATE_SVN}" != "x" ]
+then
+ echo "*** Enabled private svn ***"
+
+ # Enable the private modules (wlan drivers, audio codecs, etc)
+ sed -e 's/##//' conf/local.conf.sample > conf/local.conf
+
+ # Set the SVN path for the private modules
+ echo "SQUEEZEOS_PRIVATE_SVN = \"${SQUEEZEOS_PRIVATE_SVN}\"" >>
conf/local.conf
+else
+ cp conf/local.conf.sample conf/local.conf
+fi
+
+# Check if a machine type exists
+if [ "x${MACHINE}" != "x" ]
+then
+ echo "*** Building for MACHINE type: ${MACHINE}"
+else
+ echo "ERROR: No MACHINE specified!"
+ exit 1
+fi
+
+echo "INHERIT += \"rm_work\"" >> conf/local.conf
+
+# Make build use all available CPUs
+echo "BB_NUMBER_THREADS = $CPUCOUNT
+DL_DIR = $HOME/.poky_dl_dir
+PARALLEL_MAKE = \"-j $CPUCOUNT\" " >> conf/local.conf
+
+# Build firmware images, multiple machines can be built here
+echo "*** Building ***"
+run_bitbake "squeezeos-image"
+
+# Do not leave the source code on the build machine, cleanup private modules
+for PKG in 'marvell-wlan-tools-src' 'marvell-gspi-module-src'
'squeezeplay-private'
+do
+ echo "*** Cleaning $PKG ***"
+ run_bitbake "$PKG -c clean -f"
+done
+
+# QA: Check version numbers match
+SQUEEZEOS_VERSION=`cat tmp/rootfs/etc/squeezeos.version | perl -nle 'print if
s/^[\d\.]+\sr(\d+)$/$1/'`
+SQUEEZEPLAY_VERSION=`strings tmp/rootfs/usr/bin/jive | perl -nle 'print if
s/^[\d\.]+\sr(\d+)$/$1/'`
+
+echo "SQUEEZEOS_VERSION=${SQUEEZEOS_VERSION}"
+echo "SQUEEZEPLAY_VERSION=${SQUEEZEPLAY_VERSION}"
+
+if [ "x${SQUEEZEOS_VERSION}" != "x${SQUEEZEPLAY_VERSION}" ]
+then
+ echo "ERROR: squeezeos version mismatch"
+fi
Propchange: 7.4/trunk/squeezeos/poky/parabuild/build.sh
------------------------------------------------------------------------------
svn:executable = *
Added: 7.4/trunk/squeezeos/poky/parabuild/clean.sh
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/parabuild/clean.sh?rev=5569&view=auto
==============================================================================
--- 7.4/trunk/squeezeos/poky/parabuild/clean.sh (added)
+++ 7.4/trunk/squeezeos/poky/parabuild/clean.sh Thu Apr 30 13:38:08 2009
@@ -1,0 +1,21 @@
+#!/bin/sh
+
+echo "Setting environment variables..."
+source poky-init-build-env
+
+# Check if a machine type exists
+if [ "x${MACHINE}" != "x" ]
+then
+ echo "*** Building for MACHINE type: ${MACHINE}"
+else
+ echo "ERROR: No MACHINE specified!"
+ exit 1
+fi
+
+echo "Cleaning out squeezeos-image and squeezeplay"
+bitbake squeezeos-image -c clean
+bitbake squeezeplay -c clean
+
+echo "Removing old binaries"
+rm -rf $PARABUILD_BUILD_DIR/build/tmp/deploy/images/${MACHINE}*bin
+rm -rf $PARABUILD_BUILD_DIR/build/tmp/deploy/images/squeezeos-image-${MACHINE}*
Propchange: 7.4/trunk/squeezeos/poky/parabuild/clean.sh
------------------------------------------------------------------------------
svn:executable = *
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
