Author: pebender
Date: Thu Jan 15 11:13:07 2009
New Revision: 4249
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_EXTRAS
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_THEME
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_EXTRAS.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_THEME.pm
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Modified the default values of MM_EXTRAS_URL, MM_THEME_URL and
MM_THEMEOSD_URL so that it uses 'confro' rather than 'hunt' when the
root file system is not a squahsfs image.
- Modified the 'dist' url expansion to that it expands to empty when the
root file system is not a squashfs image.
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 Jan 15
11:13:07 2009
@@ -51,6 +51,11 @@
'minimyth'.
- Added support for loading coretemp kernel driver on more hardware.
- Added check for trailing '/' in MM_MINIMYTH_CONF_BOOT_URL.
+ - Modified the default values of MM_EXTRAS_URL, MM_THEME_URL and
+ MM_THEMEOSD_URL so that it uses 'confro' rather than 'hunt' when the
+ root file system is not a squahsfs image.
+ - Modified the 'dist' url expansion to that it expands to empty when
the
+ root file system is not a squashfs image.
Modified udev
- Renamed 06-minimyth-mythtv.rules to 07-minimyth-mythtv.rules.
Modified: trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
(original)
+++ trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Thu Jan
15
11:13:07 2009
@@ -1564,11 +1564,17 @@
then nothing will be mounted as '/usr/local'.
</p>
<p>
- If the value is 'auto',
+ If the value is 'auto' and the MiniMyth root file system
is a squashfs image,
then MiniMyth will assume that the extras directory is in
a squashfs image file
located in either the MiniMyth distribution directory or
the MiniMyth read-only configuration directory and
having the name 'extras.sfs'.
- That is, MiniMyth will assume
MM_EXTRAS_URL='hunt:extras.sfs'.
+ If the value is 'auto' and the MiniMyth root file system
is not a squashfs image,
+ then MiniMyth will assume that the extras directory is in
a squashfs image file
+ located in the MiniMyth read-only configuration directory
and
+ having the name 'extras.sfs'.
+ That is, if the value is 'auto', then MiniMyth
+ will assume MM_EXTRAS_URL='hunt:extras.sfs' when the
MiniMyth root file system is a squashfs image and
+ will assume MM_EXTRAS_URL='confro:extras.sfs' when the
MiniMyth root file system is not a squashfs image.
</p>
</dd>
</dl>
@@ -1796,12 +1802,21 @@
"${<a href="#MM_THEME_NAME">MM_THEME_NAME</a>}".
</p>
<p>
- If the value is 'auto',
+ If the value is 'auto' and the MiniMyth root file system
is a squashfs image,
then MiniMyth will assume that the MythTV theme directory
is in a squashfs image file
located in either the MiniMyth distribution directory or
the MiniMyth read-only configuration directory and
having the name "themes/${<a
href="#MM_THEME_NAME">MM_THEME_NAME</a>}.sfs".
- That is, MiniMyth will assume
+ If the value is 'auto' and the MiniMyth root file system
is not a squashfs image,
+ then MiniMyth will assume that the MythTV theme directory
is in a squashfs image file
+ located in the MiniMyth read-only configuration directory
and
+ having the name "themes/${<a
href="#MM_THEME_NAME">MM_THEME_NAME</a>}.sfs".
+ That is, if the value is 'auto', then MiniMyth
+ will assume
MM_THEME_URL="hunt:themes/${<a
href="#MM_THEME_NAME">MM_THEME_NAME</a>}.sfs".
+ when the MiniMyth root file system is a squashfs image and
+ will assume
+ MM_THEME_URL="confro:themes/${<a
href="#MM_THEME_NAME">MM_THEME_NAME</a>}.sfs".
+ when the MiniMyth root file system is not a squashfs image.
</p>
</dd>
<dt id="MM_THEMEOSD_URL"><strong>MM_THEMEOSD_URL</strong></dt>
@@ -1818,12 +1833,21 @@
"${<a href="#MM_THEMEOSD_NAME">MM_THEMEOSD_NAME</a>}".
</p>
<p>
- If the value is 'auto',
+ If the value is 'auto' and the MiniMyth root file system
is a squashfs image,
then MiniMyth will assume that the MythTV OSD theme
directory is in a squashfs image file
located in either the MiniMyth distribution directory or
the MiniMyth read-only configuration directory and
having the name "themes/${<a
href="#MM_THEMEOSD_NAME">MM_THEMEOSD_NAME</a>}.sfs".
- That is, MiniMyth will assume
+ If the value is 'auto' and the MiniMyth root file system
is not a squashfs image,
+ then MiniMyth will assume that the MythTV OSD theme
directory is in a squashfs image file
+ located in the MiniMyth read-only configuration directory
and
+ having the name "themes/${<a
href="#MM_THEMEOSD_NAME">MM_THEMEOSD_NAME</a>}.sfs".
+ That is, if the value is 'auto', then MiniMyth
+ will assume
MM_THEMEOSD_URL="hunt:themes/${<a
href="#MM_THEMEOSD_NAME">MM_THEMEOSD_NAME</a>}.sfs".
+ when the MiniMyth root file system is a squashfs image and
+ will assume
+ MM_THEMEOSD_URL="confro:themes/${<a
href="#MM_THEMEOSD_NAME">MM_THEMEOSD_NAME</a>}.sfs".
+ when the MiniMyth root file system is not a squashfs image.
</p>
</dd>
<dt
id="MM_THEMECACHE_URL"><strong>MM_THEMECACHE_URL</strong></dt>
@@ -2970,7 +2994,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2009-01-13
+ Last Updated on 2009-01-15
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
Thu Jan 15 11:13:07 2009
@@ -184,14 +184,16 @@
LOCAL_FILE=`/bin/echo "${LOCAL_FILE}" | /bin/sed -e 's%//*%/%g' |
/bin/sed -e 's%/$%%'`
REMOTE_FILE=`/bin/echo "${REMOTE_FILE}" | /bin/sed -e 's%//*%/%g' |
/bin/sed -e 's%/$%%'`
REMOTE_FILE=`/bin/echo "${REMOTE_FILE}" | /bin/sed -e 's%^/%%'`
- if /usr/bin/test -n "${MM_ROOTFS_IMAGE}" ; then
- REMOTE_FILE_0=`/bin/echo ${MM_ROOTFS_IMAGE} | /bin/sed
-e 's%//*%/%g' | /bin/sed -e 's%[^/]*$%%' | /bin/sed -e 's%/$%%'`
- REMOTE_FILE_0="${REMOTE_FILE_0}/${REMOTE_FILE}"
- else
- if /usr/bin/test "${MM_MINIMYTH_BOOT_URL}" = 'file:/minimyth/' ;
then
- REMOTE_FILE_0="/${REMOTE_FILE}"
+ if /usr/bin/test "${MM_ROOTFS_TYPE}" = 'squashfs' ; then
+ if /usr/bin/test -n "${MM_ROOTFS_IMAGE}" ; then
+ REMOTE_FILE_0=`/bin/echo ${MM_ROOTFS_IMAGE} | /bin/sed
-e 's%//*%/%g' | /bin/sed -e 's%[^/]*$%%' | /bin/sed -e 's%/$%%'`
+ REMOTE_FILE_0="${REMOTE_FILE_0}/${REMOTE_FILE}"
else
- REMOTE_FILE_0="/minimyth-${MM_VERSION}/${REMOTE_FILE}"
+ if /usr/bin/test "${MM_MINIMYTH_BOOT_URL}"
= 'file:/minimyth/' ; then
+ REMOTE_FILE_0="/${REMOTE_FILE}"
+ else
+ REMOTE_FILE_0="/minimyth-${MM_VERSION}/${REMOTE_FILE}"
+ fi
fi
fi
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_EXTRAS
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_EXTRAS
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_EXTRAS
Thu Jan 15 11:13:07 2009
@@ -22,7 +22,11 @@
fi
if /usr/bin/test "${MM_EXTRAS_URL}" = "auto" ; then
- MM_EXTRAS_URL='hunt:extras.sfs'
+ if /usr/bin/test "${MM_ROOTFS_TYPE}" = "squashfs" ; then
+ MM_EXTRAS_URL='hunt:extras.sfs'
+ else
+ MM_EXTRAS_URL='confro:extras.sfs'
+ fi
fi
# Convert 'none' to empty.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_THEME
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_THEME
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_THEME
Thu Jan 15 11:13:07 2009
@@ -77,14 +77,22 @@
if /usr/bin/test "${MM_THEME_URL}" = "auto" ; then
if /usr/bin/test !
-e "/usr/share/mythtv/themes/${MM_THEME_NAME}" ; then
- MM_THEME_URL="hunt:themes/${MM_THEME_NAME}.sfs"
+ if /usr/bin/test "${MM_ROOTFS_TYPE}" = "squashfs" ; then
+ MM_THEME_URL="hunt:themes/${MM_THEME_NAME}.sfs"
+ else
+ MM_THEME_URL="confro:themes/${MM_THEME_NAME}.sfs"
+ fi
else
MM_THEME_URL="none"
fi
fi
if /usr/bin/test "${MM_THEMEOSD_URL}" = "auto" ; then
if /usr/bin/test !
-e "/usr/share/mythtv/themes/${MM_THEMEOSD_NAME}" ; then
- MM_THEMEOSD_URL="hunt:themes/${MM_THEMEOSD_NAME}.sfs"
+ if /usr/bin/test "${MM_ROOTFS_TYPE}" = "squashfs" ; then
+ MM_THEMEOSD_URL="hunt:themes/${MM_THEMEOSD_NAME}.sfs"
+ else
+ MM_THEMEOSD_URL="confro:themes/${MM_THEMEOSD_NAME}.sfs"
+ fi
else
MM_THEMEOSD_URL="none"
fi
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_EXTRAS.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_EXTRAS.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_EXTRAS.pm
Thu Jan 15 11:13:07 2009
@@ -18,7 +18,20 @@
value_default => 'auto',
value_valid => 'auto|none|((cifs|confro|confrw|dist|file|http|hunt|
nfs|
tftp):(//(([^:@]*)?(:([...@]*))?\@)?([^/]+))?[^?#]*(\?([^#]*))?(\#(.*))?)',
value_obsolete => 'default',
- value_auto => 'hunt:extras.sfs',
+ value_auto => sub
+ {
+ my $minimyth = shift;
+ my $name = shift;
+
+ if ($minimyth->var_get('MM_ROOTFS_TYPE') eq 'squashfs')
+ {
+ return "hunt:extras.sfs"
+ }
+ else
+ {
+ return "confro:extras.sfs"
+ }
+ },
value_none => ''
};
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_THEME.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_THEME.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_THEME.pm
Thu Jan 15 11:13:07 2009
@@ -76,7 +76,14 @@
my $theme_name = $minimyth->var_get('MM_THEME_NAME');
if (! -e "/usr/share/mythtv/themes/$theme_name")
{
- return "hunt:themes/$theme_name.sfs"
+ if ($minimyth->var_get('MM_ROOTFS_TYPE') eq 'squashfs')
+ {
+ return "hunt:themes/$theme_name.sfs"
+ }
+ else
+ {
+ return "confro:themes/$theme_name.sfs"
+ }
}
else
{
@@ -127,7 +134,14 @@
my $themeosd_name = $minimyth->var_get('MM_THEMEOSD_NAME');
if (! -e "/usr/share/mythtv/themes/$themeosd_name")
{
- return "hunt:themes/$themeosd_name.sfs"
+ if ($minimyth->var_get('MM_ROOTFS_TYPE') eq 'squashfs')
+ {
+ return "hunt:themes/$themeosd_name.sfs"
+ }
+ else
+ {
+ return "confro:themes/$themeosd_name.sfs"
+ }
}
else
{
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 Thu Jan 15
11:13:07 2009
@@ -1 +1 @@
-c22e8de5d5e3ce52b62db9cc684741c8 download/MiniMyth.pm
+94127aaf8d0b4caa99632f6aba6b1d53 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 Thu Jan
15 11:13:07 2009
@@ -1119,28 +1119,31 @@
}
when (/^dist$/ )
{
- if ($self->var_get('MM_ROOTFS_IMAGE'))
+ if ($self->var_get('MM_ROOTFS_TYPE') eq 'squashfs')
{
- my $file_0 = $self->var_get('MM_ROOTFS_IMAGE');
- $file_0 =~ s/\/+/\//g;
- $file_0 =~ s/[^\/]+$//g;
- $file_0 =~ s/\/$//g;
- $file_0 .= '/' . $file;
- push(@list, $self->var_get('MM_MINIMYTH_BOOT_URL') .
$file_0);
- }
- else
- {
- if ($self->var_get('MM_MINIMYTH_BOOT_URL')
eq 'file:/minimyth/')
+ if ($self->var_get('MM_ROOTFS_IMAGE'))
{
- my $file_0 = $file;
+ my $file_0 = $self->var_get('MM_ROOTFS_IMAGE');
+ $file_0 =~ s/\/+/\//g;
+ $file_0 =~ s/[^\/]+$//g;
+ $file_0 =~ s/\/$//g;
+ $file_0 .= '/' . $file;
push(@list, $self->var_get('MM_MINIMYTH_BOOT_URL') .
$file_0);
}
else
{
- my $file_0 = 'minimyth-' .
$self->var_get('MM_VERSION') . '/' . $file;
- push(@list, $self->var_get('MM_MINIMYTH_BOOT_URL') .
$file_0);
+ if ($self->var_get('MM_MINIMYTH_BOOT_URL')
eq 'file:/minimyth/')
+ {
+ my $file_0 = $file;
+ push(@list,
$self->var_get('MM_MINIMYTH_BOOT_URL') . $file_0);
+ }
+ else
+ {
+ my $file_0 = 'minimyth-' .
$self->var_get('MM_VERSION') . '/' . $file;
+ push(@list,
$self->var_get('MM_MINIMYTH_BOOT_URL') . $file_0);
+ }
+ $self->message_log('info', qq(expanding '$url':
guessed '$list[$#list]' because distribution location is unknown.));
}
- $self->message_log('info', qq(expanding '$url':
guessed '$list[$#list]' because distribution location is unknown.));
}
}
when (/^file$/ )
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
