Author: pebender
Date: Sun Jan 25 15:43:53 2009
New Revision: 4322
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Changed mksquashfs so that it uses more conservative settings. I hope
that this will reduce the chance of creating bad squashfs images.
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 Jan 25
15:43:53 2009
@@ -149,6 +149,8 @@
individually rather than including all the LIRC drivers.
- Modified include file lists so that lirc_gpio and lirc_i2c drivers
are
included only when the backend software is included.
+ - Changed mksquashfs so that it uses more conservative settings. I hope
+ that this will reduce the chance of creating bad squashfs images.
Fixed build system
- Fixed lib/libftdi so that it does detect the system's boost library
and
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 Sun Jan
25 15:43:53 2009
@@ -635,7 +635,7 @@
@echo "making the squashfs version of the root file system"
@mkdir -m 0755 -p $(@D)
@rm -rf $@ $...@~
- @fakeroot -i $<.fakeroot sh -c "mksquashfs $< $...@~ -no-exports
-no-progress -no-sparse -b 64k -processors 1 -check_data > /dev/null 2>&1"
+ @fakeroot -i $<.fakeroot sh -c "mksquashfs $< $...@~ -no-exports
-no-progress -processors 1 -no-fragments -check_data > /dev/null 2>&1"
@chmod 0644 $...@~
@touch $...@~
@mv $...@~ $@
@@ -644,7 +644,7 @@
@echo "making the squashfs version of the extras file system"
@mkdir -m 0755 -p $(@D)
@rm -rf $@ $...@~
- @fakeroot sh -c "mksquashfs $< $...@~ -no-sparse -no-exports
-no-progress
-no-sparse -b 64k -processors 1 -check_data > /dev/null 2>&1"
+ @fakeroot -i $<.fakeroot sh -c "mksquashfs $< $...@~ -no-exports
-no-progress -processors 1 -no-fragments -check_data > /dev/null 2>&1"
@chmod 0644 $...@~
@touch $...@~
@mv $...@~ $@
@@ -655,7 +655,7 @@
@rm -rf $@ $...@~
@mkdir -m 0755 -p $...@~
@for theme in `cd $< ; ls -1` ;
do \
- fakeroot sh -c "mksquashfs $</$${theme} $...@~/$${theme}.sfs
-no-exports
-no-progress -no-sparse -b 64k -processors 1 -check_data > /dev/null
2>&1" ; \
+ fakeroot sh -c "mksquashfs $</$${theme} $...@~/$${theme}.sfs
-no-exports
-no-progress -processors 1 -no-fragments -check_data > /dev/null 2>&1" ; \
done
@find $...@~ -depth -type d -exec chmod 0755 '{}' \;
@find $...@~ -depth -type f -exec chmod 0644 '{}' \;
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 Jan 25
15:43:53 2009
@@ -1 +1 @@
-ca8e5b0eeb51f0d1ab3c0433a604b040 download/MiniMyth.pm
+505587d310501d2934225511f138b45e 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 Jan
25 15:43:53 2009
@@ -1805,7 +1805,7 @@
"$local_dir/$codecs_base");
unlink(qq($local_file));
- if (system(qq(/usr/bin/fakeroot
/usr/bin/mksquashfs "$local_dir/$codecs_base" "$local_file" -no-sparse
-no-exports -no-progress -no-sparse -b 64k -processors 1 -check_data
-force-uid 0 -force-gid 0 > "$devnull" 2>&1)) != 0)
+ if (system(qq(/usr/bin/fakeroot
/usr/bin/mksquashfs "$local_dir/$codecs_base" "$local_file" -no-exports
-no-progress -processors 1 -force-uid 0 -force-gid 0 -check_data
> "$devnull" 2>&1)) != 0)
{
File::Path::rmtree(qq($local_dir/$codecs_base));
unlink(qq($local_file));
@@ -1946,7 +1946,7 @@
return 0;
}
- if (system(qq(/usr/bin/fakeroot
/usr/bin/mksquashfs '/usr/local' "$local_file" -no-sparse -no-exports
-no-progress -no-sparse -b 64k -processors 1 -check_data -force-uid 0
-force-gid 0 > "$devnull" 2>&1)) != 0)
+ if (system(qq(/usr/bin/fakeroot
/usr/bin/mksquashfs '/usr/local' "$local_file" -no-exports -no-progress
-processors 1 -force-uid 0 -force-gid 0 -ckeck_data > "$devnull" 2>&1)) !=
0)
{
unlink($local_file);
$self->message_log('err', qq(failed to create the extras file
because squashfs failed.));
@@ -1991,7 +1991,7 @@
my $uid = getpwnam('minimyth');
my $gid = getgrnam('minimyth');
- if (system(qq(/usr/bin/fakeroot
/usr/bin/mksquashfs '/home/minimyth/.mythtv/themecache' "$local_file"
-no-sparse -no-exports -no-progress -no-sparse -b 64k -processors 1
-check_data -force-uid $uid -force-gid $gid > "$devnull" 2>&1)) != 0)
+ if (system(qq(/usr/bin/fakeroot
/usr/bin/mksquashfs '/home/minimyth/.mythtv/themecache' "$local_file"
-no-exports -no-progress -processors 1 -force-uid $uid -force-gid $gid
-check_data > "$devnull" 2>&1)) != 0)
{
unlink($local_file);
$self->message_log('err', qq(failed to create the MythTV
themecache file because squashfs failed.));
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
