diff --git a/squashfs-slab_change.patch b/squashfs-slab_change.patch new file mode 100644 index 0000000..5c14f51 --- /dev/null +++ b/squashfs-slab_change.patch @@ -0,0 +1,20 @@ +--- kernel-patches/linux-2.6.20/squashfs3.2-patch ++++ kernel-patches/linux-2.6.20/squashfs3.2-patch +@@ -87,7 +87,7 @@ + diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/inode.c linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c + --- linux-2.6.20/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100 + +++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c 2007-01-16 02:28:36.000000000 +0000 +-@@ -0,0 +1,2329 @@ ++@@ -0,0 +1,2327 @@ + +/* + + * Squashfs - a compressed read only filesystem for Linux + + * +@@ -2388,8 +2388,6 @@ + +{ + + struct squashfs_inode_info *ei = foo; + + +-+ if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == +-+ SLAB_CTOR_CONSTRUCTOR) + + inode_init_once(&ei->vfs_inode); + +} + + diff --git a/squashfs.changes b/squashfs.changes index 4104d79..c213666 100644 --- a/squashfs.changes +++ b/squashfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 6 01:36:49 CEST 2007 - ro@suse.de + +- fix build with current kernel + ------------------------------------------------------------------- Wed Apr 4 22:09:34 CEST 2007 - lrupp@suse.de diff --git a/squashfs.spec b/squashfs.spec index 49f2128..a8f7513 100644 --- a/squashfs.spec +++ b/squashfs.spec @@ -16,9 +16,10 @@ BuildRequires: kernel-source kernel-syms module-init-tools zlib-devel License: GNU General Public License (GPL) Group: System/Filesystems Version: 3.2 -Release: 12 +Release: 31 Source0: %{name}%{version}-r2.tar.gz Patch: squashfs-retval.patch +Patch1: squashfs-slab_change.patch URL: http://squashfs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Read-Only File System with Efficient Compression @@ -51,6 +52,7 @@ Authors: %prep %setup -n %{name}%{version}-r2 %patch +%patch1 # turn patch into plain sources :-/ patch -f -p2 < kernel-patches/linux-2.6.20/squashfs3.2-patch || true mv linux squashfs/. @@ -90,6 +92,8 @@ done /usr/bin/*squashfs %changelog +* Wed Jun 06 2007 - ro@suse.de +- fix build with current kernel * Wed Apr 04 2007 - lrupp@suse.de - added module-init-tools to BuildRequires * Thu Mar 29 2007 - rguenther@suse.de