X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=7412e4fde1dfee0ad6ef3b74baeddee0feceb917;hb=55443546e5d8d41c2435c2b5e1b8ef86a643f966;hp=ee7e39df54baf67e946b2b61e3c65256ceee29f5;hpb=ba15f16aeea67d7fda825870260eab2b611d5bff;p=pve-kernel-3.10.0.git

diff --git a/Makefile b/Makefile
index ee7e39d..7412e4f 100644
--- a/Makefile
+++ b/Makefile
@@ -36,24 +36,28 @@ E1000ESRC=${E1000EDIR}.tar.gz
 IGBDIR=igb-5.0.6
 IGBSRC=${IGBDIR}.tar.gz
 
-#IXGBEDIR=ixgbe-3.18.7
-#IXGBESRC=${IXGBEDIR}.tar.gz
+IXGBEDIR=ixgbe-3.18.7
+IXGBESRC=${IXGBEDIR}.tar.gz
 
-#BNX2DIR=netxtreme2-7.6.62
-#BNX2SRC=${BNX2DIR}.tar.gz
+BNX2DIR=netxtreme2-7.8.56
+BNX2SRC=${BNX2DIR}.tar.gz
 
-#AACRAIDSRC=aacraid-1.2.1-30300.src.rpm
-#AACRAIDDIR=aacraid-1.2.1
+AACRAIDVER=1.2.1-40300
+AACRAIDDIR=aacraid-${AACRAIDVER}.src
+AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
 
+# kernel contains newer version 06.700.06.00-rc1
 #MEGARAID_DIR=megaraid_sas-06.600.18.00
 #MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
 
-#ARECADIR=arcmsr-1.30.0X.16-20131206
-#ARECASRC=${ARECADIR}.zip
+ARECADIR=arcmsr-1.30.0X.16-20131206
+ARECASRC=${ARECADIR}.zip
 
+# this one does not compile with newer 3.10 kernels!
 #RR272XSRC=RR272x_1x-Linux-Src-v1.5-130325-0732.tar.gz
 #RR272XDIR=rr272x_1x-linux-src-v1.5
 
+# this project look dead - no updates since 3 years
 #ISCSITARGETDIR=iscsitarget-1.4.20.2
 #ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
 
@@ -86,34 +90,29 @@ fwlist-${KVNAME}: data
 	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@
 
-# ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko
-data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko
+data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.ko arcmsr.ko
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
 	install -m 644 ${KERNEL_SRC}/System.map tmp/boot/System.map-${KVNAME}
 	install -m 644 ${KERNEL_SRC}/arch/x86_64/boot/bzImage tmp/boot/vmlinuz-${KVNAME}
 	cd ${KERNEL_SRC}; make INSTALL_MOD_PATH=../tmp/ modules_install
-	## install latest ixgbe driver
-	#install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ixgbe/
+	# install latest ixgbe driver
+	install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/
 	# install latest e1000e driver
-	install -m 644 e1000e.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/e1000e/
+	install -m 644 e1000e.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/
 	# install latest ibg driver
-	install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/igb/
-	## install bnx2 drivers
-	#install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
-	#install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
-	#install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/bnx2x/
-	## install aacraid drivers
-	#install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
-	## install megaraid_sas driver
-	#install -m 644 megaraid_sas.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/megaraid/
+	install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
+	# install bnx2 drivers
+	install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/
+	install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/
+	install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/bnx2x/ethernet/broadcom/bnx2x/
+	# install aacraid drivers
+	install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
 	## install Highpoint 2710 RAID driver
 	#install -m 644 rr272x_1x.ko -D tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/rr272x_1x/rr272x_1x.ko
 	# install areca driver
-	#install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
-	## install iscsitarget module
-	#install -m 644 -D iscsi_trgt.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/iscsi_trgt.ko
+	install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
 	# remove firmware
 	rm -rf tmp/lib/firmware
 	# strip debug info
@@ -170,23 +169,14 @@ ${RHKERSRCDIR}/kernel.spec: ${KERNELSRCRPM}
 #	make -C ${TOP}/${RR272XDIR}/product/rr272x/linux KERNELDIR=${TOP}/${KERNEL_SRC}
 #	cp ${RR272XDIR}/product/rr272x/linux/$@ .
 
-#megaraid_sas.ko: .compile_mark ${MEGARAID_SRC}
-#	rm -rf ${MEGARAID_DIR}
-#	tar xf ${MEGARAID_SRC}
-#	mkdir -p /lib/modules/${KVNAME}
-#	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-#	make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${MEGARAID_DIR} modules
-#	cp ${MEGARAID_DIR}/megaraid_sas.ko .
-
-#aacraid.ko: .compile_mark ${AACRAIDSRC}
-#	rm -rf ${AACRAIDDIR}
-#	mkdir ${AACRAIDDIR}
-#	cd ${AACRAIDDIR};rpm2cpio ../${AACRAIDSRC} |cpio -i
-#	cd ${AACRAIDDIR};tar xzf aacraid_source.tgz	
-#	mkdir -p /lib/modules/${KVNAME}
-#	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-#	make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} modules
-#	cp ${AACRAIDDIR}/aacraid.ko .
+
+aacraid.ko: .compile_mark ${AACRAIDSRC}
+	rm -rf ${AACRAIDDIR}
+	tar xzf ${AACRAIDSRC}
+	mkdir -p /lib/modules/${KVNAME}
+	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+	make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR}/aacraid_source modules
+	cp ${AACRAIDDIR}/aacraid_source/aacraid.ko .
 
 e1000e.ko e1000e: .compile_mark ${E1000ESRC}
 	rm -rf ${E1000EDIR}
@@ -204,30 +194,30 @@ igb.ko igb: .compile_mark ${IGBSRC}
 	cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME}
 	cp ${IGBDIR}/src/igb.ko igb.ko
 
-#ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
-#	rm -rf ${IXGBEDIR}
-#	tar xf ${IXGBESRC}
-#	mkdir -p /lib/modules/${KVNAME}
-#	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-#	cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
-#	cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
+ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
+	rm -rf ${IXGBEDIR}
+	tar xf ${IXGBESRC}
+	mkdir -p /lib/modules/${KVNAME}
+	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+	cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
+	cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
 
-#bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC}
-#	rm -rf ${BNX2DIR}
-#	tar xf ${BNX2SRC}
-#	mkdir -p /lib/modules/${KVNAME}
-#	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-#	cd ${BNX2DIR}; make -C bnx2/src KVER=${KVNAME}
-#	cd ${BNX2DIR}; make -C bnx2x/src KVER=${KVNAME}
-#	cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.ko` .
+bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC}
+	rm -rf ${BNX2DIR}
+	tar xf ${BNX2SRC}
+	mkdir -p /lib/modules/${KVNAME}
+	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+	cd ${BNX2DIR}; make -C bnx2/src KVER=${KVNAME}
+	cd ${BNX2DIR}; make -C bnx2x/src KVER=${KVNAME}
+	cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.ko` .
 
-#arcmsr.ko: .compile_mark ${ARECASRC}
-#	rm -rf ${ARECADIR}
-#	mkdir ${ARECADIR}; cd ${ARECADIR}; unzip ../${ARECASRC}
-#	mkdir -p /lib/modules/${KVNAME}
-#	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-#	cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} modules
-#	cp ${ARECADIR}/arcmsr.ko arcmsr.ko
+arcmsr.ko: .compile_mark ${ARECASRC}
+	rm -rf ${ARECADIR}
+	mkdir ${ARECADIR}; cd ${ARECADIR}; unzip ../${ARECASRC}
+	mkdir -p /lib/modules/${KVNAME}
+	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+	cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} modules
+	cp ${ARECADIR}/arcmsr.ko arcmsr.ko
 
 #iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
 #	rm -rf ${ISCSITARGETDIR}
@@ -312,7 +302,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} iscsi_trgt.ko ${ISCSITARGETDIR} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} megaraid_sas.ko ${MEGARAID_DIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR}
+	rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR}