Mailinglist Archive: opensuse-commit (1214 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package compcache for openSUSE:Factory
checked in at Wed Aug 5 00:32:08 CEST 2009.


--------
--- compcache/compcache.changes 2009-05-08 11:06:00.000000000 +0200
+++ compcache/compcache.changes 2009-08-03 18:31:42.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug  3 18:31:28 CEST 2009 - tiwai@xxxxxxx
+
+- fix build with 2.6.31 kernel
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  compcache-2.6.31-build-fix.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ compcache.spec ++++++
--- /var/tmp/diff_new_pack.3KYNLs/_old  2009-08-05 00:30:00.000000000 +0200
+++ /var/tmp/diff_new_pack.3KYNLs/_new  2009-08-05 00:30:00.000000000 +0200
@@ -24,11 +24,12 @@
 License:        GPL v2 only
 Group:          System/Kernel
 Version:        0.5.3
-Release:        2
+Release:        3
 Summary:        Compressed RAM based swap device
 Source0:        compcache-%{version}.tar.bz2
 Source1:        sysconfig.compcache
 Source2:        boot.compcache
+Patch:          compcache-2.6.31-build-fix.diff
 Url:            http://code.google.com/p/compcache/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %fillup_prereq
@@ -69,6 +70,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 for flavor in %flavors_to_build; do

++++++ compcache-2.6.31-build-fix.diff ++++++
---
 ramzswap.c |    4 ++++
 1 file changed, 4 insertions(+)

--- a/ramzswap.c
+++ b/ramzswap.c
@@ -896,7 +896,11 @@
 #ifdef SWAP_DISCARD_SUPPORTED
        blk_queue_set_discard(rzs.disk->queue, ramzswap_prepare_discard);
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
+       blk_queue_logical_block_size(rzs.disk->queue, PAGE_SIZE);
+#else
        blk_queue_hardsect_size(rzs.disk->queue, PAGE_SIZE);
+#endif
        add_disk(rzs.disk);
 
        rzs.mem_pool = xv_create_pool();

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx