use parameter KVER instead it uses KSRC

diff --git a/Makefile b/Makefile
index 1fe71368a3f501d5b7e4ac90c69ff3716c957751..c5590cb2f446dcd8ab9ee8195364ec6894b97ad6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,7 @@ aoe.ko aoe: .compile_mark ${AOESRC}
        cd ${AOEDIR}; make KVER=${KVNAME}
        cp ${AOEDIR}/linux/drivers/block/aoe/aoe.ko aoe.ko
 
-e1000e.ko e1000e: ${E1000ESRC}
+e1000e.ko e1000e: .compile_mark ${E1000ESRC}
        rm -rf ${E1000EDIR}
        tar xf ${E1000ESRC}
        mkdir -p /lib/modules/${KVNAME}
@@ -166,7 +166,7 @@ e1000e.ko e1000e: ${E1000ESRC}
        cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME}
        cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
 
-igb.ko igb: ${IGBSRC}
+igb.ko igb: .compile_mark ${IGBSRC}
        rm -rf ${IGBDIR}
        tar xf ${IGBSRC}
        mkdir -p /lib/modules/${KVNAME}
@@ -174,7 +174,7 @@ igb.ko igb: ${IGBSRC}
        cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME}
        cp ${IGBDIR}/src/igb.ko igb.ko
 
-ixgbe.ko ixgbe: ${IXGBESRC}
+ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        rm -rf ${IXGBEDIR}
        tar xf ${IXGBESRC}
        mkdir -p /lib/modules/${KVNAME}
@@ -182,7 +182,7 @@ ixgbe.ko ixgbe: ${IXGBESRC}
        cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
        cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
 
-#arcmsr.ko: ${ARECASRC}
+#arcmsr.ko: .compile_mark ${ARECASRC}
 #      rm -rf ${ARECADIR}
 #      unzip ${ARECASRC}
 #      mkdir -p /lib/modules/${KVNAME}
@@ -190,12 +190,10 @@ ixgbe.ko ixgbe: ${IXGBESRC}
 #      cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} CONFIG_SCSI_ARCMSR=m SUBDIRS=${TOP}/${ARECADIR} modules
 #      cp ${ARECADIR}/arcmsr.ko arcmsr.ko
 
-iscsi_trgt.ko: ${ISCSITARGETSRC}
+iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
        rm -rf ${ISCSITARGETDIR}
        tar xf ${ISCSITARGETSRC}
-       mkdir -p /lib/modules/${KVNAME}
-       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-       cd ${ISCSITARGETDIR}; make KVER=${KVNAME}
+       cd ${ISCSITARGETDIR}; make KSRC=${TOP}/${KERNEL_SRC}
        cp ${ISCSITARGETDIR}/kernel/iscsi_trgt.ko iscsi_trgt.ko
 
 headers_tmp := $(CURDIR)/tmp-headers

diff --git a/changelog.Debian b/changelog.Debian
index e8976ec9716fdd2715adf76b4aba8ec64cc89cee..8c157c57269416ec7f2cb2496eb7313627edf9ac 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,6 +1,6 @@
 pve-kernel-2.6.32 (2.6.32-68) unstable; urgency=low
 
-  *  update to vzkernel-2.6.32-042stab055.10.src.rpm
+  * update to vzkernel-2.6.32-042stab055.10.src.rpm
 
  -- Proxmox Support Team <support@proxmox.com>  Tue, 15 May 2012 05:47:06 +0200