Author: pebender
Date: Tue Dec 2 04:31:19 2008
New Revision: 4041
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_LIRC
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lirc.rules.disabled
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Modified lirc device detection so that different build-in lircd.conf files
can be used for different devices, enabling better support for devices
that use the devinput driver.
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 Tue Dec 2
04:31:19 2008
@@ -31,6 +31,9 @@
application.
- Shortened the names of the files in the /etc/lirc.d/drivers.conf
and
/etc/lirc.d/lircd.conf directories.
+ - Modified lirc device detection so that different build-in lircd.conf
files
+ can be used for different devices, enabling better support for
devices
+ that use the devinput driver.
- Modified the default /etc/X11/xorg.conf file so that it does not auto
add devices.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_LIRC
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_LIRC
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_LIRC
Tue Dec 2 04:31:19 2008
@@ -135,7 +135,7 @@
MM_LIRC_DEVICE_LIST=
if /usr/bin/test ! "${MM_LIRC_DRIVER}" = "irtrans" ; then
if /usr/bin/test -n "${MM_LIRC_DEVICE}" && /usr/bin/test
-n "${MM_LIRC_DRIVER}" ; then
- MM_LIRC_DEVICE_LIST="${MM_LIRC_DEVICE_LIST}
${MM_LIRC_DEVICE},${MM_LIRC_DRIVER}"
+ MM_LIRC_DEVICE_LIST="${MM_LIRC_DEVICE_LIST}
${MM_LIRC_DEVICE},${MM_LIRC_DRIVER},"
fi
if /usr/bin/test "${MM_LIRC_AUTO_ENABLED}" = "yes" ; then
MM_LIRC_DEVICE_LIST="${MM_LIRC_DEVICE_LIST}
`mm_detect_state_get 'lirc' | mm_uniq`"
@@ -143,14 +143,19 @@
fi
# Convert device symlinks to device names.
+ # Convert lircd_conf files.
device_list=
for device_item in ${MM_LIRC_DEVICE_LIST} ; do
device=`/bin/echo "${device_item}" | /usr/bin/cut -d ',' -f 1`
driver=`/bin/echo "${device_item}" | /usr/bin/cut -d ',' -f 2`
+ lircd_conf=`/bin/echo "${device_item}" | /usr/bin/cut -d ',' -f 3`
if /usr/bin/test -e "${device}" ; then
device=`/sbin/udevadm info --query name --root
--name="${device}" 2> /dev/null`
fi
- device_list="${device_list} ${device},${driver}"
+ if /usr/bin/test -z "${lircd_conf}" ||
/usr/bin/test "${MM_LIRC_FETCH_LIRCD_CONF}" = 'yes' ; then
+ lircd_conf='/etc/lircd.conf'
+ fi
+ device_list="${device_list} ${device},${driver},${lircd_conf}"
done
MM_LIRC_DEVICE_LIST="${device_list}"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
Tue Dec 2 04:31:19 2008
@@ -145,8 +145,10 @@
if /usr/bin/test ! -e /etc/lircd.conf ; then
/bin/rm -rf /tmp/lircd.conf.$$
/bin/touch /tmp/lircd.conf.$$
- for file in `/bin/ls /etc/lirc.d/lircd.conf/* 2> /dev/null` ; do
- /bin/echo "include <${file}>" >> /tmp/lircd.conf.$$
+ for file in `/bin/ls -d /etc/lirc.d/lircd.conf/* 2> /dev/null` ; do
+ if /usr/bin/test -f "${file}" ; then
+ /bin/echo "include <${file}>" >> /tmp/lircd.conf.$$
+ fi
done
/bin/echo "# autogenerated" >> /etc/lircd.conf
/bin/cat /tmp/lircd.conf.$$ | /usr/bin/sort >> /etc/lircd.conf
@@ -196,6 +198,7 @@
for device_item in ${MM_LIRC_DEVICE_LIST} ; do
device=`/bin/echo ${device_item} | /usr/bin/cut -d ',' -f1`
driver=`/bin/echo ${device_item} | /usr/bin/cut -d ',' -f2`
+ lircd_conf=`/bin/echo ${device_item} | /usr/bin/cut -d ',' -f3`
# Convert driver to the the lirc daemon appropriate driver.
if /usr/bin/test -n "${driver}" ; then
@@ -213,12 +216,13 @@
daemon="${daemon} --device=${device} --driver=${driver}"
daemon="${daemon} --output=/dev/lircd-${instance}
--pidfile=/var/run/lircd-${instance}.pid"
daemon="${daemon} --listen=$((8765 + ${index} - 1))"
+ daemon="${daemon} ${lircd_conf}"
else
daemon="/usr/sbin/lircd"
daemon="${daemon} --device=${device} --driver=${driver}"
daemon="${daemon} --output=/dev/lircd
--pidfile=/var/run/lircd.pid"
+ daemon="${daemon} ${lircd_conf}"
/bin/ln -s lircd /dev/lircd-${instance}
-
fi
/usr/bin/logger -t minimyth -p "local0.info" "started '${daemon}'."
${daemon}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
Tue Dec 2 04:31:19 2008
@@ -169,7 +169,7 @@
};
$var_list{'MM_LIRC_DEVICE_LIST'} =
{
- prerequisite =>
['MM_LIRC_AUTO_ENABLED', 'MM_LIRC_DEVICE_BLACKLIST', 'MM_LIRC_DRIVER'],
+ prerequisite =>
['MM_LIRC_AUTO_ENABLED', 'MM_LIRC_DEVICE_BLACKLIST', 'MM_LIRC_DRIVER',
'MM_LIRC_FETCH_LIRCD_CONF'],
value_default => 'auto',
value_valid => 'auto|.+',
value_auto => sub
@@ -204,21 +204,27 @@
# so no LIRC device list is created.
if ($minimyth->var_get('MM_LIRC_DRIVER') ne 'irtrans')
{
- my $device =
&{$device_canonicalize}($minimyth->var_get('MM_LIRC_DEVICE'));
- my $driver = $minimyth->var_get('MM_LIRC_DRIVER');
+ my $device =
&{$device_canonicalize}($minimyth->var_get('MM_LIRC_DEVICE'));
+ my $driver = $minimyth->var_get('MM_LIRC_DRIVER');
+ my $lircd_conf = q(/etc/lircd.conf);
if (($device) && ($driver))
{
- push(@device_list, "$device,$driver");
+ push(@device_list, "$device,$driver,");
}
if ($minimyth->var_get('MM_LIRC_AUTO_ENABLED') eq 'yes')
{
foreach my $item (@{$minimyth->detect_state_get('lirc')})
{
- my $device =
&{$device_canonicalize}($item->{'device'});
- my $driver = $item->{'driver'};
+ my $device =
&{$device_canonicalize}($item->{'device'});
+ my $driver = $item->{'driver'};
+ my $lircd_conf = $item->{'lircd_conf'};
+ if ((! $lircd_conf) ||
($minimyth->var_get('MM_LIRC_FETCH_LIRCD_CONF') eq 'yes'))
+ {
+ $lircd_conf = q(/etc/lircd.conf);
+ }
if (($device) && ($driver))
{
- push(@device_list, "$device,$driver");
+ push(@device_list, "$device,$driver,$lircd_conf");
}
}
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
Tue Dec 2 04:31:19 2008
@@ -283,8 +283,9 @@
foreach my $device_item (@device_list)
{
my @device_args = split(/,/, $device_item);
- my $device = $device_args[0];
- my $driver = $device_args[1];
+ my $device = $device_args[0];
+ my $driver = $device_args[1];
+ my $lircd_conf = $device_args[2];
# Convert driver to the the lirc daemon appropriate driver.
if (($driver) && (open(FILE, '-|', '/usr/sbin/lircd --driver=help
2>&1')))
@@ -320,12 +321,14 @@
$daemon = $daemon . " --device=$device --driver=$driver";
$daemon = $daemon . " --output=/dev/lircd-$instance
--pidfile=/var/run/lircd-$instance.pid";
$daemon = $daemon . " --listen=$port";
+ $daemon = $daemon . " $lircd_conf";
}
else
{
$daemon = '/usr/sbin/lircd';
$daemon = $daemon . " --device=$device --driver=$driver";
$daemon = $daemon . ' --output=/dev/lircd
--pidfile=/var/run/lircd.pid';
+ $daemon = $daemon . " $lircd_conf";
symlink('/dev/lircd', "/dev/lircd-$instance");
}
$minimyth->message_log('info', "started '$daemon'.");
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lirc.rules.disabled
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lirc.rules.disabled
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lirc.rules.disabled
Tue Dec 2 04:31:19 2008
@@ -29,7 +29,7 @@
SUBSYSTEM!="lirc", GOTO="end-lirc"
-ENV{mm_detect_state_lirc}="default"
+ENV{mm_detect_state_lirc}="default,"
LABEL="end-lirc"
@@ -44,8 +44,8 @@
#-------------------------------------------------------------------------------
# non-lirc device list
#-------------------------------------------------------------------------------
- ENV{mm_detect_id}=="usb:0fe9:9010", ENV{mm_detect_state_lirc}="dvico"
- ENV{mm_detect_id}=="usb:147a:e02d", ENV{mm_detect_state_lirc}="devinput"
+ ENV{mm_detect_id}=="usb:0fe9:9010", ENV{mm_detect_state_lirc}="dvico,"
+ ENV{mm_detect_id}=="usb:147a:e02d", ENV{mm_detect_state_lirc}="devinput,"
LABEL="end-nonlirc"
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums (original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums Tue Dec 2
04:31:19 2008
@@ -1 +1 @@
-db49b87acce519ae619b1c76f7c281f1 download/MiniMyth.pm
+39571c3ccce2d40248702890930d72c2 download/MiniMyth.pm
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
(original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm Tue Dec
2 04:31:19 2008
@@ -406,7 +406,7 @@
$map{'audio'} = [ 'card_number' , 'device_number' ];
$map{'backend'} = [ 'enabled'];
$map{'lcdproc'} = [ 'device' , 'driver'];
- $map{'lirc'} = [ 'device' , 'driver'];
+ $map{'lirc'} = [ 'device' , 'driver', 'lircd_conf' ];
$map{'x'} = [ 'driver' ];
my @state;
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
