Hello community, here is the log from the commit of package squashfs for openSUSE:Factory checked in at Thu Feb 26 12:56:37 CET 2009. -------- --- squashfs/squashfs.changes 2007-08-23 14:57:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/squashfs/squashfs.changes 2009-02-25 18:36:14.050470000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 25 16:27:55 CET 2009 - coolo@suse.de + +- update to squashfs pre 4.0 to create squashfs that 2.6.29 can + actually read +- (there is no documentation in CVS) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- squashfs3.2-r2.tar.bz2 squashfs-slab_change.patch New: ---- squashfs-tools.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squashfs.spec ++++++ --- /var/tmp/diff_new_pack.PR1502/_old 2009-02-26 12:56:24.000000000 +0100 +++ /var/tmp/diff_new_pack.PR1502/_new 2009-02-26 12:56:24.000000000 +0100 @@ -1,27 +1,34 @@ # -# spec file for package squashfs (Version 3.2) +# spec file for package squashfs (Version 3.99cvs20090225) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild # Commandline: + Name: squashfs BuildRequires: zlib-devel License: GPL v2 or later Group: System/Filesystems Supplements: filesystem(squashfs) -Version: 3.2 -Release: 57 -Source0: %{name}%{version}-r2.tar.bz2 +Version: 3.99cvs20090225 +Release: 1 +Source0: squashfs-tools.tar.bz2 Patch: squashfs-retval.patch -Patch1: squashfs-slab_change.patch -URL: http://squashfs.sourceforge.net/ +Url: http://squashfs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Read-Only File System with Efficient Compression @@ -36,39 +43,41 @@ Phillip Lougher %prep -%setup -n %{name}%{version}-r2 -%patch -%patch1 +%setup -n squashfs-tools +%patch -p1 %build -make -C squashfs-tools \ - CFLAGS="-I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS" +make CFLAGS="-I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $RPM_OPT_FLAGS" %install mkdir -p $RPM_BUILD_ROOT/usr/bin -cp -p squashfs-tools/*squashfs $RPM_BUILD_ROOT/usr/bin -chmod 644 *READ* *CHANGE* +cp -p {un,mk}squashfs $RPM_BUILD_ROOT/usr/bin +#chmod 644 *READ* *CHANGE* %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc README CHANGES README-3.2 PERFORMANCE.README +#%doc README CHANGES PERFORMANCE.README /usr/bin/*squashfs %changelog -* Thu Aug 23 2007 - olh@suse.de +* Wed Feb 25 2009 coolo@suse.de +- update to squashfs pre 4.0 to create squashfs that 2.6.29 can + actually read +- (there is no documentation in CVS) +* Thu Aug 23 2007 olh@suse.de - move kernel driver to kernel-binary.rpm -* Thu Aug 16 2007 - cthiel@suse.de +* Thu Aug 16 2007 cthiel@suse.de - Supplements: filesystem(squashfs) -* Wed Jun 06 2007 - ro@suse.de +* Wed Jun 06 2007 ro@suse.de - fix build with current kernel -* Wed Apr 04 2007 - lrupp@suse.de +* Wed Apr 04 2007 lrupp@suse.de - added module-init-tools to BuildRequires -* Thu Mar 29 2007 - rguenther@suse.de +* Thu Mar 29 2007 rguenther@suse.de - added zlib-devel BuildRequires. -* Tue Jan 23 2007 - ro@suse.de +* Tue Jan 23 2007 ro@suse.de - update to 3.2r2 - Kernel patches 2.6.19/2.6.20 have been updated to use const structures and mutexes rather than older semaphores. @@ -88,7 +97,7 @@ - update to 3.1r2 - A code optimisation after testing unfortunately broke sorting in Mksquashfs. This has been fixed. -* Mon Aug 21 2006 - ro@suse.de +* Mon Aug 21 2006 ro@suse.de - update to version 3.1 to fix build on 2.6.18 -* Thu May 11 2006 - duwe@suse.de +* Thu May 11 2006 duwe@suse.de - packaged current version for SuSE Linux. ++++++ squashfs-retval.patch ++++++ --- /var/tmp/diff_new_pack.PR1502/_old 2009-02-26 12:56:24.000000000 +0100 +++ /var/tmp/diff_new_pack.PR1502/_new 2009-02-26 12:56:24.000000000 +0100 @@ -1,27 +1,12 @@ ---- squashfs-tools/mksquashfs.c 2007-01-16 02:33:13.000000000 +0100 -+++ squashfs-tools/mksquashfs.c 2007-01-23 17:01:41.761826000 +0100 -@@ -1682,6 +1682,7 @@ - for(entry = priority_list[i]; entry; entry = entry->next) - reader_read_file(entry->dir); - } -+ return NULL; - } - - -@@ -1830,7 +1831,7 @@ - int spaces = columns - used - hashes; - - if(!progress || columns - used < 0) -- return; -+ return 0; - - printf("\r["); - -@@ -1843,6 +1844,7 @@ - printf("] %*lld/%*lld", max_digits, current, max_digits, max); - printf(" %3lld%%", current * 100 / max); - fflush(stdout); -+ return 0; +Index: squashfs-tools/mksquashfs.c +=================================================================== +--- squashfs-tools/mksquashfs.c.orig ++++ squashfs-tools/mksquashfs.c +@@ -1538,6 +1538,7 @@ int add_pending_fragment(struct file_buf + pthread_mutex_lock(&fragment_mutex); + insert_fragment_list(&frag_locked_list, entry); + pthread_mutex_unlock(&fragment_mutex); ++ return TRUE; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org