Author: titmuss
Date: Fri Jul 25 04:49:55 2008
New Revision: 2743

URL: http://svn.slimdevices.com?rev=2743&root=Jive&view=rev
Log:
Bug: N/A
Description:
Allow squeezeos-image to be compiled for the qemuarm machine.

Modified:
    
7.2/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
    7.2/trunk/squeezeos/poky/meta-squeezeos/conf/machine/jive.conf

Modified: 
7.2/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
URL: 
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass?rev=2743&root=Jive&r1=2742&r2=2743&view=diff
==============================================================================
--- 
7.2/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass 
(original)
+++ 
7.2/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass 
Fri Jul 25 04:49:55 2008
@@ -4,7 +4,14 @@
 KERNEL_IMAGE_NAME ?= "zImage-${MACHINE}.bin"
 ROOTFS_IMAGE_NAME ?= "${IMAGE_NAME}.rootfs.cramfs"
 
+# export IMAGE_SQUEEZEOS_UPGRADE
+IMAGE_SQUEEZEOS_UPGRADE[export] = "1"
+
 do_squeezeos_image() {
+       if [ "x$IMAGE_SQUEEZEOS_UPGRADE" == "x" ]; then
+               exit 0
+       fi
+
        tmpdir=`mktemp -d /tmp/squeezeos-XXXXXX`
 
        # Copy image files

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=2743&root=Jive&r1=2742&r2=2743&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 25 
04:49:55 2008
@@ -16,4 +16,6 @@
 IMAGE_INSTALL += "marvell-gspi-module marvell-wlan-tools"
 IMAGE_INSTALL += "squeezeplay-jive"
 
+IMAGE_SQUEEZEOS_UPGRADE = "1"
+
 require conf/machine/include/tune-arm926ejs.inc

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins

Reply via email to