Hello community, here is the log from the commit of package vhba-kmp for openSUSE:Factory checked in at 2014-07-17 06:58:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vhba-kmp (Old) and /work/SRC/openSUSE:Factory/.vhba-kmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vhba-kmp" Changes: -------- --- /work/SRC/openSUSE:Factory/vhba-kmp/vhba-kmp.changes 2013-06-11 09:38:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vhba-kmp.new/vhba-kmp.changes 2014-07-17 06:58:32.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 13 08:48:46 UTC 2014 - [email protected] + +- Update to new upstream release 20140629 (cdemu-3.0.0) +* CD image write support + +------------------------------------------------------------------- Old: ---- vhba-module-20130607.tar.bz2 New: ---- vhba-module-20140629.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vhba-kmp.spec ++++++ --- /var/tmp/diff_new_pack.MISjrG/_old 2014-07-17 06:58:33.000000000 +0200 +++ /var/tmp/diff_new_pack.MISjrG/_new 2014-07-17 06:58:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vhba-kmp # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,17 @@ Name: vhba-kmp -Version: 20130607 +Version: 20140629 Release: 0 Summary: Virtual SCSI Host Bus Adapter License: GPL-2.0+ Group: System/Kernel -Url: http://cdemu.sf.net/ +Url: http://cdemu.sf.net/about/vhba/ -#Freecode-URL: https://freecode.com/projects/cdemu-for-linux +#Git-Clone: git://git.code.sf.net/p/cdemu/code Source: http://downloads.sf.net/cdemu/vhba-module-%version.tar.bz2 Source2: %name-preamble -Patch3: vhba-no-werror.diff +Patch1: vhba-no-werror.diff BuildRequires: kernel-syms >= 2.6.20 BuildRequires: modutils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,26 +53,27 @@ Linux. %prep +echo %flavors_to_build %setup -qn vhba-module-%version -%patch -P 3 -p1 +%patch -P 1 -p1 %build for flavor in %flavors_to_build; do - cp -a . "../obj-$flavor"; - pushd "../obj-$flavor/"; + cp -a . "../obj-$flavor/" + pushd "../obj-$flavor/" make KDIR="/usr/src/linux-obj/%_target_cpu/$flavor" \ - %{?_smp_mflags}; - popd; -done; + %{?_smp_mflags} + popd +done %install -export INSTALL_MOD_PATH="%buildroot"; +export INSTALL_MOD_PATH="%buildroot" for flavor in %flavors_to_build; do - pushd "../obj-$flavor/"; + pushd "../obj-$flavor/" make KDIR="/usr/src/linux-obj/%_target_cpu/$flavor" \ - modules_install; - popd; -done; + modules_install + popd +done %changelog ++++++ vhba-module-20130607.tar.bz2 -> vhba-module-20140629.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vhba-module-20130607/INSTALL new/vhba-module-20140629/INSTALL --- old/vhba-module-20130607/INSTALL 2013-06-07 21:34:22.000000000 +0200 +++ new/vhba-module-20140629/INSTALL 2014-06-29 15:25:04.000000000 +0200 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 2008 The CDEMU Project. +Copyright (C) 2008-2014 The CDEMU Project. This file is free documentation; the CDEmu project gives unlimited permission to copy, distribute and modify it. @@ -15,11 +15,14 @@ 2. Type `make' to compile the package. - 4. Type `make install' to install the kernel module and other files. + 4. Type `make install' to install the kernel module and other files. (Needs root permission) 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. + source code directory by typing `make clean'. + +To properly set permissions on VHBA control device and/or set up module +auto-load, see the corresponding sections below. Compilers and Options ===================== @@ -28,13 +31,28 @@ by setting the environment variable KERNELRELEASE. The default if it is not specified is 'uname -r' in other words your running kernel. -It is also possible to set extra compiler flags through the EXTRA_CFLAGS +It is also possible to set extra compiler flags through the EXTRA_CFLAGS environment variable. -Compiling For Multiple Architectures -==================================== +Setting Permissions on VHBA Control Device +========================================== + +In order to use VHBA control device, a user must have read-write permissions +on /dev/vhba_ctl. Typically, this is achieved by a udev rule: + +KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdrom" + +The rule should be stored in a .rule file (for example, 40-vhba.rules) in either +/lib/udev/rules.d or /etc/udev/rules.d directory. + +In the above example, the user needs to be part of 'cdrom' group. + +Automatic Module Loading +======================== + +At the moment, automatic module loading can be enabled in a distribution-specific way. -This device driver was initially developed for use on 32 bit intel compatible -processor architectures but may with differing levels of success be compiled -for other kinds of processor architectures. +On debian- and ubuntu-based systems, 'vhba' should be added to the /etc/modules file. +On fedora-based systems, a file called vhba.conf and containing a line 'vhba' +should be created in /etc/modules-load.d directory. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vhba-module-20130607/Makefile new/vhba-module-20140629/Makefile --- old/vhba-module-20130607/Makefile 2013-06-07 21:34:22.000000000 +0200 +++ new/vhba-module-20140629/Makefile 2014-06-29 15:25:04.000000000 +0200 @@ -1,4 +1,4 @@ -VHBA_VERSION := 20130607 +VHBA_VERSION := 20140609 PACKAGE := vhba-module-$(VHBA_VERSION) DOCS := AUTHORS ChangeLog COPYING INSTALL NEWS README DIST := vhba.c Makefile @@ -37,7 +37,7 @@ rm -rf $(PACKAGE) dist-bzip2: dist-dir - tar -c $(PACKAGE) | bzip2 > $(PACKAGE).tar.bz2 + tar -c $(PACKAGE) | bzip2 > $(PACKAGE).tar.bz2 rm -rf $(PACKAGE) dist-xz: dist-dir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vhba-module-20130607/debian/changelog new/vhba-module-20140629/debian/changelog --- old/vhba-module-20130607/debian/changelog 2013-06-07 21:34:22.000000000 +0200 +++ new/vhba-module-20140629/debian/changelog 2014-06-29 15:25:04.000000000 +0200 @@ -1,6 +1,3 @@ -vhba-module (20120422-1ubuntu0~raring1~ppa1) raring; urgency=low - - * Initial Release. Closes: (LP: #105452, LP: #184637) - - -- Henrik Stokseth <[email protected]> Fri, 31 May 2013 12:00:00 +0100 - +vhba-module (20140609-1) debian; urgency=low + * Initial Release. Closes: #705409 + -- Henrik Stokseth <[email protected]> Sat, 05 Apr 2014 12:00:00 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vhba-module-20130607/debian/control new/vhba-module-20140629/debian/control --- old/vhba-module-20130607/debian/control 2013-06-07 21:34:22.000000000 +0200 +++ new/vhba-module-20140629/debian/control 2014-06-29 15:25:04.000000000 +0200 @@ -4,7 +4,7 @@ Homepage: http://cdemu.sourceforge.net/ Maintainer: Henrik Stokseth <[email protected]> Build-Depends: debhelper (>= 9), dkms -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Package: vhba-dkms diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vhba-module-20130607/debian/format new/vhba-module-20140629/debian/format --- old/vhba-module-20130607/debian/format 2013-06-07 21:34:22.000000000 +0200 +++ new/vhba-module-20140629/debian/format 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -3.0 (quilt) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vhba-module-20130607/debian/options new/vhba-module-20140629/debian/options --- old/vhba-module-20130607/debian/options 2013-06-07 21:34:22.000000000 +0200 +++ new/vhba-module-20140629/debian/options 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -compression = "xz" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vhba-module-20130607/debian/vhba-dkms.prerm new/vhba-module-20140629/debian/vhba-dkms.prerm --- old/vhba-module-20130607/debian/vhba-dkms.prerm 2013-06-07 21:34:22.000000000 +0200 +++ new/vhba-module-20140629/debian/vhba-dkms.prerm 2014-06-29 15:25:04.000000000 +0200 @@ -19,7 +19,7 @@ remove|upgrade|deconfigure) # try to unload the module if test -d "/sys/module/vhba"; then - modprobe -r "vhba" || myerror "Failed to unload module." + modprobe -r "vhba" || mywarning "Failed to unload module." else mywarning "Module was not running." fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vhba-module-20130607/vhba.c new/vhba-module-20140629/vhba.c --- old/vhba-module-20130607/vhba.c 2013-06-07 21:34:22.000000000 +0200 +++ new/vhba-module-20140629/vhba.c 2014-06-29 15:25:04.000000000 +0200 @@ -54,12 +54,16 @@ #define DPRINTK(fmt, args...) #endif +/* scmd_dbg was introduced in 3.15 */ +#ifndef scmd_dbg #define scmd_dbg(scmd, fmt, a...) \ dev_dbg(&(scmd)->device->sdev_gendev, fmt, ##a) +#endif +#ifndef scmd_warn #define scmd_warn(scmd, fmt, a...) \ dev_warn(&(scmd)->device->sdev_gendev, fmt, ##a) - +#endif #define VHBA_MAX_SECTORS_PER_IO 256 #define VHBA_MAX_ID 32 @@ -276,7 +280,7 @@ } change = vhost->chgtype[id]; exists = vhost->devices[id] != NULL; - + vhost->chgtype[id] = 0; clear_bit(id, vhost->chgmap); @@ -289,7 +293,7 @@ dev_dbg(&vhost->shost->shost_gendev, "trying to add target 0:%d:0\n", id); vhba_scan_devices_add(vhost, id); } else { - /* quick sequence of add/remove or remove/add; we determine + /* quick sequence of add/remove or remove/add; we determine which one it was by checking if device structure exists */ if (exists) { /* remove followed by add: remove and (re)add */ ++++++ vhba-no-werror.diff ++++++ --- /var/tmp/diff_new_pack.MISjrG/_old 2014-07-17 06:58:33.000000000 +0200 +++ /var/tmp/diff_new_pack.MISjrG/_new 2014-07-17 06:58:33.000000000 +0200 @@ -6,10 +6,10 @@ Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: vhba-module-20130607/Makefile +Index: vhba-module-20140629/Makefile =================================================================== ---- vhba-module-20130607.orig/Makefile -+++ vhba-module-20130607/Makefile +--- vhba-module-20140629.orig/Makefile ++++ vhba-module-20140629/Makefile @@ -8,7 +8,7 @@ KDIR ?= /lib/modules/$(KERNELRELEASE)/bu PWD ?= $(shell pwd) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
