Author: pebender
Date: Sun Mar 15 14:41:54 2009
New Revision: 4474
Added:
trunk/gar-minimyth/script/utils/squashfs-3.4/
- copied from r4442, /trunk/gar-minimyth/script/utils/squashfs/
trunk/gar-minimyth/script/utils/squashfs-4.0/ (props changed)
trunk/gar-minimyth/script/utils/squashfs-4.0/Makefile
trunk/gar-minimyth/script/utils/squashfs-4.0/checksums
Removed:
trunk/gar-minimyth/script/utils/squashfs/
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/kernel/kernel/Makefile
trunk/gar-minimyth/script/meta/minimyth/Makefile
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
trunk/gar-minimyth/script/utils/squashfs-3.4/Makefile
Log:
- Added squashfs 4.0 in support of kernel 2.6.29.
- Moved utils/squashfs to utils/squashfs-3.4.
- Added utils/squashfs-4.0.
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 Mar 15
14:41:54 2009
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 64 (2009-03-14):
+Changes since 64 (2009-03-15):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -52,6 +52,7 @@
- Changed mediaplayers/mplayer-svn, lib/ffmpeg, lib/libdvdnav and
lib/libdvdread so that it is easier to update
mediaplayers/mplayer-svn
and lib/ffmpeg.
+ - Added squashfs 4.0 in support of kernel 2.6.29.
Fixed build system
- Patched disk/e2fsprogs so that chmod's during build are more likely
to
@@ -65,12 +66,16 @@
Removed nvidia/nvidia-173.14.12.
Removed nvidia/nvidia-180.22.
+Moved packages
+ Moved utils/squashfs to utils/squashfs-3.4.
+
Added packages
Added nvidia/nvidia-71.86.09.
Added nvidia/nvidia-96.43.11.
Added nvidia/nvidia-173.14.18.
Added nvidia/nvidia-180.29.
Added nvidia/nvidia-180.37.
+ Added utils/squashfs-4.0.
Updated packages
Updated db/mysql.
Modified: trunk/gar-minimyth/script/kernel/kernel/Makefile
==============================================================================
--- trunk/gar-minimyth/script/kernel/kernel/Makefile (original)
+++ trunk/gar-minimyth/script/kernel/kernel/Makefile Sun Mar 15 14:41:54
2009
@@ -14,7 +14,8 @@
post-install:
@rm -rf $(DESTDIR)$(versiondir)/$(GARNAME)
@rm -rf $(DESTDIR)$(licensedir)/$(GARNAME)
- @$(MAKECOOKIE)
+ @ln -sf mksquashfs-$(if $(filter $(GARVERSION),2.6.26 2.6.27
2.6.28),3.4,4.0) $(DESTDIR)$(bindir)/mksquashfs
+ @ln -sf mksquashfs-$(if $(filter $(GARVERSION),2.6.26 2.6.27
2.6.28),3.4,4.0) $(build_DESTDIR)$(build_bindir)/mksquashfs
clean-all:
@$(foreach dir, $(wildcard ../../kernel-2.*), $(MAKE) clean-all -C
$(dir)/kernel ; )
Modified: trunk/gar-minimyth/script/meta/minimyth/Makefile
==============================================================================
--- trunk/gar-minimyth/script/meta/minimyth/Makefile (original)
+++ trunk/gar-minimyth/script/meta/minimyth/Makefile Sun Mar 15 14:41:54
2009
@@ -59,7 +59,8 @@
X11/rxvt \
utils/SDL-Test \
system/splashutils \
- utils/squashfs \
+ utils/squashfs-3.4 \
+ utils/squashfs-4.0 \
net/syslinux \
system/sysvinit \
system/udev \
@@ -153,7 +154,8 @@
devel/fakeroot \
utils/file \
utils/findutils \
- utils/squashfs \
+ utils/squashfs-3.4 \
+ utils/squashfs-4.0 \
utils/tar \
utils/util-linux-ng \
xorg/xorg \
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 Mar
15 14:41:54 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 -processors 1 -no-fragments -check_data > /dev/null 2>&1"
+ @fakeroot -i $<.fakeroot sh -c "mksquashfs $< $...@~ -no-exports
-no-progress -processors 1 -no-fragments > /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-exports
-no-progress -processors 1 -no-fragments -check_data > /dev/null 2>&1"
+ @fakeroot sh -c "mksquashfs $< $...@~ -no-exports
-no-progress -processors 1 -no-fragments > /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 -processors 1 -no-fragments -check_data >
/dev/null 2>&1" ; \
+ fakeroot sh -c "mksquashfs $</$${theme}
$...@~/$${theme}.sfs
-no-exports -no-progress -processors 1 -no-fragments > /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 Mar 15
14:41:54 2009
@@ -1 +1 @@
-21574571a0758908ca82d292e8011012 download/MiniMyth.pm
+3efb66840b62c7e3f9b2d5ad1cffb32c 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 Mar
15 14:41:54 2009
@@ -1815,7 +1815,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-exports
-no-progress -processors 1 -force-uid 0 -force-gid 0 -check_data
> "$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 > "$devnull" 2>&1)) !=
0)
{
File::Path::rmtree(qq($local_dir/$codecs_base));
unlink(qq($local_file));
@@ -2001,7 +2001,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-exports -no-progress -processors 1 -force-uid $uid -force-gid $gid
-check_data > "$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
> "$devnull" 2>&1)) != 0)
{
unlink($local_file);
$self->message_log('err', qq(failed to create the MythTV
themecache file because squashfs failed.));
Modified: trunk/gar-minimyth/script/utils/squashfs-3.4/Makefile
==============================================================================
--- /trunk/gar-minimyth/script/utils/squashfs/Makefile (original)
+++ trunk/gar-minimyth/script/utils/squashfs-3.4/Makefile Sun Mar 15
14:41:54 2009
@@ -27,6 +27,6 @@
install-custom:
@mkdir -p $(DESTDIR)$(bindir)
- @cp $(WORKSRC)/mksquashfs $(DESTDIR)$(bindir)
- @cp $(WORKSRC)/unsquashfs $(DESTDIR)$(bindir)
+ @cp $(WORKSRC)/mksquashfs $(DESTDIR)$(bindir)/mksquashfs-3.4
+ @cp $(WORKSRC)/unsquashfs $(DESTDIR)$(bindir)/unsquashfs-3.4
@$(MAKECOOKIE)
Added: trunk/gar-minimyth/script/utils/squashfs-4.0/Makefile
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/utils/squashfs-4.0/Makefile Sun Mar 15
14:41:54 2009
@@ -0,0 +1,39 @@
+GARNAME = squashfs
+GARVERSION = 20090314Z
+CATEGORIES = lib
+MASTER_SITES =
cvs://anonym...@$(GARNAME).cvs.sourceforge.net:/cvsroot/$(GARNAME)/
+DISTFILES = $(DISTNAME).tar.bz2
+PATCHFILES =
+LICENSE = GPL2
+
+DESCRIPTION =
+define BLURB
+endef
+
+DEPENDS = lang/c lib/zlib
+
+DISTNAME = $(GARNAME)$(GARVERSION)
+WORKSRC = $(WORKDIR)/$(DISTNAME)/squashfs-tools
+
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = custom
+
+BUILD_ARGS = \
+ CFLAGS="$(CFLAGS)"
+
+include ../../gar.mk
+
+CFLAGS := $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-D_GNU_SOURCE
+
+cvs//%/$(DISTNAME).tar.bz2:
+ @$(call FETCH_CVS, $*, $(GARNAME), $(GARVERSION), $(DISTNAME))
+ @$(MAKECOOKIE)
+
+checksum-$(DISTNAME).tar.bz2:
+ @$(MAKECOOKIE)
+
+install-custom:
+ @mkdir -p $(DESTDIR)$(bindir)
+ @cp $(WORKSRC)/mksquashfs $(DESTDIR)$(bindir)/mksquashfs-4.0
+ @cp $(WORKSRC)/unsquashfs $(DESTDIR)$(bindir)/unsquashfs-4.0
+ @$(MAKECOOKIE)
Added: trunk/gar-minimyth/script/utils/squashfs-4.0/checksums
==============================================================================
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
