Changes - j0ke.net Open Build Service

Changes of Revision 21

[-] [+]	Changed	flashcache.spec
@@ -1,14 +1,16 @@ # norootforbuild +%define srctag git Summary: Write back block cache for SSD devices Name: flashcache -Version: 2.1 +Version: 2.1.1 License: GPL Release: 74 Group: System/Kernel -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{srctag}.tar.bz2 Source1: boot.flashcache Source2: mdwn2man -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Patch0: flashcache-2.1_dmtarget.patch +BuildRoot: %{_tmppath}/%{name}-%{srctag}-root BuildRequires: kernel-source kernel-syms module-init-tools BuildRequires: -post-build-checks %suse_kernel_module_package ec2 xenpae vmi um @@ -37,7 +39,8 @@ Kernel modules for write-back block cache driver %prep -%setup +%setup -n %{name}-%{srctag} +%patch0 set -- * mkdir source x 1 @@ -1,14 +1,16 @@ 2 # norootforbuild 3 +%define srctag git 4 Summary: Write back block cache for SSD devices 5 Name: flashcache 6 -Version: 2.1 7 +Version: 2.1.1 8 License: GPL 9 Release: 74 10 Group: System/Kernel 11 -Source0: %{name}-%{version}.tar.bz2 12 +Source0: %{name}-%{srctag}.tar.bz2 13 Source1: boot.flashcache 14 Source2: mdwn2man 15 -BuildRoot: %{_tmppath}/%{name}-%{version}-root 16 +Patch0: flashcache-2.1_dmtarget.patch 17 +BuildRoot: %{_tmppath}/%{name}-%{srctag}-root 18 BuildRequires: kernel-source kernel-syms module-init-tools 19 BuildRequires: -post-build-checks 20 %suse_kernel_module_package ec2 xenpae vmi um 21 @@ -37,7 +39,8 @@ 22 Kernel modules for write-back block cache driver 23 24 %prep 25 -%setup 26 +%setup -n %{name}-%{srctag} 27 +%patch0 28 29 set -- * 30 mkdir source 31
[-] [+]	Added	flashcache-2.1_dmtarget.patch ^
@@ -0,0 +1,20 @@ +--- src/flashcache_conf.c.orig 2013-09-01 12:07:24.619161039 +0200 ++++ src/flashcache_conf.c 2013-09-01 12:09:26.362730838 +0200 +@@ -1088,7 +1088,7 @@ + + dmc->sync_index = 0; + dmc->clean_inprog = 0; +-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) && LINUX_VERSION_CODE != KERNEL_VERSION(3,0,82) + ti->split_io = dmc->block_size; + #else + ti->max_io_len = dmc->block_size; +@@ -1519,7 +1519,7 @@ + flashcache_status(struct dm_target ti, status_type_t type, + unsigned int unused_status_flags, + char result, unsigned int maxlen) +-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) && LINUX_VERSION_CODE != KERNEL_VERSION(3,0,82) + int + flashcache_status(struct dm_target *ti, status_type_t type, + unsigned int unused_status_flags,
	Added	flashcache-git.tar.bz2 ^