Merge branch 'master' of ssh://git@git.moblin.org/poky

build/conf/site.conf.sample

@@ -7,10 +7,26 @@
 #CVS_PROXY_HOST = "proxy.example.com"
 #CVS_PROXY_PORT = "81"
 
-# Uncomment to cause git to use the proxy host specificed
+# For svn, you need to create ~/.subversion/servers containing:
+#[global]
+#http-proxy-host = proxy.example.com
+#http-proxy-port = 81
+#
+
+# Uncomment to cause git to use the proxy host specificed 
+# although this only works for http
 #GIT_PROXY_HOST = "proxy.example.com"
 #GIT_PROXY_PORT = "81"
 #export GIT_PROXY_COMMAND = "${OEROOT}/scripts/poky-git-proxy-command"
 
+# If SOCKS is available run the following command to comple a simple transport
+# gcc scripts/poky-git-proxy-socks.c -o poky-git-proxy-socks
+# and then share that binary somewhere in PATH, then use the following settings
+#GIT_PROXY_HOST = "proxy.example.com"
+#GIT_PROXY_PORT = "81"
+#export GIT_PROXY_COMMAND = "${OEROOT}/scripts/poky-git-proxy-socks-command"
+
+
 # Uncomment this to use a shared download directory
-#DL_DIR = "/some/shared/download/directory/"
+#DL_DIR = "/some/shared/download/directory/"
+

meta-moblin/packages/images/poky-image-sdk-live.bb

@@ -0,0 +1,9 @@
+DESCRIPTION = "Bootable Live SDK Image"
+
+require poky-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sdk-${MACHINE}.ext3"
+
+do_bootimg[depends] += "poky-image-sdk:do_rootfs"

meta-openmoko/packages/images/poky-image-openmoko.bb

@@ -2,8 +2,6 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-PR = "r3"
-
 IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES} apps-x11-games"
 
 inherit poky-image
@@ -14,7 +12,6 @@ IMAGE_INSTALL += "openmoko-contacts2 openmoko-session2 \
     matchbox-stroke \
     matchbox-config-gtk \
     matchbox-themes-gtk \
-    matchbox-applet-startup-monitor \
     xcursor-transparent-theme \
     openmoko-icon-theme-standard \
     settings-daemon"

meta/classes/base.bbclass

@@ -641,7 +641,7 @@ def oe_unpack_file(file, data, url = None):
 		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
 		if 'dos' in parm:
 			cmd = '%s -a' % cmd
-		cmd = '%s %s' % (cmd, file)
+		cmd = "%s '%s'" % (cmd, file)
 	elif os.path.isdir(file):
 		filesdir = os.path.realpath(bb.data.getVar("FILESDIR", data, 1))
 		destdir = "."

meta/conf/bitbake.conf

@@ -476,12 +476,12 @@ FETCHCMD_bzr = "/usr/bin/env bzr"
 FETCHCMD_hg = "/usr/bin/env hg"
 
 FETCHCOMMAND = "ERROR, this must be a BitBake bug"
-FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
+FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} '${URI}'"
 FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
 FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
 CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
 RESUMECOMMAND = "ERROR, this must be a BitBake bug"
-RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
+RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} '${URI}'"
 UPDATECOMMAND = "ERROR, this must be a BitBake bug"
 UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"

meta/packages/orinoco/spectrum-fw.bb

@@ -1,9 +1,10 @@
 DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
 DEPENDS += " unzip-native "
 LICENSE = "unknown"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "file://get_symbol_fw \
+SRC_URI = "ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/MC&DriverOnlyInstallers.zip \
+           file://get_symbol_fw \
            file://parse_symbol_fw"
 S = "${WORKDIR}"
 

meta/packages/orinoco/spectrum-fw/get_symbol_fw

@@ -15,29 +15,15 @@
 
 set -e
 
-URL_BASE='ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/'
-DL_FILE='MC&DriverOnlyInstallers.zip'
 DL_INT1='S24DRVR392B67-01.exe'
 DL_INT2='Driver Only Installer/NetWLan5.sys'
 DRIVER1=symbol1.drv
 DRIVER2=symbol2.drv
 
-get_file() {
-    curl --remote-name "$1" || \
-    wget --passive-ftp "$1" || \
-    wget "$1" || \
-    ftp "$1" </dev/null || \
-    exit 1
-}
-		    
-if ! test -f $DL_FILE; then
-    get_file $URL_BASE/$DL_FILE
-fi
-			
-unzip -p $DL_FILE "$DL_INT1" >$DRIVER1
-unzip -p $DRIVER1 "$DL_INT2" >$DRIVER2
-			
+unzip -p $DL_INT1 "$DL_INT2" >$DRIVER2
+	
 perl parse_symbol_fw $DRIVER2 spectrum_fw.h symbol_sp24t_prim_fw \
     symbol_sp24t_sec_fw
 			    
-rm -f $DRIVER1 $DRIVER2
+rm -f $DRIVER1 $DRIVER2
+

scripts/poky-git-proxy-socks-command

@@ -0,0 +1,2 @@
+#! /bin/bash
+poky-git-proxy-socks -S $GIT_PROXY_HOST:$GIT_PROXY_PORT $@