Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at Mon Nov 16 14:31:22 CET 2009. -------- --- open-iscsi/open-iscsi.changes 2009-06-21 14:39:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/open-iscsi/open-iscsi.changes 2009-11-03 20:21:07.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 19:09:35 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.LIHAM0/_old 2009-11-16 14:30:15.000000000 +0100 +++ /var/tmp/diff_new_pack.LIHAM0/_new 2009-11-16 14:30:15.000000000 +0100 @@ -26,7 +26,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 2.0.870 -Release: 27 +Release: 28 Provides: linux-iscsi Obsoletes: linux-iscsi %define iscsi_release 865 ++++++ open-iscsi-add-sles10-compat ++++++ --- /var/tmp/diff_new_pack.LIHAM0/_old 2009-11-16 14:30:15.000000000 +0100 +++ /var/tmp/diff_new_pack.LIHAM0/_new 2009-11-16 14:30:15.000000000 +0100 @@ -47,11 +47,10 @@ 2 files changed, 883 insertions(+), 0 deletions(-) create mode 100644 kernel/2.6.16-suse.patch -diff --git a/kernel/2.6.16-suse.patch b/kernel/2.6.16-suse.patch -new file mode 100644 -index 0000000..f24babd +Index: open-iscsi-2.0-870-rc1/kernel/2.6.16-suse.patch +=================================================================== --- /dev/null -+++ b/kernel/2.6.16-suse.patch ++++ open-iscsi-2.0-870-rc1/kernel/2.6.16-suse.patch @@ -0,0 +1,864 @@ +diff --git a/iscsi_tcp.c b/iscsi_tcp.c +index 908b541..dfd8e31 100644 @@ -917,11 +916,11 @@ + + unsigned int target_id; + -diff --git a/kernel/Makefile b/kernel/Makefile -index 3dae671..139fd7b 100644 ---- a/kernel/Makefile -+++ b/kernel/Makefile -@@ -49,6 +49,7 @@ all: kernel_check +Index: open-iscsi-2.0-870-rc1/kernel/Makefile +=================================================================== +--- open-iscsi-2.0-870-rc1.orig/kernel/Makefile ++++ open-iscsi-2.0-870-rc1/kernel/Makefile +@@ -54,6 +54,7 @@ has_kernel_src: kernel_check #some constants 14to19_patch=2.6.14-19_compat.patch @@ -929,9 +928,9 @@ 20to21_patch=2.6.20-21_compat.patch 24_patch=2.6.24_compat.patch all_patches=14to21_patch 20to21_patch 24_patch -@@ -62,6 +63,13 @@ unpatch_code=$(shell test -e $(cur_patched) && echo do_unpatch_code ) - KSUBLEVEL = $(shell cat $(KSRC)/Makefile | awk -F= '/^SUBLEVEL =/ {print $$2}' | \ - sed 's/^[ \t]*//;s/[ \t]*$$//') +@@ -69,6 +70,13 @@ KSUBLEVEL = $(shell cat $(KSRC)/Makefile + + KSUBLEVEL?=$(shell echo $(KERNELRELEASE) | sed -n 's/.\..\.\([[:digit:]]*\)\..*/\1/p') +ifeq (16, ${KSUBLEVEL}) +KERNEL_SUSE = $(shell cat $(KBUILD_OUTPUT)/.config | sed -n '/^CONFIG_SUSE_KERNEL=y/p') @@ -943,7 +942,7 @@ KERNEL_TARGET=linux_2_6_$(KSUBLEVEL) kernel_check: $(KERNEL_TARGET) -@@ -71,6 +79,8 @@ linux_2_6_15: has_14to19_patch +@@ -78,6 +86,8 @@ linux_2_6_15: has_14to19_patch linux_2_6_16: has_14to19_patch @@ -952,7 +951,7 @@ linux_2_6_17: has_14to19_patch linux_2_6_18: has_14to19_patch -@@ -108,6 +118,15 @@ has_14to19_patch: $(14to19_patch) +@@ -115,6 +125,15 @@ has_14to19_patch: $(14to19_patch) cp $(14to19_patch) $@ ln -s $@ $(cur_patched) @@ -968,6 +967,3 @@ has_20to21_patch: $(20to21_patch) echo "Patching source code for linux-2.6.20-21 ..." if [ -e $(cur_patched) ]; then \ --- -1.5.2.4 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org