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 <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: 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 <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 -