Author: pebender
Date: Mon Jul 13 11:29:10 2009
New Revision: 5154
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-configure.html
trunk/gar-minimyth/html/minimyth/document-howto-lirc_devinput.html
trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/26irxevent
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/28irxkeys
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
Log:
- Moved /etc/lircd.conf, /etc/lircmd.conf and /etc/lircrc to
/etc/lirc/lircd.conf, /etc/lirc/lircmd.conf and /etc/lirc/lircrc
respectively in order to match LIRC's new default locations.
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 Mon Jul 13
11:29:10 2009
@@ -11,6 +11,11 @@
patch glvdpau20744.
MythTV trunk: version trunk.20842 trunk svn 20842.
+Modified LIRC
+ - Moved /etc/lircd.conf, /etc/lircmd.conf and /etc/lircrc to
+ /etc/lirc/lircd.conf, /etc/lirc/lircmd.conf and /etc/lirc/lircrc
+ respectively in order to match LIRC's new default locations.
+
Fixed bugs
- Fixed a bug in the generation of the minimyth.conf.mk included in the
image.
Modified: trunk/gar-minimyth/html/minimyth/document-configure.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-configure.html (original)
+++ trunk/gar-minimyth/html/minimyth/document-configure.html Mon Jul 13
11:29:10 2009
@@ -620,7 +620,7 @@
<dd>
<p>
The LIRC daemon ('lircd') configuration file.
- MiniMyth will use this file as the '/etc/lircd.conf' file
in the MiniMyth file system.
+ MiniMyth will use this file as the '/etc/lirc/lircd.conf'
file in the MiniMyth file system.
Whether or not 'lircd.conf' is retrieved depends on
'<a
href="document-minimyth_conf.html#MM_LIRC_FETCH_LIRCD_CONF">MM_LIRC_FETCH_LIRCD_CONF</a>'.
</p>
@@ -629,7 +629,7 @@
<dd>
<p>
The LIRC mouse daemon ('lircmd') configuration file.
- MiniMyth will use this file as the '/etc/lircmd.conf' file
in the MiniMyth file system.
+ MiniMyth will use this file as the '/etc/lirc/lircmd.conf'
file in the MiniMyth file system.
Whether or not 'lircmd.conf' is retrieved depends on
'<a
href="document-minimyth_conf.html#MM_LIRC_FETCH_LIRCMD_CONF">MM_LIRC_FETCH_LIRCMD_CONF</a>'.
</p>
@@ -638,7 +638,7 @@
<dd>
<p>
The LIRC configuration file.
- MiniMyth will use this file as the '/etc/lircrc' file in
the MiniMyth file system.
+ MiniMyth will use this file as the '/etc/lirc/lircrc' file
in the MiniMyth file system.
Whether or not 'lircrc' is retrieved depends on
'<a
href="document-minimyth_conf.html#MM_LIRC_FETCH_LIRCRC">MM_LIRC_FETCH_LIRCRC</a>'.
</p>
@@ -647,7 +647,7 @@
<dd>
<p>
The LIRC configuration file for minimyth.
- MiniMyth will use this file as the minimyth section
of '/etc/lircrc' file (the '/etc/lirc.d/lircrc/minimyth' in the MiniMyth
file system).
+ MiniMyth will use this file as the minimyth section
of '/etc/lirc/lircrc' file (the '/etc/lirc.d/lircrc/minimyth' in the
MiniMyth file system).
Whether or not 'lircrc.mplayer' is retrieved depends on
'<a
href="document-minimyth_conf.html#MM_LIRC_FETCH_LIRCRC_MINIMYTH">MM_LIRC_FETCH_LIRCRC_MINIMYTH</a>'.
</p>
@@ -656,7 +656,7 @@
<dd>
<p>
The LIRC configuration file for mythtv.
- MiniMyth will use this file as the mythtv section
of '/etc/lircrc' file (the '/etc/lirc.d/lircrc/mythtv' in the MiniMyth file
system).
+ MiniMyth will use this file as the mythtv section
of '/etc/lirc/lircrc' file (the '/etc/lirc.d/lircrc/mythtv' in the MiniMyth
file system).
Whether or not 'lircrc.mythtv' is retrieved depends on
'<a
href="document-minimyth_conf.html#MM_LIRC_FETCH_LIRCRC_MYTHTV">MM_LIRC_FETCH_LIRCRC_MYTHTV</a>'.
</p>
@@ -665,7 +665,7 @@
<dd>
<p>
The LIRC configuration file for mplayer.
- MiniMyth will use this file as the mplayer section
of '/etc/lircrc' file (the '/etc/lirc.d/lircrc/mplayer' in the MiniMyth
file system).
+ MiniMyth will use this file as the mplayer section
of '/etc/lirc/lircrc' file (the '/etc/lirc.d/lircrc/mplayer' in the
MiniMyth file system).
Whether or not 'lircrc.mplayer' is retrieved depends on
'<a
href="document-minimyth_conf.html#MM_LIRC_FETCH_LIRCRC_MPLAYER">MM_LIRC_FETCH_LIRCRC_MPLAYER</a>'.
</p>
@@ -674,7 +674,7 @@
<dd>
<p>
The LIRC configuration file for vlc.
- MiniMyth will use this file as the vlc section
of '/etc/lircrc' file (the '/etc/lirc.d/lircrc/vlc' in the MiniMyth file
system).
+ MiniMyth will use this file as the vlc section
of '/etc/lirc/lircrc' file (the '/etc/lirc.d/lircrc/vlc' in the MiniMyth
file system).
Whether or not 'lircrc.vlc' is retrieved depends on
'<a
href="document-minimyth_conf.html#MM_LIRC_FETCH_LIRCRC_VLC">MM_LIRC_FETCH_LIRCRC_VLC</a>'.
</p>
@@ -683,7 +683,7 @@
<dd>
<p>
The LIRC configuration file for xine.
- MiniMyth will use this file as the xine section
of '/etc/lircrc' file (the '/etc/lirc.d/lircrc/xine' in the MiniMyth file
system).
+ MiniMyth will use this file as the xine section
of '/etc/lirc/lircrc' file (the '/etc/lirc.d/lircrc/xine' in the MiniMyth
file system).
Whether or not 'lircrc.xine' is retrieved depends on
'<a
href="document-minimyth_conf.html#MM_LIRC_FETCH_LIRCRC_XINE">MM_LIRC_FETCH_LIRCRC_XINE</a>'.
</p>
@@ -784,7 +784,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2009-06-23
+ Last Updated on 2009-07-13
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified: trunk/gar-minimyth/html/minimyth/document-howto-lirc_devinput.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-howto-lirc_devinput.html
(original)
+++ trunk/gar-minimyth/html/minimyth/document-howto-lirc_devinput.html Mon
Jul 13 11:29:10 2009
@@ -195,7 +195,7 @@
then you will need to create a custom 'lircrc' file.
The reason is that the MiniMyth built-in 'lircrc' files expect
one key name per key press,
and there is no way to use 'lircd.conf' to map multiple key
names to a single key name.
- The '/etc/lircrc' file on your MiniMyth system contains a list
of file names that are the MiniMyth built-in 'lircrc' files.
+ The '/etc/lirc/lircrc' file on your MiniMyth system contains a
list of file names that are the MiniMyth built-in 'lircrc' files.
You can download these files from your MiniMyth system using
the
<a href="document-use.html#access-http">HTTP access</a>
to the MiniMyth system.
@@ -264,7 +264,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2009-04-17
+ Last Updated on 2009-07-13
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified: trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile
==============================================================================
--- trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile
(original)
+++ trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile Mon Jul
13 11:29:10 2009
@@ -256,10 +256,10 @@
$...@~/srv/www/software/build/licenses
@# Make user 'minimyth' configuration links.
@mkdir -m 0755 -p $...@~/home/minimyth
- @ln -sf $(patsubst /%,%,$(call
DIRSTODOTS,/home/minimyth))$(sysconfdir)/lircrc \
+ @ln -sf $(patsubst /%,%,$(call
DIRSTODOTS,/home/minimyth))$(sysconfdir)/lirc/lircrc \
$...@~/home/minimyth/.lircrc
@mkdir -m 0755 -p $...@~/home/minimyth/.mythtv
- @ln -sf $(patsubst /%,%,$(call
DIRSTODOTS,/home/minimyth/.mythtv))$(sysconfdir)/lircrc \
+ @ln -sf $(patsubst /%,%,$(call
DIRSTODOTS,/home/minimyth/.mythtv))$(sysconfdir)/lirc/lircrc \
$...@~/home/minimyth/.mythtv/lircrc
@# Make perl init script links.
@mkdir -m 0775 -p $...@~$(sysconfdir)/rc.d/rc
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/26irxevent
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/26irxevent
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/26irxevent
Mon Jul 13 11:29:10 2009
@@ -5,5 +5,5 @@
################################################################################
if /usr/bin/test "${MM_LIRC_IRXEVENT_ENABLED}" = "yes" ; then
- /usr/bin/irxevent /etc/lircrc &
+ /usr/bin/irxevent /etc/lirc/lircrc &
fi
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/28irxkeys
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/28irxkeys
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/28irxkeys
Mon Jul 13 11:29:10 2009
@@ -5,5 +5,5 @@
################################################################################
if /usr/bin/test "${MM_LIRC_IRXKEYS_ENABLED}" = "yes" ; then
- /usr/bin/irxkeys -d 10 -c /etc/lircrc &
+ /usr/bin/irxkeys -d 10 -c /etc/lirc/lircrc &
fi
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
Mon Jul 13 11:29:10 2009
@@ -6,6 +6,8 @@
use strict;
use warnings;
+use File::Path ();
+
my %var_list;
sub var_list
@@ -158,12 +160,12 @@
{
my $value = 'no';
- if ((-e '/usr/bin/irxevent') && (-e '/etc/lircrc'))
+ if ((-e '/usr/bin/irxevent') && (-e '/etc/lirc/lircrc'))
{
# Only one level of includes is supported.
my @lircrc_list = ();
- push(@lircrc_list, '/etc/lircrc');
- if (open(FILE, '<', '/etc/lircrc'))
+ push(@lircrc_list, '/etc/lirc/lircrc');
+ if (open(FILE, '<', '/etc/lirc/lircrc'))
{
foreach (grep(s/^include +(.*)$/$1/, (<FILE>)))
{
@@ -204,12 +206,12 @@
{
my $value = 'no';
- if ((-e '/usr/bin/irxevent') && (-e '/etc/lircrc'))
+ if ((-e '/usr/bin/irxevent') && (-e '/etc/lirc/lircrc'))
{
# Only one level of includes is supported.
my @lircrc_list = ();
- push(@lircrc_list, '/etc/lircrc');
- if (open(FILE, '<', '/etc/lircrc'))
+ push(@lircrc_list, '/etc/lirc/lircrc');
+ if (open(FILE, '<', '/etc/lirc/lircrc'))
{
foreach (grep(s/^include +(.*)$/$1/, (<FILE>)))
{
@@ -250,12 +252,12 @@
{
my $value = 'no';
- if ((-e '/usr/bin/irxkeys') && (-e '/etc/lircrc'))
+ if ((-e '/usr/bin/irxkeys') && (-e '/etc/lirc/lircrc'))
{
# Only one level of includes is supported.
my @lircrc_list = ();
- push(@lircrc_list, '/etc/lircrc');
- if (open(FILE, '<', '/etc/lircrc'))
+ push(@lircrc_list, '/etc/lirc/lircrc');
+ if (open(FILE, '<', '/etc/lirc/lircrc'))
{
foreach (grep(s/^include +(.*)$/$1/, (<FILE>)))
{
@@ -303,14 +305,14 @@
value_valid => 'no|yes',
value_file => 'yes',
file => {name_remote => '/lircd.conf',
- name_local => '/etc/lircd.conf'},
+ name_local => '/etc/lirc/lircd.conf'},
extra => sub
{
my $minimyth = shift;
my $name = shift;
# If there is no lircd.conf file, then create it.
- if (! -e '/etc/lircd.conf')
+ if (! -e '/etc/lirc/lircd.conf')
{
my $lircd_conf_path = q(/etc/lirc.d/lircd.conf);
my @lircd_conf_list = ();
@@ -322,8 +324,10 @@
}
closedir(DIR);
}
- if (open(FILE, '>', q(/etc/lircd.conf)))
+ File::Path::mkpath('/etc/lirc', { mode => 0755 });
+ if (open(FILE, '>', q(/etc/lirc/lircd.conf)))
{
+ chmod(0644, '/etc/lirc/lircd.conf');
print FILE qq(# autogenerated\n);
foreach (sort @lircd_conf_list)
{
@@ -341,7 +345,7 @@
value_valid => 'no|yes',
value_file => 'yes',
file => {name_remote => '/lircmd.conf',
- name_local => '/etc/lircmd.conf'}
+ name_local => '/etc/lirc/lircmd.conf'}
};
$var_list{'MM_LIRC_FETCH_LIRCRC'} =
{
@@ -360,14 +364,14 @@
value_valid => 'no|yes',
value_file => 'yes',
file => {name_remote => '/lircrc',
- name_local => '/etc/lircrc'},
+ name_local => '/etc/lirc/lircrc'},
extra => sub
{
my $minimyth = shift;
my $name = shift;
# If there is no lircrc file, then create it.
- if (! -e '/etc/lircrc')
+ if (! -e '/etc/lirc/lircrc')
{
my $lircrc_path = q(/etc/lirc.d/lircrc);
# Create a list of lircrc applications.
@@ -429,8 +433,10 @@
}
}
}
- if (open(FILE, '>', q(/etc/lircrc)))
+ File::Path::mkpath('/etc/lirc', { mode => 0755 });
+ if (open(FILE, '>', q(/etc/lirc/lircrc)))
{
+ chmod(0644, '/etc/lirc/lircrc');
print FILE qq(# autogenerated\n);
foreach (sort @lircrc_list)
{
@@ -504,7 +510,7 @@
{
my $device =
$minimyth->device_canonicalize($minimyth->var_get('MM_LIRC_DEVICE'));
my $driver = $minimyth->var_get('MM_LIRC_DRIVER');
- my $lircd_conf = q(/etc/lircd.conf);
+ my $lircd_conf = q(/etc/lirc/lircd.conf);
if (($device) && ($driver))
{
push(@device_list, "$device,$driver,$lircd_conf");
@@ -518,7 +524,7 @@
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);
+ $lircd_conf = q(/etc/lirc/lircd.conf);
}
if (($device) && ($driver))
{
@@ -614,6 +620,7 @@
my $modprobe_file = "/etc/modprobe.d/init::conf::MM_LIRC.conf";
if ((open(FILE, '>', $modprobe_file)))
{
+ chmod(0644, "$modprobe_file");
print FILE "# autogenerated by init::conf::MM_LIRC\n";
print FILE "options $kernel_module
$kernel_module_options\n";
}
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
Mon Jul 13 11:29:10 2009
@@ -246,13 +246,13 @@
# Start the irexec daemon.
if ($minimyth->var_get('MM_LIRC_IREXEC_ENABLED') eq 'yes')
{
- system(qq(/usr/bin/irexec -d /etc/lircrc));
+ system(qq(/usr/bin/irexec -d /etc/lirc/lircrc));
}
# Start the lircmd daemon.
- if (-e '/etc/lircmd.conf')
+ if (-e '/etc/lirc/lircmd.conf')
{
- system(qq(/usr/sbin/lircmd --uinput /etc/lircmd.conf));
+ system(qq(/usr/sbin/lircmd --uinput /etc/lirc/lircmd.conf));
}
return 1;
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
