Author: pebender
Date: Sun May 10 13:45:05 2009
New Revision: 4734
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/udhcpc.script
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Fixed a bug that caused failure to fetch minimyth.conf when using a
atftpd server.
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 Sun May 10
13:45:05 2009
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 66 (2009-05-09):
+Changes since 66 (2009-05-10):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082 and
@@ -53,6 +53,8 @@
Fixed bugs
- Enabled compatibility mode in xkeyboard-config in order to fix the
<http://www.minimyth.org/forum/viewtopic.php?t=2258>.
+ - Fixed a bug that caused failure to fetch minimyth.conf when using a
+ atftpd server.
Fixed build system
- Fixed devel/binutils so that it builds static libraries as well.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/udhcpc.script
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/udhcpc.script
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/udhcpc.script
Sun May 10 13:45:05 2009
@@ -173,11 +173,11 @@
TFTP_BOOT_URL=
if /usr/bin/test ! "x${TFTP_BOOT_FILE}" = "x" ; then
if /bin/echo ${TFTP_BOOT_FILE} | /bin/grep -q '://' ; then
- TFTP_BOOT_URL=`/bin/echo "${TFTP_BOOT_FILE}" | /bin/sed
-e 's%[^/]*$%%' -e 's%[^/]*/$%%'`
+ TFTP_BOOT_URL=`/bin/echo "${TFTP_BOOT_FILE}" | /bin/sed
-e 's%[^/]*$%%'`
else
if /usr/bin/test ! "x${TFTP_SERVER}" = "x" ; then
- TFTP_BOOT_DIR=`/bin/echo "/${TFTP_BOOT_FILE}" |
/bin/sed -e 's%[^/]*$%%' -e 's%//*%/%g'`
- TFTP_BOOT_URL="tftp://${TFTP_SERVER}${TFTP_BOOT_DIR}";
+ TFTP_BOOT_DIR=`/bin/echo "${TFTP_BOOT_FILE}" |
/bin/sed -e 's%[^/]*$%%'`
+ TFTP_BOOT_URL="tftp://${TFTP_SERVER}/${TFTP_BOOT_DIR}";
fi
fi
fi
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 Sun May 10
13:45:05 2009
@@ -1 +1 @@
-48bb072fdf0b07f1372407bd7694a528 download/MiniMyth.pm
+f02ac2a8d14b10f5550d714df222b683 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 Sun May
10 13:45:05 2009
@@ -1051,7 +1051,7 @@
# Parse the URL.
my ($protocol, undef, undef, $username, undef, $password, $server ,
$path , undef, $query , undef, $fragment)
= ($1 || '' , $2 , $3 , $4 || '' , $5 , $6 || '' , $7 || '',
$8 || '', $9 , $10 || '', $11 , $12 || '')
- if ($url =~
/^([^:]+):(\/\/(([^:@]*)?(:([...@]*))?\@)?([^\/]+))?([^?#]*)(\?([^#]*))?(\#(.*))?$/);
+ if ($url =~
/^([^:]+):(\/\/(([^:@]*)?(:([...@]*))?\@)?([^\/]+)\/)?([^?#]*)(\?([^#]*))?(\#(.*))?$/);
return
{
@@ -1079,10 +1079,6 @@
my $server = $url_parsed->{'server'};
my $file = $url_parsed->{'path'};
- $file =~ s/\/+/\//g;
- $file =~ s/\/$//g;
- $file =~ s/^\///g;
-
my @list = ();
given ($protocol)
@@ -1208,9 +1204,6 @@
my $remote_server = $url_parsed->{'server'};
my $remote_file = $url_parsed->{'path'};
- $remote_file =~ s/\/+/\//g;
- $remote_file =~ s/\/$//g;
-
given ($remote_protocol)
{
when (/^file$/)
@@ -1514,7 +1507,7 @@
if ($url_protocol eq 'cifs')
{
$mount_vfstype = 'cifs';
- $mount_device = '//' . $url_server . $url_path;
+ $mount_device = '//' . $url_server . '/' . $url_path;
if ($url_password ne '')
{
$mount_options = 'password=' . $url_password . ',' .
$mount_options;
@@ -1527,13 +1520,13 @@
elsif ($url_protocol eq 'nfs')
{
$mount_vfstype = 'nfs';
- $mount_device = $url_server . ':' . $url_path;
+ $mount_device = $url_server . ':' . '/' . $url_path;
$mount_options = 'nolock,' . $mount_options;
}
elsif ($url_protocol eq 'ext3')
{
$mount_vfstype = 'ext3';
- $mount_device = $url_path;
+ $mount_device = '/' . $url_path;
$mount_options = $mount_options;
}
elsif (( $url_protocol eq 'confro' ) ||
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
