From 6dfde7cbbde715a82e565fecbef716c2e1d3fb7273af77068c6d43b91cb2cebd Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 24 Aug 2007 00:06:45 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/squashfs?expand=0&rev=7 --- squashfs.changes | 5 +++++ squashfs.spec | 48 ++++++------------------------------------ squashfs3.2-r2.tar.bz2 | 3 +++ squashfs3.2-r2.tar.gz | 3 --- 4 files changed, 15 insertions(+), 44 deletions(-) create mode 100644 squashfs3.2-r2.tar.bz2 delete mode 100644 squashfs3.2-r2.tar.gz diff --git a/squashfs.changes b/squashfs.changes index 21ec919..7428427 100644 --- a/squashfs.changes +++ b/squashfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 23 14:57:03 CEST 2007 - olh@suse.de + +- move kernel driver to kernel-binary.rpm + ------------------------------------------------------------------- Thu Aug 16 14:06:32 CEST 2007 - cthiel@suse.de diff --git a/squashfs.spec b/squashfs.spec index 461624f..82e6c8a 100644 --- a/squashfs.spec +++ b/squashfs.spec @@ -12,19 +12,18 @@ # Commandline: Name: squashfs -BuildRequires: kernel-source kernel-syms module-init-tools zlib-devel +BuildRequires: zlib-devel License: GPL v2 or later Group: System/Filesystems Supplements: filesystem(squashfs) Version: 3.2 -Release: 53 -Source0: %{name}%{version}-r2.tar.gz +Release: 57 +Source0: %{name}%{version}-r2.tar.bz2 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 -%suse_kernel_module_package kdump um %description This package contains the userland utilities to create and read @@ -32,21 +31,6 @@ squashfs images. -Authors: --------- - Phillip Lougher - -%package KMP -Group: System/Filesystems -Summary: Kernel modules for the read-only file system with efficient compression -Supplements: filesystem(squashfs) - -%description KMP -This package contains the necessary kernel modules to use the "squash" -file system transparently. - - - Authors: -------- Phillip Lougher @@ -55,38 +39,18 @@ Authors: %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/. -echo '#define CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE 3' >> squashfs/squashfs.h %build make -C squashfs-tools \ CFLAGS="-I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS" -mkdir source obj -# cp -r squashfs/* source/ -export CONFIG_SQUASHFS=m -for flavor in %flavors_to_build; do - rm -rf obj/$flavor - cp -r squashfs obj/$flavor - make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \ - M=$PWD/obj/$flavor -done %install -[ "$RPM_BUILD_ROOT" != "" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; mkdir -p $RPM_BUILD_ROOT/usr/bin cp -p squashfs-tools/*squashfs $RPM_BUILD_ROOT/usr/bin -export CONFIG_SQUASHFS=m -export INSTALL_MOD_PATH=$RPM_BUILD_ROOT -export INSTALL_MOD_DIR=kernel/fs -for flavor in %flavors_to_build; do - make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \ - M=$PWD/obj/$flavor -done +chmod 644 *READ* *CHANGE* %clean -[ "$RPM_BUILD_ROOT" != "" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) @@ -94,6 +58,8 @@ done /usr/bin/*squashfs %changelog +* Thu Aug 23 2007 - olh@suse.de +- move kernel driver to kernel-binary.rpm * Thu Aug 16 2007 - cthiel@suse.de - Supplements: filesystem(squashfs) * Wed Jun 06 2007 - ro@suse.de diff --git a/squashfs3.2-r2.tar.bz2 b/squashfs3.2-r2.tar.bz2 new file mode 100644 index 0000000..fabcccf --- /dev/null +++ b/squashfs3.2-r2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:247014976efa13f8dd1808b864a8c4bd3065170bb0df59f2d033379f56b915aa +size 118278 diff --git a/squashfs3.2-r2.tar.gz b/squashfs3.2-r2.tar.gz deleted file mode 100644 index c10ae66..0000000 --- a/squashfs3.2-r2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7 -size 314764