This email list is read-only. Emails sent to this list will be discarded
----------------------------------
meta/classes/base.bbclass | 2 +-
meta/conf/bitbake.conf | 4 ++--
meta/packages/orinoco/spectrum-fw.bb | 5 +++--
meta/packages/orinoco/spectrum-fw/get_symbol_fw | 22 ++++------------------
4 files changed, 10 insertions(+), 23 deletions(-)
New commits:
commit 07b4c0676b1c33bceb68c3ecece3d229c5ea61e2
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Thu Oct 23 21:10:28 2008 +0100
spectrum-fw: Use the standard fetcher process
commit b8ff2b6cc3fd50420dda19eaf78943bad64aad3b
Author: Richard Purdie <[EMAIL PROTECTED]>
Date: Thu Oct 23 21:08:42 2008 +0100
base.bbclass/bitbake.conf: Fix some string quoting to handle more unusual
URLs
Diff in this email is a maximum of 400 lines.
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index d67579d..c6e19c1 100644
--- a/meta/classes/base.bbclass
+++ b/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 = "."
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a7ab50b..6919649 100644
--- a/meta/conf/bitbake.conf
+++ b/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}"
diff --git a/meta/packages/orinoco/spectrum-fw.bb
b/meta/packages/orinoco/spectrum-fw.bb
index f2e11ee..2799878 100644
--- a/meta/packages/orinoco/spectrum-fw.bb
+++ b/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}"
diff --git a/meta/packages/orinoco/spectrum-fw/get_symbol_fw
b/meta/packages/orinoco/spectrum-fw/get_symbol_fw
index e7b0bf2..80420b0 100755
--- a/meta/packages/orinoco/spectrum-fw/get_symbol_fw
+++ b/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
\ No newline at end of file
+rm -f $DRIVER1 $DRIVER2
+
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
