Author: pebender
Date: Mon Jul 13 11:54:41 2009
New Revision: 5155
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/driver.conf.d/
- copied from r5111,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf/
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/
- copied from r5111,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf/
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/
- copied from r5111,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc/
Removed:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/driver.conf.d/mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircd.conf.d/mceusb2.mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mplayer/remote.mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/mythtv/remote.mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc/lircrc.d/xine/remote.mceusb2
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-configure.html
trunk/gar-minimyth/html/minimyth/document-hardware.html
trunk/gar-minimyth/html/minimyth/document-howto-lirc_devinput.html
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/lib/udev/rules.d/05-minimyth-detect-lirc.rules.disabled
trunk/gar-minimyth/script/minimyth.conf.mk
Log:
- Moved /etc/lirc.d/driver.conf, /etc/lirc.d/lircd.conf and
/etc/lirc.d/lircrc to /etc/lirc/driver.conf.d, /etc/lirc/lircd.conf.d and
/etc/lirc/lircrc.d respectively.
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:54:41 2009
@@ -15,6 +15,9 @@
- 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.
+ - Moved /etc/lirc.d/driver.conf, /etc/lirc.d/lircd.conf and
+ /etc/lirc.d/lircrc to /etc/lirc/driver.conf.d,
/etc/lirc/lircd.conf.d and
+ /etc/lirc/lircrc.d respectively.
Fixed bugs
- Fixed a bug in the generation of the minimyth.conf.mk included in the
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:54:41 2009
@@ -647,7 +647,7 @@
<dd>
<p>
The LIRC configuration file for minimyth.
- 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).
+ MiniMyth will use this file as the minimyth section
of '/etc/lirc/lircrc' file (the '/etc/lirc/lircrc.d/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/lirc/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/lircrc.d/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/lirc/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/lircrc.d/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/lirc/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/lircrc.d/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/lirc/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/lircrc.d/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>
Modified: trunk/gar-minimyth/html/minimyth/document-hardware.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-hardware.html (original)
+++ trunk/gar-minimyth/html/minimyth/document-hardware.html Mon Jul 13
11:54:41 2009
@@ -364,7 +364,7 @@
<a href="http://www.xinehq.de/";>Xine</a>
commands.
MiniMyth does not contain 'lircd.conf' and 'lircrc'
configuration files for most remote control receivers and remote controls.
- However, MiniMyth does contain a generic 'lircrc'
configuration file ('/etc/lirc.d/lircrc')
+ However, MiniMyth does contain a generic 'lircrc'
configuration file ('/etc/lirc/lircrc.d')
that should work (though not optimally) with any 'lircd.conf'
configuration file
that uses the
<a
href="http://arnaud.quette.free.fr/lirc/lirc-nns.html";>proposed LIRC name
space</a>.
@@ -436,7 +436,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2009-07-02
+ 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:54:41 2009
@@ -171,7 +171,7 @@
<p>
In order to accomplish step (2), you will need to create a
custom 'lircd.conf' file for your remote control.
First, get a copy of the 'lircd.conf' file with the standard
keyboard map.
- The '/etc/lirc.d/lircd.conf/devinput' file on your MiniMyth
system contains the standard keyboard map.
+ The '/etc/lirc/lircd.conf.d/devinput' file on your MiniMyth
system contains the standard keyboard map.
You can download this file from your MiniMyth system using the
<a href="document-use.html#access-http">HTTP access</a>
to the MiniMyth system.
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:54:41 2009
@@ -62,7 +62,7 @@
my $driver = $minimyth->var_get('MM_LIRC_DRIVER');
if ($driver)
{
- my $driver_file = "/etc/lirc.d/driver.conf/$driver";
+ my $driver_file = "/etc/lirc/driver.conf.d/$driver";
if ((-r $driver_file) && (open(FILE, '<', $driver_file)))
{
while (<FILE>)
@@ -106,7 +106,7 @@
my $driver = $minimyth->var_get('MM_LIRC_DRIVER');
if ($driver)
{
- my $driver_file = "/etc/lirc.d/driver.conf/$driver";
+ my $driver_file = "/etc/lirc/driver.conf.d/$driver";
if ((-r $driver_file) && (open(FILE, '<', $driver_file)))
{
while (<FILE>)
@@ -136,7 +136,7 @@
my $driver = $minimyth->var_get('MM_LIRC_DRIVER');
if ($driver)
{
- my $driver_file = "/etc/lirc.d/driver.conf/$driver";
+ my $driver_file = "/etc/lirc/driver.conf.d/$driver";
if ((-r $driver_file) && (open(FILE, '<', $driver_file)))
{
while (<FILE>)
@@ -314,7 +314,7 @@
# If there is no lircd.conf file, then create it.
if (! -e '/etc/lirc/lircd.conf')
{
- my $lircd_conf_path = q(/etc/lirc.d/lircd.conf);
+ my $lircd_conf_path = q(/etc/lirc/lircd.conf.d);
my @lircd_conf_list = ();
if (opendir(DIR, $lircd_conf_path))
{
@@ -373,7 +373,7 @@
# If there is no lircrc file, then create it.
if (! -e '/etc/lirc/lircrc')
{
- my $lircrc_path = q(/etc/lirc.d/lircrc);
+ my $lircrc_path = q(/etc/lirc/lircrc.d);
# Create a list of lircrc applications.
my @application_path_list = ();
if (opendir(DIR, $lircrc_path))
@@ -455,7 +455,7 @@
value_valid => 'no|yes',
value_file => 'yes',
file => {name_remote => '/lircrc.minimyth',
- name_local => '/etc/lirc.d/lircrc/minimyth'}
+ name_local => '/etc/lirc/lircrc.d/minimyth'}
};
$var_list{'MM_LIRC_FETCH_LIRCRC_MYTHTV'} =
{
@@ -463,7 +463,7 @@
value_valid => 'no|yes',
value_file => 'yes',
file => {name_remote => '/lircrc.mythtv',
- name_local => '/etc/lirc.d/lircrc/mythtv'}
+ name_local => '/etc/lirc/lircrc.d/mythtv'}
};
$var_list{'MM_LIRC_FETCH_LIRCRC_MPLAYER'} =
{
@@ -471,7 +471,7 @@
value_valid => 'no|yes',
value_file => 'yes',
file => {name_remote => '/lircrc.mplayer',
- name_local => '/etc/lirc.d/lircrc/mplayer'}
+ name_local => '/etc/lirc/lircrc.d/mplayer'}
};
$var_list{'MM_LIRC_FETCH_LIRCRC_VLC'} =
{
@@ -479,7 +479,7 @@
value_valid => 'no|yes',
value_file => 'yes',
file => {name_remote => '/lircrc.vlc',
- name_local => '/etc/lirc.d/lircrc/vlc'}
+ name_local => '/etc/lirc/lircrc.d/vlc'}
};
$var_list{'MM_LIRC_FETCH_LIRCRC_XINE'} =
{
@@ -487,7 +487,7 @@
value_valid => 'no|yes',
value_file => 'yes',
file => {name_remote => '/lircrc.xine',
- name_local => '/etc/lirc.d/lircrc/xine'}
+ name_local => '/etc/lirc/lircrc.d/xine'}
};
$var_list{'MM_LIRC_DEVICE_LIST'} =
{
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-lirc.rules.disabled
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-lirc.rules.disabled
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-lirc.rules.disabled
Mon Jul 13 11:54:41 2009
@@ -44,9 +44,9 @@
#-------------------------------------------------------------------------------
# non-lirc device list
#-------------------------------------------------------------------------------
- ENV{mm_detect_id}=="usb:0776:0204",
ENV{mm_detect_state_lirc}="devinput,/etc/lirc.d/lircd.conf/optional/devinput.usb_0776_0204"
+ ENV{mm_detect_id}=="usb:0776:0204",
ENV{mm_detect_state_lirc}="devinput,/etc/lirc/lircd.conf.d/optional/devinput.usb_0776_0204"
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,/etc/lirc.d/lircd.conf/optional/devinput.usb_147a_e02d"
+ ENV{mm_detect_id}=="usb:147a:e02d",
ENV{mm_detect_state_lirc}="devinput,/etc/lirc/lircd.conf.d/optional/devinput.usb_147a_e02d"
LABEL="end-nonlirc"
Modified: trunk/gar-minimyth/script/minimyth.conf.mk
==============================================================================
--- trunk/gar-minimyth/script/minimyth.conf.mk (original)
+++ trunk/gar-minimyth/script/minimyth.conf.mk Mon Jul 13 11:54:41 2009
@@ -18,7 +18,7 @@
)
# Configuration file (minimyth.conf) version.
-mm_CONF_VERSION ?= 46
+mm_CONF_VERSION ?= 47
#-------------------------------------------------------------------------------
# Variables that you are likely to be override based on your environment.
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
