Accepting request 178342 from filesystems

- Update to new upstream release 20130607 (cdemu-2.1.0) * Added support for non-blocking I/O. * Allow longer commands to be issues on VHBA. * Explicitly distinguish between device addition and device removal change, and resolve cases when both occur before rescan is done. - Remove vhba-parallel-build.diff, vhba-pwd.diff (merged upstream) OBS-URL: https://build.opensuse.org/request/show/178342 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vhba-kmp?expand=0&rev=5
2013-06-11 04:39:32 +00:00 · 2013-06-11 04:39:32 +00:00 · c412d9ce32
commit c412d9ce32
parent b99768c97f bd6e6acd80
7 changed files with 26 additions and 94 deletions
--- a/vhba-kmp.changes
+++ b/vhba-kmp.changes
@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Jun  9 14:14:21 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 20130607 (cdemu-2.1.0)
+* Added support for non-blocking I/O.
+* Allow longer commands to be issues on VHBA.
+* Explicitly distinguish between device addition and device removal
+  change, and resolve cases when both occur before rescan is done.
+- Remove vhba-parallel-build.diff, vhba-pwd.diff (merged upstream)
+
 -------------------------------------------------------------------
 Sat Mar 30 02:57:55 UTC 2013 - jengelh@inai.de

--- a/vhba-kmp.spec
+++ b/vhba-kmp.spec
@ -17,7 +17,7 @@


 Name:           vhba-kmp
-Version:        20120422
+Version:        20130607
 Release:        0
 Summary:        Virtual SCSI Host Bus Adapter
 License:        GPL-2.0+
@ -27,11 +27,8 @@ Url:            http://cdemu.sf.net/
 #Freecode-URL:	https://freecode.com/projects/cdemu-for-linux
 Source:         http://downloads.sf.net/cdemu/vhba-module-%version.tar.bz2
 Source2:        %name-preamble
-Patch1:         vhba-pwd.diff
-Patch2:         vhba-parallel-build.diff
 Patch3:         vhba-no-werror.diff
-BuildRequires:  kernel-devel >= 2.6.20
-BuildRequires:  kernel-syms >= 2.6.0
+BuildRequires:  kernel-syms >= 2.6.20
 BuildRequires:  modutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

@ -57,7 +54,7 @@ Linux.

 %prep
 %setup -qn vhba-module-%version
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 3 -p1

 %build
 for flavor in %flavors_to_build; do
--- a/vhba-module-20120422.tar.bz2
+++ b/vhba-module-20120422.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23d968aa841af25579238bb75d0f8a8e73c2562d7205d22a5af63ef681e53f81
-size 15299
--- a/vhba-module-20130607.tar.bz2
+++ b/vhba-module-20130607.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2c4919d2904a8f880e2730250f7ed6e3143575d5c4de6b88a97c2228aa2a185
+size 15528
--- a/vhba-no-werror.diff
+++ b/vhba-no-werror.diff
@ -6,16 +6,16 @@ Upstream: tendency: no
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-Index: vhba-module-20120422/Makefile
+Index: vhba-module-20130607/Makefile
 ===================================================================
--- vhba-module-20120422.orig/Makefile
-+++ vhba-module-20120422/Makefile
-@@ -1,7 +1,7 @@
- VHBA_VERSION = $(shell date -r ${src}/vhba.c +%Y%m%d)
- PACKAGE = vhba-module-$(VHBA_VERSION)
+--- vhba-module-20130607.orig/Makefile
+++ vhba-module-20130607/Makefile
+@@ -8,7 +8,7 @@ KDIR ?= /lib/modules/$(KERNELRELEASE)/bu
+ PWD ?= $(shell pwd)
 
-EXTRA_CFLAGS += -DVHBA_VERSION=\"$(VHBA_VERSION)\" -Werror
-+EXTRA_CFLAGS += -DVHBA_VERSION=\"$(VHBA_VERSION)\"
- 
- obj-m += vhba.o
+ obj-m := vhba.o
+-ccflags-y := -DVHBA_VERSION=\"$(VHBA_VERSION)\" -Werror
+ccflags-y := -DVHBA_VERSION=\"$(VHBA_VERSION)\"
+ clean-dirs := $(PACKAGE)
+ clean-files := $(PACKAGE).tar.gz $(PACKAGE).tar.bz2
 
--- a/vhba-parallel-build.diff
+++ b/vhba-parallel-build.diff
@ -1,46 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2012-05-08 22:50:50.918987100
-
-build: enable parallel build
-
-${MAKE} -C must not be hidden behind a variable to not break parallel
-building.
-
---
- Makefile |   11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-Index: vhba-module-20120422/Makefile
-===================================================================
--- vhba-module-20120422.orig/Makefile
-+++ vhba-module-20120422/Makefile
-@@ -5,27 +5,18 @@ EXTRA_CFLAGS += -DVHBA_VERSION=\"$(VHBA_
- 
- obj-m += vhba.o
- 
-PWD	?= `pwd`
- KERNELRELEASE ?= `uname -r`
- KDIR ?= /lib/modules/$(KERNELRELEASE)/build
-KMAKE := $(MAKE) -C $(KDIR) M=$(PWD)
- 
- DOCS = AUTHORS ChangeLog COPYING INSTALL NEWS README
- 
- all: modules
- 
-modules:
-	$(KMAKE) modules
-
-module_install:
-	$(KMAKE) modules_install
-+modules modules_install clean:
-+	${MAKE} -C ${KDIR} M=$$PWD $@
- 
- install: module_install
- 
-clean:
-	$(KMAKE) clean
-	rm -fr $(PACKAGE)
-
- dist: dist-gzip
- 
- dist-dir:
--- a/vhba-pwd.diff
+++ b/vhba-pwd.diff
@ -1,29 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2012-05-08 22:51:09 +0200
-
-build: fix incorrect use of $(PWD)
-
-With out-of-tree builds, I am getting this warning:
-
-date: /usr/src/linux-3.1.10-1.9/vhba.c: No such file or directory
-
-So use the proper directory.
-
---
- Makefile |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: vhba-module-20120422/Makefile
-===================================================================
--- vhba-module-20120422.orig/Makefile
-+++ vhba-module-20120422/Makefile
-@@ -1,7 +1,7 @@
-VHBA_VERSION = $(shell date -r $(PWD)/vhba.c +%Y%m%d)
-+VHBA_VERSION = $(shell date -r ${src}/vhba.c +%Y%m%d)
- PACKAGE = vhba-module-$(VHBA_VERSION)
- 
-EXTRA_CFLAGS += -DVHBA_VERSION=\"$(VHBA_VERSION)\" -I$(PWD) -Werror
-+EXTRA_CFLAGS += -DVHBA_VERSION=\"$(VHBA_VERSION)\" -Werror
- 
- obj-m += vhba.o
-