Hello community, here is the log from the commit of package compcache for openSUSE:Factory checked in at Sat Dec 26 11:49:13 CET 2009. -------- --- compcache/compcache.changes 2009-08-03 18:31:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/compcache/compcache.changes 2009-11-24 16:49:54.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Nov 24 16:49:30 CET 2009 - tiwai@suse.de + +- yet another fixes for older kernels + +------------------------------------------------------------------- +Mon Nov 23 17:48:15 CET 2009 - tiwai@suse.de + +- fix builds with various kernel versions + +------------------------------------------------------------------- +Mon Nov 23 16:58:26 CET 2009 - tiwai@suse.de + +- updated to version 0.6; see ChangeLog for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- compcache-0.5.3.tar.bz2 compcache-2.6.31-build-fix.diff New: ---- compcache-0.6.tar.bz2 compcache-kernel-build-fixes.diff compcache-rzscontrol-cflags.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compcache.spec ++++++ --- /var/tmp/diff_new_pack.NoTAQG/_old 2009-12-26 11:48:38.000000000 +0100 +++ /var/tmp/diff_new_pack.NoTAQG/_new 2009-12-26 11:48:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package compcache (Version 0.5.3) +# spec file for package compcache (Version 0.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,15 +21,16 @@ Name: compcache BuildRequires: kernel-source kernel-syms module-init-tools -License: GPL v2 only +License: GPLv2 Group: System/Kernel -Version: 0.5.3 -Release: 3 +Version: 0.6 +Release: 1 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 +Patch: compcache-rzscontrol-cflags.diff +Patch1: compcache-kernel-build-fixes.diff Url: http://code.google.com/p/compcache/ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq @@ -51,7 +52,7 @@ Nitin Gupta %package KMP -License: GPL v2 only +License: GPLv2 Summary: Kernel module for compressed RAM based swap device Group: System/Kernel @@ -71,6 +72,7 @@ %prep %setup -q %patch -p1 +%patch1 -p1 %build for flavor in %flavors_to_build; do @@ -87,6 +89,10 @@ for flavor in %flavors_to_build; do KERNEL_OBJ="/usr/src/linux-obj/%_target_cpu/$flavor" make -C ${KERNEL_OBJ} M=$PWD/obj/$flavor modules_install + mkdir -p $RPM_BUILD_ROOT/usr/sbin + install -c -m 0755 sub-projects/rzscontrol/rzscontrol $RPM_BUILD_ROOT/usr/sbin + mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 + install -c -m 0644 sub-projects/rzscontrol/man/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1 done mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates @@ -107,7 +113,10 @@ %files %defattr(-,root,root) +/usr/sbin/* +%{_mandir}/man?/* /etc/init.d/boot.compcache /var/adm/fillup-templates/sysconfig.compcache +%doc README Changelog %changelog ++++++ boot.compcache ++++++ --- /var/tmp/diff_new_pack.NoTAQG/_old 2009-12-26 11:48:38.000000000 +0100 +++ /var/tmp/diff_new_pack.NoTAQG/_new 2009-12-26 11:48:38.000000000 +0100 @@ -23,6 +23,7 @@ SWAPOFF_BIN=/sbin/swapoff UDEVADM_BIN=/sbin/udevadm MODPROBE_BIN=/sbin/modprobe +RZSCTL_BIN=/usr/sbin/rzscontrol SWAPDEV=/dev/ramzswap0 is_comp_swap_on () { @@ -34,16 +35,8 @@ case "$1" in start|restart) - test -z "$COMPCACHE_SIZE_KB" && COMPCACHE_SIZE_KB="0" - if [ "$COMPCACHE_SIZE_KB" -lt 0 ]; then - rc_exit - fi - if [ "$COMPCACHE_SIZE_KB" = "0" ]; then - echo "No compcache size is given, using default 25% of RAM" - param="" - else - param="disksize_kb=$COMPCACHE_SIZE_KB" - fi + test -z "$COMPCACHE_NUM_DEVICES" && COMPCACHE_NUM_DEVICES="1" + param="NUM_DEVICES=$COMPCACHE_NUM_DEVICES" echo -n "Loading ramzswap driver" $MODPROBE_BIN -q ramzswap &>/dev/null rc_status -v @@ -58,10 +51,16 @@ fi fi - # Set it as swap device with highest priority + test -z "$COMPCACHE_SIZE_KB" && COMPCACHE_SIZE_KB="0" + if [ "$COMPCACHE_SIZE_KB" -gt 0 ]; then + $RZSCTL_BIN $SWAPDEV -d $COMPCACHE_SIZE_KB -i + else + $RZSCTL_BIN $SWAPDEV -i + fi + if ! is_comp_swap_on; then echo -n "Setting up ramzswap swap device" - $SWAPON_BIN $SWAPDEV -p 100 + $SWAPON_BIN $SWAPDEV rc_status -v fi ;; ++++++ compcache-0.5.3.tar.bz2 -> compcache-0.6.tar.bz2 ++++++ ++++ 4562 lines of diff (skipped) ++++++ compcache-kernel-build-fixes.diff ++++++ --- ramzswap.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) --- a/ramzswap.c +++ b/ramzswap.c @@ -47,7 +47,11 @@ /* Function declarations */ static int __init ramzswap_init(void); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) static int ramzswap_ioctl(struct block_device *, fmode_t, unsigned, unsigned long); +#else +static int ramzswap_ioctl(struct inode *, struct file *, unsigned, unsigned long); +#endif static int setup_swap_header(struct ramzswap *, union swap_header *); static void ramzswap_set_memlimit(struct ramzswap *, size_t); static void ramzswap_set_disksize(struct ramzswap *, size_t); @@ -923,8 +927,13 @@ return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) + if (bio_rw_flagged(bio, BIO_RW_DISCARD)) + return ramzswap_discard(rzs, bio); +#elif defined(bio_discard) if (bio_discard(bio)) return ramzswap_discard(rzs, bio); +#endif if (!valid_swap_request(rzs, bio)) { stat_inc(rzs->stats.invalid_io); @@ -1015,6 +1024,7 @@ set_capacity(rzs->disk, rzs->disksize >> SECTOR_SHIFT); +#ifdef blk_queue_nonrot /* * We have ident mapping of sectors for ramzswap and * and the backing swap device. So, this queue flag @@ -1023,8 +1033,13 @@ if (!rzs->backing_swap || blk_queue_nonrot(rzs->backing_swap->bd_disk->queue)) queue_flag_set_unlocked(QUEUE_FLAG_NONROT, rzs->disk->queue); +#endif +#ifdef QUEUE_FLAG_DISCARD + queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, rzs->disk->queue); +#elif defined(WRITE_DISCARD) blk_queue_set_discard(rzs->disk->queue, ramzswap_prepare_discard); +#endif #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) blk_queue_logical_block_size(rzs->disk->queue, PAGE_SIZE); @@ -1074,9 +1089,17 @@ return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) static int ramzswap_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) +#else +static int ramzswap_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) +#endif { +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) + struct block_device *bdev = I_BDEV(inode); +#endif int ret = 0; size_t disksize_kb, memlimit_kb; ++++++ compcache-rzscontrol-cflags.diff ++++++ --- sub-projects/rzscontrol/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sub-projects/rzscontrol/Makefile +++ b/sub-projects/rzscontrol/Makefile @@ -1,5 +1,5 @@ all: - @gcc -g -Wall -D_GNU_SOURCE rzscontrol.c -o rzscontrol -I ../include -I../.. + @gcc -g -Wall -D_GNU_SOURCE $(RPM_OPT_FLAGS) rzscontrol.c -o rzscontrol -I ../include -I../.. doc: @xmllint --noout --valid man/rzscontrol.xml ++++++ sysconfig.compcache ++++++ --- /var/tmp/diff_new_pack.NoTAQG/_old 2009-12-26 11:48:38.000000000 +0100 +++ /var/tmp/diff_new_pack.NoTAQG/_new 2009-12-26 11:48:38.000000000 +0100 @@ -9,3 +9,10 @@ # COMPCACHE_SIZE_KB="0" +## Type: integer +## Default: 1 +# +# Number of devices to create by ramzswap (compcache). +# The device are named as /dev/ramzswapX where X starts from 0. +# +COMPCACHE_NUM_DEVICES="1" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org