From 4f666c550101efe030f5f5e5d1ec3715e4b4fea0c41a8c6ce045bd8d40f04eac Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 9 Jun 2013 14:17:03 +0000 Subject: [PATCH 1/5] vhba-20130607 OBS-URL: https://build.opensuse.org/package/show/filesystems/vhba-kmp?expand=0&rev=7 --- vhba-kmp.changes | 9 +++++++++ vhba-kmp.spec | 2 +- vhba-module-20120422.tar.bz2 | 3 --- vhba-module-20130607.tar.bz2 | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 vhba-module-20120422.tar.bz2 create mode 100644 vhba-module-20130607.tar.bz2 diff --git a/vhba-kmp.changes b/vhba-kmp.changes index 8cd0e5b..8a2147a 100644 --- a/vhba-kmp.changes +++ b/vhba-kmp.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Jun 9 14:14:21 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 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. + ------------------------------------------------------------------- Sat Mar 30 02:57:55 UTC 2013 - jengelh@inai.de diff --git a/vhba-kmp.spec b/vhba-kmp.spec index 1f5c561..60e71fb 100644 --- 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+ diff --git a/vhba-module-20120422.tar.bz2 b/vhba-module-20120422.tar.bz2 deleted file mode 100644 index 6d75a94..0000000 --- a/vhba-module-20120422.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23d968aa841af25579238bb75d0f8a8e73c2562d7205d22a5af63ef681e53f81 -size 15299 diff --git a/vhba-module-20130607.tar.bz2 b/vhba-module-20130607.tar.bz2 new file mode 100644 index 0000000..4a20b99 --- /dev/null +++ b/vhba-module-20130607.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2c4919d2904a8f880e2730250f7ed6e3143575d5c4de6b88a97c2228aa2a185 +size 15528 From 537673dbb313860438919ca26fb7576edc9d21d6370a03150372d16383aea340 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 9 Jun 2013 14:17:36 +0000 Subject: [PATCH 2/5] Dependency: kernel 2.6.20 OBS-URL: https://build.opensuse.org/package/show/filesystems/vhba-kmp?expand=0&rev=8 --- vhba-kmp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vhba-kmp.spec b/vhba-kmp.spec index 60e71fb..545d1cd 100644 --- a/vhba-kmp.spec +++ b/vhba-kmp.spec @@ -31,7 +31,7 @@ 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 From 898746f1e3951e08225bf6ad9673e0e09d8d5e713e68bc18e0e4b707c283b9e3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 9 Jun 2013 14:19:50 +0000 Subject: [PATCH 3/5] Remove old patches OBS-URL: https://build.opensuse.org/package/show/filesystems/vhba-kmp?expand=0&rev=9 --- vhba-kmp.changes | 1 + vhba-kmp.spec | 4 +--- vhba-no-werror.diff | 20 ++++++++--------- vhba-parallel-build.diff | 46 ---------------------------------------- vhba-pwd.diff | 29 ------------------------- 5 files changed, 12 insertions(+), 88 deletions(-) delete mode 100644 vhba-parallel-build.diff delete mode 100644 vhba-pwd.diff diff --git a/vhba-kmp.changes b/vhba-kmp.changes index 8a2147a..0d098c1 100644 --- a/vhba-kmp.changes +++ b/vhba-kmp.changes @@ -6,6 +6,7 @@ Sun Jun 9 14:14:21 UTC 2013 - jengelh@inai.de * 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 diff --git a/vhba-kmp.spec b/vhba-kmp.spec index 545d1cd..92cb946 100644 --- a/vhba-kmp.spec +++ b/vhba-kmp.spec @@ -27,8 +27,6 @@ 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.20 @@ -57,7 +55,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 diff --git a/vhba-no-werror.diff b/vhba-no-werror.diff index fc05ef3..6d0ec6f 100644 --- 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 diff --git a/vhba-parallel-build.diff b/vhba-parallel-build.diff deleted file mode 100644 index ff96c2c..0000000 --- a/vhba-parallel-build.diff +++ /dev/null @@ -1,46 +0,0 @@ -From: Jan Engelhardt -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: diff --git a/vhba-pwd.diff b/vhba-pwd.diff deleted file mode 100644 index 3844dd2..0000000 --- a/vhba-pwd.diff +++ /dev/null @@ -1,29 +0,0 @@ -From: Jan Engelhardt -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 - From 7351ee8b9d2b30c012bb9a0c166bf86c5f69ec1cef57168450be7894b434b03c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 9 Jun 2013 14:30:55 +0000 Subject: [PATCH 4/5] Version number for changelog OBS-URL: https://build.opensuse.org/package/show/filesystems/vhba-kmp?expand=0&rev=10 --- vhba-kmp.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vhba-kmp.changes b/vhba-kmp.changes index 0d098c1..fed6a30 100644 --- a/vhba-kmp.changes +++ b/vhba-kmp.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sun Jun 9 14:14:21 UTC 2013 - jengelh@inai.de -- Update to new upstream release 2.1.0 +- 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 From bd6e6acd80659b6b30139517d26704e47be96c46d293f470d1b0bb995fd13790 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 9 Jun 2013 14:53:10 +0000 Subject: [PATCH 5/5] Permit SLE builds OBS-URL: https://build.opensuse.org/package/show/filesystems/vhba-kmp?expand=0&rev=11 --- vhba-kmp.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vhba-kmp.spec b/vhba-kmp.spec index 92cb946..a0a81d2 100644 --- a/vhba-kmp.spec +++ b/vhba-kmp.spec @@ -28,7 +28,6 @@ Url: http://cdemu.sf.net/ Source: http://downloads.sf.net/cdemu/vhba-module-%version.tar.bz2 Source2: %name-preamble Patch3: vhba-no-werror.diff -BuildRequires: kernel-devel >= 2.6.20 BuildRequires: kernel-syms >= 2.6.20 BuildRequires: modutils BuildRoot: %{_tmppath}/%{name}-%{version}-build