Author: titmuss
Date: Tue Jun 10 14:08:24 2008
New Revision: 2552
URL: http://svn.slimdevices.com?rev=2552&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2548): adrian | 2008-06-07 16:14:50 +0100
Bug: 7801
Description: set radio button if correctly when custom wallpaper already
selected
[EMAIL PROTECTED] (orig r2549): titmuss | 2008-06-09 12:31:17 +0100
Bug: 7027
Description:
Remove kernel workaround for pre-production bootloaders.
[EMAIL PROTECTED] (orig r2550): bklaas | 2008-06-09 17:40:25 +0100
Bug: 7023
Description: move Settings below Extras on top menu
[EMAIL PROTECTED] (orig r2551): titmuss | 2008-06-09 17:54:11 +0100
Bug: 5919
Description:
Send 'SqueezeboxController' as the hostname when requesting a dhcp address.
Added:
7.2/trunk/squeezeos/src/system/filesystem/etc/hostname
Modified:
7.2/trunk/ (props changed)
7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_irtx.c
7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_wheel.c
7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/sound/soc/s3c24xx/jive_wm8750.c
7.2/trunk/squeezeos/src/system/busybox_1_7_stable/.config
7.2/trunk/squeezeos/src/system/busybox_1_7_stable/networking/ifupdown.c
7.2/trunk/squeezeos/src/system/filesystem/Makefile
7.2/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua
7.2/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
Propchange: 7.2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jun 10 14:08:24 2008
@@ -1,5 +1,5 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2502
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2538
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2551
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.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_irtx.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_irtx.c?rev=2552&root=Jive&r1=2551&r2=2552&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_irtx.c
(original)
+++ 7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_irtx.c
Tue Jun 10 14:08:24 2008
@@ -1,5 +1,5 @@
//===================================================================
-//IR ¼Û½Å µå¶óÀ̹ö
+//IR ¼Ã½Ã
µå¶óÃùö
//===================================================================
#include <linux/module.h>
@@ -170,14 +170,7 @@
{
int result;
- /* For compatibility with the old bootloader allow s3c2413 machines
- * to work here too. We can't use machine_is_s3c2413() here as that
- * machine is not configured in the kernel.
- *
- * The S3C2413 hack should be removed when the old bootloader has
- * been phased out.
- */
- if (!(machine_is_jive() || machine_arch_type == MACH_TYPE_S3C2413))
+ if (!machine_is_jive())
return 0;
result = misc_register (&jive_irtx_miscdev);
Modified:
7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c?rev=2552&root=Jive&r1=2551&r2=2552&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
(original)
+++ 7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
Tue Jun 10 14:08:24 2008
@@ -426,15 +426,7 @@
unsigned long flags;
int rc;
-
- /* For compatibility with the old bootloader allow s3c2413 machines
- * to work here too. We can't use machine_is_s3c2413() here as that
- * machine is not configured in the kernel.
- *
- * The S3C2413 hack should be removed when the old bootloader has
- * been phased out.
- */
- if (!(machine_is_jive() || machine_arch_type == MACH_TYPE_S3C2413))
+ if (!machine_is_jive())
return -ENOENT;;
printk("jive_mgmt_init\n");
Modified:
7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_wheel.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_wheel.c?rev=2552&root=Jive&r1=2551&r2=2552&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_wheel.c
(original)
+++ 7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_wheel.c
Tue Jun 10 14:08:24 2008
@@ -224,14 +224,7 @@
unsigned int gpio;
int i, ret;
- /* For compatibility with the old bootloader allow s3c2413 machines
- * to work here too. We can't use machine_is_s3c2413() here as that
- * machine is not configured in the kernel.
- *
- * The S3C2413 hack should be removed when the old bootloader has
- * been phased out.
- */
- if (!(machine_is_jive() || machine_arch_type == MACH_TYPE_S3C2413))
+ if (!machine_is_jive())
return 0;
// we need to register at least one button and two relative axes
Modified:
7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/sound/soc/s3c24xx/jive_wm8750.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/sound/soc/s3c24xx/jive_wm8750.c?rev=2552&root=Jive&r1=2551&r2=2552&view=diff
==============================================================================
---
7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/sound/soc/s3c24xx/jive_wm8750.c
(original)
+++
7.2/trunk/squeezeos/src/s3c2412/linux-2.6.22/sound/soc/s3c24xx/jive_wm8750.c
Tue Jun 10 14:08:24 2008
@@ -257,14 +257,7 @@
printk("JIVE WM8750 Audio support\n");
- /* For compatibility with the old bootloader allow s3c2413 machines
- * to work here too. We can't use machine_is_s3c2413() here as that
- * machine is not configured in the kernel.
- *
- * The S3C2413 hack should be removed when the old bootloader has
- * been phased out.
- */
- if (!(machine_is_jive() || machine_arch_type == MACH_TYPE_S3C2413))
+ if (!machine_is_jive())
return 0;
jive_snd_device = platform_device_alloc("soc-audio", -1);
Modified: 7.2/trunk/squeezeos/src/system/busybox_1_7_stable/.config
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/system/busybox_1_7_stable/.config?rev=2552&root=Jive&r1=2551&r2=2552&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/system/busybox_1_7_stable/.config (original)
+++ 7.2/trunk/squeezeos/src/system/busybox_1_7_stable/.config Tue Jun 10
14:08:24 2008
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.7.1.svn
-# Tue Apr 22 14:09:58 2008
+# Mon Jun 9 17:42:03 2008
#
CONFIG_HAVE_DOT_CONFIG=y
Modified:
7.2/trunk/squeezeos/src/system/busybox_1_7_stable/networking/ifupdown.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/system/busybox_1_7_stable/networking/ifupdown.c?rev=2552&root=Jive&r1=2551&r2=2552&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/system/busybox_1_7_stable/networking/ifupdown.c
(original)
+++ 7.2/trunk/squeezeos/src/system/busybox_1_7_stable/networking/ifupdown.c Tue
Jun 10 14:08:24 2008
@@ -151,6 +151,15 @@
return ifd->option[i].value;
}
}
+
+ /* gethostname if it is not in the interface definition */
+ if (strncmpz(id, "hostname", idlen) == 0) {
+ static char hostname[HOST_NAME_MAX + 1];
+ if (gethostname(hostname, HOST_NAME_MAX) == 0) {
+ return hostname;
+ }
+ }
+
return NULL;
}
Modified: 7.2/trunk/squeezeos/src/system/filesystem/Makefile
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/system/filesystem/Makefile?rev=2552&root=Jive&r1=2551&r2=2552&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/system/filesystem/Makefile (original)
+++ 7.2/trunk/squeezeos/src/system/filesystem/Makefile Tue Jun 10 14:08:24 2008
@@ -78,3 +78,4 @@
install etc/network/if_mapping ${PREFIX}/etc/network
install etc/network/udhcpc_action ${PREFIX}/etc/network
install etc/network/wpa_action ${PREFIX}/etc/network
+ install etc/hostname ${PREFIX}/etc/hostname
Added: 7.2/trunk/squeezeos/src/system/filesystem/etc/hostname
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/system/filesystem/etc/hostname?rev=2552&root=Jive&view=auto
==============================================================================
--- 7.2/trunk/squeezeos/src/system/filesystem/etc/hostname (added)
+++ 7.2/trunk/squeezeos/src/system/filesystem/etc/hostname Tue Jun 10 14:08:24
2008
@@ -1,0 +1,1 @@
+SqueezeboxController
Modified: 7.2/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS?rev=2552&root=Jive&r1=2551&r2=2552&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS (original)
+++ 7.2/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS Tue Jun 10
14:08:24 2008
@@ -6,6 +6,12 @@
/bin/mount -t ramfs ramfs /tmp
/bin/mount -t ramfs ramfs /var
mkdir /var/shm /var/log /var/run
+
+
+# Set hostname
+if [ -f /etc/hostname ]; then
+ /bin/hostname -F /etc/hostname
+fi
# Mount SD card
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua?rev=2552&root=Jive&r1=2551&r2=2552&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua
Tue Jun 10 14:08:24 2008
@@ -230,6 +230,8 @@
local ip, port = self.server:getIpPort()
+ local wallpaper = self:getSettings()[self.currentPlayerId]
+
if data.item_loop then
for _,entry in pairs(data.item_loop) do
log:info("server wallpaper: ", entry.name)
@@ -245,7 +247,8 @@
if attr then
self:setBackground(entry.file, self.currentPlayerId)
end
- end
+ end,
+
wallpaper == entry.file
),
focusGained = function()
local
path = Framework:findFile(PREFIX) .. entry.file
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua?rev=2552&root=Jive&r1=2551&r2=2552&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua Tue Jun 10
14:08:24 2008
@@ -228,9 +228,9 @@
end
jiveMain:addNode( { id = 'hidden', node = 'nowhere' } )
- jiveMain:addNode( { id = 'extras', node = 'home', text =
_globalStrings:str("EXTRAS"), weight = 70 } )
+ jiveMain:addNode( { id = 'extras', node = 'home', text =
_globalStrings:str("EXTRAS"), weight = 50 } )
jiveMain:addNode( { id = 'games', node = 'extras', text =
_globalStrings:str("GAMES"), weight = 70 } )
- jiveMain:addNode( { id = 'settings', node = 'home', noCustom = 1, text
= _globalStrings:str("SETTINGS"), weight = 50, titleStyle = 'settings' })
+ jiveMain:addNode( { id = 'settings', node = 'home', noCustom = 1, text
= _globalStrings:str("SETTINGS"), weight = 70, titleStyle = 'settings' })
jiveMain:addNode( { id = 'advancedSettings', node = 'settings',
noCustom = 1, text = _globalStrings:str("ADVANCED_SETTINGS"), weight = 110,
titleStyle = 'settings' })
jiveMain:addNode( { id = 'screenSettings', node = 'settings', text =
_globalStrings:str("SCREEN_SETTINGS"), weight = 50, titleStyle = 'settings' })
jiveMain:addNode( { id = 'factoryTest', node = 'advancedSettings',
noCustom = 1, text = _globalStrings:str("FACTORY_TEST"), weight = 105,
titleStyle = 'settings' })
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
