[Pkg-iscsi-maintainers] [SCM] Debian iscsitarget packaging branch, master, updated. debian/1.4.20.1-1-3-g5dfde51

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit 5dfde510502cccd59b2aa01bf2f4dd7860c66dc1
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Fri May 14 00:12:29 2010 +0530

    use m-a's KVER value

diff --git a/debian/rules b/debian/rules
index 696a6fd..98deb73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,14 +52,12 @@ endif
 
 KERN_VER=$(shell echo $(KVERS) | cut -d "-" -f1)
 
-KVER=$(shell uname -r | cut -d "-" -f1)
-
 # Taken from upstream iscsitarget's Makefile
-KMAJ := $(shell echo $(KVER) | \
+KMAJ := $(shell echo $(KERN_VER) | \
 	sed -e 's/^\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*.*/\1/')
-KMIN := $(shell echo $(KVER) | \
+KMIN := $(shell echo $(KERN_VER) | \
 	sed -e 's/^[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*.*/\1/')
-KREV := $(shell echo $(KVER) | \
+KREV := $(shell echo $(KERN_VER) | \
 	sed -e 's/^[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/')
 
 kver_eq = $(shell [ $(KMAJ)$(KMIN)$(KREV) -eq $(1)$(2)$(3) ] && \
@@ -72,7 +70,7 @@ kver_gt = $(shell [ $(KMAJ)$(KMIN)$(KREV) -gt $(1)$(2)$(3) ] && \
 	echo 1 || echo 0)
 kver_ge = $(shell [ $(KMAJ)$(KMIN)$(KREV) -ge $(1)$(2)$(3) ] && \
 	echo 1 || echo 0)
-kver_lk = $(shell [ `echo $(KVER) | egrep $(1)` ] && echo 1 || echo 0)
+kver_lk = $(shell [ `echo $(KERN_VER) | egrep $(1)` ] && echo 1 || echo 0)
 
 
 # Compatibility patch for kernels <= 2.6.32

-- 
Debian iscsitarget packaging