Author: pebender
Date: Thu Jun 11 21:31:51 2009
New Revision: 4928
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_HARDWARE.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LCDPROC.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_WIIMOTE.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/g15daemon.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
Log:
- Moved g15daemon's uinput kernel module detection and loading to earlier
in the init process.
- Moved wiimote's uinput kernel module detection and loading to earlier
in the init process.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Thu Jun 11
21:31:51 2009
@@ -11,6 +11,12 @@
patch glvdpau20658.
MythTV trunk: version trunk.20667 trunk svn 20667.
+Modified init
+ - Moved g15daemon's uinput kernel module detection and loading to
earlier
+ in the init process.
+ - Moved wiimote's uinput kernel module detection and loading to earlier
+ in the init process.
+
Modified mediaplayers
- Removed FFmpeg and MPlayer multi-threading support patch because the
patch causes MPlayer to crash when VDPAU is enabled, even though only
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_HARDWARE.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_HARDWARE.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_HARDWARE.pm
Thu Jun 11 21:31:51 2009
@@ -15,7 +15,7 @@
$var_list{'MM_HARDWARE_KERNEL_MODULE_LIST'} =
{
- prerequisite =>
['MM_CPU_KERNEL_MODULE_LIST', 'MM_LCDPROC_KERNEL_MODULE_LIST',
'MM_LIRC_KERNEL_MODULE_LIST', 'MM_PLUGIN_KERNEL_MODULE_LIST',
'MM_X_KERNEL_MODULE_LIST'],
+ prerequisite =>
['MM_CPU_KERNEL_MODULE_LIST', 'MM_LCDPROC_KERNEL_MODULE_LIST',
'MM_LIRC_KERNEL_MODULE_LIST', 'MM_PLUGIN_KERNEL_MODULE_LIST',
'MM_WIIMOTE_KERNEL_MODULE_LIST', 'MM_X_KERNEL_MODULE_LIST'],
value_default => '',
extra => sub
{
@@ -24,7 +24,7 @@
my @kernel_modules = split(/ +/, $minimyth->var_get($name));
- foreach my $delta_name ('CPU', 'LCDPROC', 'LIRC', 'PLUGIN', 'X')
+ foreach my $delta_name
('CPU', 'LCDPROC', 'LIRC', 'PLUGIN', 'WIIMOTE', 'X')
{
my $delta_kernel_modules = $minimyth->var_get('MM_' .
$delta_name . '_KERNEL_MODULE_LIST');
if ($delta_kernel_modules)
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LCDPROC.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LCDPROC.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LCDPROC.pm
Thu Jun 11 21:31:51 2009
@@ -150,7 +150,7 @@
};
$var_list{'MM_LCDPROC_KERNEL_MODULE_LIST'} =
{
- prerequisite =>
['MM_LCDPROC_KERNEL_MODULE', 'MM_LCDPROC_KERNEL_MODULE_OPTIONS'],
+ prerequisite =>
['MM_LCDPROC_DRIVER', 'MM_LCDPROC_KERNEL_MODULE',
'MM_LCDPROC_KERNEL_MODULE_OPTIONS'],
value_clean => sub
{
my $minimyth = shift;
@@ -167,7 +167,18 @@
my $minimyth = shift;
my $name = shift;
- return $minimyth->var_get('MM_LCDPROC_KERNEL_MODULE');
+ my @kernel_modules = ();
+
+ if ($minimyth->var_get('MM_LCDPROC_KERNEL_MODULE'))
+ {
+ push(@kernel_modules,
$minimyth->var_get('MM_LCDPROC_KERNEL_MODULE'));
+ }
+ if ($minimyth->var_get('MM_LCDPROC_DRIVER') eq 'g15')
+ {
+ push(@kernel_modules, 'uinput');
+ }
+
+ return join(' ', @kernel_modules);
},
extra => sub
{
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_WIIMOTE.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_WIIMOTE.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_WIIMOTE.pm
Thu Jun 11 21:31:51 2009
@@ -54,5 +54,34 @@
return join(' ', @device_list);
}
};
+$var_list{'MM_WIIMOTE_KERNEL_MODULE_LIST'} =
+{
+ prerequisite => ['MM_WIIMOTE_EVENT_DEVICE_LIST'],
+ value_clean => sub
+ {
+ my $minimyth = shift;
+ my $name = shift;
+
+ $minimyth->var_set($name, 'auto');
+
+ return 1;
+ },
+ value_default => 'auto',
+ value_valid => 'auto',
+ value_auto => sub
+ {
+ my $minimyth = shift;
+ my $name = shift;
+
+ my @kernel_modules = ();
+
+ if ($minimyth->var_get('MM_WIIMOTE_EVENT_DEVICE_LIST'))
+ {
+ push(@kernel_modules, 'uinput');
+ }
+
+ return join(' ', @kernel_modules);
+ }
+};
1;
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/g15daemon.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/g15daemon.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/g15daemon.pm
Thu Jun 11 21:31:51 2009
@@ -18,12 +18,6 @@
if ($minimyth->var_get('MM_LCDPROC_DRIVER') eq 'g15')
{
$minimyth->message_output('info', "starting G15daemon ...");
- my $kernel_module = 'uinput';
- if (system(qq(/sbin/modprobe $kernel_module > $devnull 2>&1)) != 0)
- {
- $minimyth->message_output('err', "failed to load kernel
module: $kernel_module");
- return 0;
- }
# The g15daemon daemon does not create it configuration file, so
init
# creates it when it does not exist.
if (! -e '/etc/g15daemon.conf')
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/wiimote.pm
Thu Jun 11 21:31:51 2009
@@ -59,20 +59,6 @@
$minimyth->message_output('info', "starting wminput ...");
- # Load uinput driver as needed.
- if (! -e q(/dev/uinput))
- {
- if (system(qq(/sbin/modprobe uinput > $devnull 2>&1)) != 0)
- {
- $minimyth->message_output('err', "failed to load kernel
module: uinput");
- return 0;
- }
- while (! -e q(/dev/uinput))
- {
- sleep 1;
- }
- }
-
if ($address_0)
{
my $config = undef;
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
