Author: agrundman
Date: Tue Mar 13 17:26:24 2012
New Revision: 9648
URL: http://svn.slimdevices.com/jive?rev=9648&view=rev
Log:
r80669@andy-imac (orig r9627): mherger | 2012-03-05 09:23:48 -0500
Bug: n/a
Description: fix typo potentially causing upgrade/downgrade confusion
r80671@andy-imac (orig r9629): fmueller | 2012-03-07 10:45:13 -0500
Bug: n/a
Description: Fab4 only: Fix WPS (wpsapp) when WPS process is canceled and
properly turn WPS_SESSION off in driver.
r80674@andy-imac (orig r9632): fmueller | 2012-03-09 10:10:43 -0500
Bug: n/a
Description: Fix atheros driver recipe to only download source files for
wanted driver version (and not all)
Modified:
7.7/branches/crypto/ (props changed)
7.7/branches/crypto/squeezeos/poky/meta-squeezeos/packages/atheros/atheros-ar6-module-src_svn.bb
7.7/branches/crypto/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wpsapp
7.7/branches/crypto/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
Propchange: 7.7/branches/crypto/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Mar 13 17:26:24 2012
@@ -16,6 +16,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9408
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9545
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.7/trunk:9632
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.7/branches/crypto/squeezeos/poky/meta-squeezeos/packages/atheros/atheros-ar6-module-src_svn.bb
URL:
http://svn.slimdevices.com/jive/7.7/branches/crypto/squeezeos/poky/meta-squeezeos/packages/atheros/atheros-ar6-module-src_svn.bb?rev=9648&r1=9647&r2=9648&view=diff
==============================================================================
---
7.7/branches/crypto/squeezeos/poky/meta-squeezeos/packages/atheros/atheros-ar6-module-src_svn.bb
(original)
+++
7.7/branches/crypto/squeezeos/poky/meta-squeezeos/packages/atheros/atheros-ar6-module-src_svn.bb
Tue Mar 13 17:26:24 2012
@@ -10,7 +10,7 @@
DEPENDS = "virtual/kernel"
#RDEPENDS = "wireless-tools"
-SRC_URI="${SQUEEZEOS_PRIVATE_SVN};module=atheros \
+SRC_URI="${SQUEEZEOS_PRIVATE_SVN};module=atheros/AR6kSDK.build_sw.62 \
file://AR6kSDK.build_sw.62.baby.patch;patch=1 \
file://BMI_read_mem_failure.patch;patch=1 \
file://atheros_scan_hidden_ssid.patch;patch=1 \
Modified:
7.7/branches/crypto/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wpsapp
URL:
http://svn.slimdevices.com/jive/7.7/branches/crypto/squeezeos/poky/meta-squeezeos/packages/marvell-wps/files/wpsapp?rev=9648&r1=9647&r2=9648&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.7/branches/crypto/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
URL:
http://svn.slimdevices.com/jive/7.7/branches/crypto/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua?rev=9648&r1=9647&r2=9648&view=diff
==============================================================================
---
7.7/branches/crypto/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
(original)
+++
7.7/branches/crypto/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
Tue Mar 13 17:26:24 2012
@@ -324,7 +324,7 @@
end
local oldUpgradeUrl = self.upgradeUrl
- local oldUpgradeForce = self.upgrdaeForce
+ local oldUpgradeForce = self.upgradeForce
self.upgradeUrl = url
self.upgradeForce = (tonumber(chunk.data.firmwareUpgrade) == 1)
_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
