swejis wrote:
> I'm sorry Mike but i'm uncertain what to copy. Tried to look and
> compare against your previously attached patch but with no success.
>
> manjula:/opt/src/open-iscsi-2.0-869.1.test1 # patch < iscsi.patch
> patching file Makefile
> Hunk #1 FAILED at 32.
> 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
> patching file Makefile
> Hunk #1 FAILED at 32.
> Hunk #2 FAILED at 64.
> Hunk #3 FAILED at 133.
> Hunk #4 FAILED at 176.
> 4 out of 4 hunks FAILED -- saving rejects to file Makefile.rej
> patching file Makefile
> Hunk #1 FAILED at 7.
> 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
>
> May I kindly ask you to attach this patch as you did with the other
> one ?
>
Ok try the attached.
from /opt/src/open-iscsi-2.0-869.1.test1 do
patch -p1 -i ../path-to-patch/suse-makefile-fix.patch
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"open-iscsi" group.
To post to this group, send email to open-iscsi@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at http://groups.google.com/group/open-iscsi
-~----------~----~----~----~------~----~------~--~---
diff -aurp open-iscsi-2.0-869.1.test1/kernel/Makefile open-iscsi-2.0-869.1.test1.tmp/kernel/Makefile
--- open-iscsi-2.0-869.1.test1/kernel/Makefile 2008-04-09 19:12:58.000000000 -0500
+++ open-iscsi-2.0-869.1.test1.tmp/kernel/Makefile 2008-05-06 13:26:17.000000000 -0500
@@ -32,11 +32,16 @@ V ?= 0
# eg to compile for a kernel that you aren't currently running
KERNELRELEASE ?= $(shell uname -r)
KSRC ?= /lib/modules/$(KERNELRELEASE)/build
+KSRC := $(shell test -f $(KSRC)/Makefile || echo "")
KBUILD_OUTPUT ?=
# this is the basic Kbuild invocation, just append your make target
KBUILD_BASE = +$(MAKE) -C $(KSRC) M=`pwd` KBUILD_OUTPUT=$(KBUILD_OUTPUT) $(KARCH) V=$(V)
-all: kernel_check
+all: kernel_src
+
+kernel_src: $(shell test -n "$(KSRC)" && echo has_kernel_src)
+
+has_kernel_src: kernel_check
$(KBUILD_BASE) modules
# ============ BEGIN code for kernel_check and source patching ================
@@ -59,9 +64,11 @@ cur_patched=cur_patched
# check to see if code is unpatched
unpatch_code=$(shell test -e $(cur_patched) && echo do_unpatch_code )
-KSUBLEVEL = $(shell cat $(KSRC)/Makefile | awk -F= '/^SUBLEVEL =/ {print $$2}' | \
+KSUBLEVEL = $(shell cat $(KSRC)/Makefile 2> /dev/null | awk -F= '/^SUBLEVEL =/ {print $$2}' | \
sed 's/^[ \t]*//;s/[ \t]*$$//')
+KSUBLEVEL?=$(shell echo $(KERNELRELEASE) | sed -n 's/.\..\.\([[:digit:]]*\)\..*/\1/p')
+
KERNEL_TARGET=linux_2_6_$(KSUBLEVEL)
kernel_check: $(KERNEL_TARGET)
@@ -126,7 +133,11 @@ has_24_patch: $(24_patch)
# ============ END code for kernel_check and source patching =================
-clean: $(unpatch_code)
+clean: clean_kernel_src
+
+clean_kernel_src: $(shell test -n "$(KSRC)" && echo has_clean_kernel_src)
+
+has_clean_kernel_src: $(unpatch_code)
$(KBUILD_BASE) clean
rm -f Module.symvers
@@ -165,7 +176,9 @@ ko = $(patsubst %.o,%.ko,$(obj-m))
$(ko): all
# now the actual command
-install_kernel: $(ko)
+install_kernel: $(shell test -n "$(KSRC)" && echo install_kernel_obj);
+
+install_kernel_obj: $(ko)
$(KBUILD_BASE) modules_install INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH)
dpkg_divert:
diff -aurp open-iscsi-2.0-869.1.test1/Makefile open-iscsi-2.0-869.1.test1.tmp/Makefile
--- open-iscsi-2.0-869.1.test1/Makefile 2008-04-09 19:12:58.000000000 -0500
+++ open-iscsi-2.0-869.1.test1.tmp/Makefile 2008-05-06 13:26:17.000000000 -0500
@@ -32,9 +32,12 @@ all:
@echo
@echo "Compilation complete Output file"
@echo "----------------------------------- ----------------"
- @echo "Built iSCSI Open Interface module: kernel/scsi_transport_iscsi.ko"
- @echo "Built iSCSI library module: kernel/libiscsi.ko"
- @echo "Built iSCSI over TCP kernel module: kernel/iscsi_tcp.ko"
+ @if [ -f kernel/scsi_transport_iscsi.ko ] ; then \
+ echo "Built iSCSI Open Interface module: kernel/scsi_transport_iscsi.ko"; fi
+ @if [ -f kernel/libiscsi.ko ] ; then \
+ echo "Built iSCSI library module: kernel/libiscsi.ko"; fi
+ @if [ -f kernel/iscsi_tcp.ko ] ; then \
+ echo "Built iSCSI over TCP kernel module: kernel/iscsi_tcp.ko"; fi
@echo "Built iSCSI daemon: usr/iscsid"
@echo "Built management application: usr/iscsiadm"
@echo
diff -aurp open-iscsi-2.0-869.1.test1/usr/Makefile open-iscsi-2.0-869.1.test1.tmp/usr/Makefile
--- open-iscsi-2.0-869.1.test1/usr/Makefile 2008-04-09 19:12:58.000000000 -0500
+++ open-iscsi-2.0-869.1.test1.tmp/usr/Makefile 2008-05-06 13:26:17.000000000 -0500
@@ -7,9 +7,11 @@ OSNAME=$(shell uname -s)
KERNELRELEASE ?= $(shell uname -r)
KSRC ?= /lib/modules/$(KERNELRELEASE)/build
-KSUBLEVEL=$(shell cat $(KSRC)/Makefile | awk -F= '/^SUBLEVEL =/ {print $$2}' | \
+KSUBLEVEL=$(shell cat $(KSRC)/Makefile 2> /dev/null | awk -F= '/^SUBLEVEL =/ {print $$2}' | \
sed 's/^[ \t]*//;s/[ \t]*$$//')
+KSUBLEVEL?=$(shell echo $OSNAME | sed -n 's/.\..\.\([[:digit:]]*\)\..*/\1/p')
+
ifeq ($(OSNAME),Linux)
ifeq ($(KSUBLEVEL),11)
IPC_CFLAGS=-DNETLINK_ISCSI=12 -D_GNU_SOURCE
