[pve-devel] [PATCH kernel 08/17] don't build DRBD9

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 Makefile | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index c2b7ec1..e0cc16f 100644
--- a/Makefile
+++ b/Makefile
@@ -73,10 +73,10 @@ ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
 SPL_MODULES=spl.ko splat.ko
 
 # DRBD9
-DRBDVER=9.0.6-1
-DRBDDIR=drbd-${DRBDVER}
-DRBDSRC=${DRBDDIR}.tar.gz
-DRBD_MODULES=drbd.ko drbd_transport_tcp.ko
+#DRBDVER=9.0.6-1
+#DRBDDIR=drbd-${DRBDVER}
+#DRBDSRC=${DRBDDIR}.tar.gz
+#DRBD_MODULES=drbd.ko drbd_transport_tcp.ko
 
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
@@ -171,7 +171,7 @@ fwlist-${KVNAME}: data
 	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@
 
-data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES}
+data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES}
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 ${KERNEL_SRC}/.config tmp/boot/config-${KVNAME}
@@ -190,7 +190,7 @@ data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DR
 	install -d -m 0755 tmp/lib/modules/${KVNAME}/zfs
 	install -m 644 ${SPL_MODULES} ${ZFS_MODULES} tmp/lib/modules/${KVNAME}/zfs
 	# install drbd9
-	install -m 644 ${DRBD_MODULES} tmp/lib/modules/${KVNAME}/kernel/drivers/block/drbd
+	#install -m 644 ${DRBD_MODULES} tmp/lib/modules/${KVNAME}/kernel/drivers/block/drbd
 	# remove firmware
 	rm -rf tmp/lib/firmware
 	# strip debug info
@@ -349,21 +349,21 @@ ${ZFS_MODULES}: .compile_mark ${ZFSSRC}
 	cp ${ZFSDIR}/module/zcommon/zcommon.ko zcommon.ko
 	cp ${ZFSDIR}/module/zpios/zpios.ko zpios.ko
 
-.PHONY: update-drbd
-update-drbd:
-	rm -rf ${DRBDDIR} ${DRBDSRC} drbd-9.0
-	git clone --recursive git://git.drbd.org/drbd-9.0
-	cd drbd-9.0; make tarball
-	mv drbd-9.0/${DRBDSRC} ${DRBDSRC} 
-
-.PHONY: drbd
-drbd ${DRBD_MODULES}: .compile_mark ${DRBDSRC}
-	rm -rf ${DRBDDIR}
-	tar xzf ${DRBDSRC}
-	[ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
-	cd ${DRBDDIR}; make KVER=${KVNAME} KDIR=${TOP}/${KERNEL_SRC}
-	mv ${DRBDDIR}/drbd/drbd.ko drbd.ko
-	mv ${DRBDDIR}/drbd/drbd_transport_tcp.ko drbd_transport_tcp.ko
+#.PHONY: update-drbd
+#update-drbd:
+#	rm -rf ${DRBDDIR} ${DRBDSRC} drbd-9.0
+#	git clone --recursive git://git.drbd.org/drbd-9.0
+#	cd drbd-9.0; make tarball
+#	mv drbd-9.0/${DRBDSRC} ${DRBDSRC} 
+#
+#.PHONY: drbd
+#drbd ${DRBD_MODULES}: .compile_mark ${DRBDSRC}
+#	rm -rf ${DRBDDIR}
+#	tar xzf ${DRBDSRC}
+#	[ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+#	cd ${DRBDDIR}; make KVER=${KVNAME} KDIR=${TOP}/${KERNEL_SRC}
+#	mv ${DRBDDIR}/drbd/drbd.ko drbd.ko
+#	mv ${DRBDDIR}/drbd/drbd_transport_tcp.ko drbd_transport_tcp.ko
 
 #iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
 #	rm -rf ${ISCSITARGETDIR}
-- 
2.1.4