switch to in-tree intel drivers
as the out-of-tree ones are not compatible with 4.15
This commit is contained in:
		
							parent
							
								
									15baf5b4c2
								
							
						
					
					
						commit
						2454b79d7a
					
				
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							| @ -52,7 +52,9 @@ ZFSDIR=pkg-zfs | |||||||
| ZFSSRC=${ZFSONLINUX_SUBMODULE}/zfs-debian | ZFSSRC=${ZFSONLINUX_SUBMODULE}/zfs-debian | ||||||
| 
 | 
 | ||||||
| MODULES=modules | MODULES=modules | ||||||
| MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${IXGBEDIR} ${SPLDIR} ${ZFSDIR} | #intel out-of-tree drivers disabled for now - incompatible with 4.15
 | ||||||
|  | #MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${IXGBEDIR} ${SPLDIR} ${ZFSDIR}
 | ||||||
|  | MODULE_DIRS=${SPLDIR} ${ZFSDIR} | ||||||
| 
 | 
 | ||||||
| # exported to debian/rules via debian/rules.d/dirs.mk
 | # exported to debian/rules via debian/rules.d/dirs.mk
 | ||||||
| DIRS=KERNEL_SRC E1000EDIR IGBDIR IXGBEDIR SPLDIR ZFSDIR MODULES | DIRS=KERNEL_SRC E1000EDIR IGBDIR IXGBEDIR SPLDIR ZFSDIR MODULES | ||||||
|  | |||||||
							
								
								
									
										17
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										17
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							| @ -99,12 +99,13 @@ binary: install | |||||||
| 	install -m 644 ${KERNEL_SRC}/System.map debian/${PVE_KERNEL_PKG}/boot/System.map-${KVNAME} | 	install -m 644 ${KERNEL_SRC}/System.map debian/${PVE_KERNEL_PKG}/boot/System.map-${KVNAME} | ||||||
| 	install -m 644 ${KERNEL_SRC}/${KERNEL_IMAGE_PATH} debian/${PVE_KERNEL_PKG}/boot/${KERNEL_INSTALL_FILE}-${KVNAME} | 	install -m 644 ${KERNEL_SRC}/${KERNEL_IMAGE_PATH} debian/${PVE_KERNEL_PKG}/boot/${KERNEL_INSTALL_FILE}-${KVNAME} | ||||||
| 	${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install | 	${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install | ||||||
| 	## install latest ibg driver | # disabled for now, incompatbile with 4.15 | ||||||
| 	install -m 644 ${MODULES}/igb.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/ | #	## install latest ibg driver | ||||||
| 	# install latest ixgbe driver | #	install -m 644 ${MODULES}/igb.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/ | ||||||
| 	install -m 644 ${MODULES}/ixgbe.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/ | #	# install latest ixgbe driver | ||||||
| 	# install latest e1000e driver | #	install -m 644 ${MODULES}/ixgbe.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/ | ||||||
| 	install -m 644 ${MODULES}/e1000e.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/ | #	# install latest e1000e driver | ||||||
|  | #	install -m 644 ${MODULES}/e1000e.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/ | ||||||
| 	# install zfs drivers | 	# install zfs drivers | ||||||
| 	install -d -m 0755 debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs | 	install -d -m 0755 debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs | ||||||
| 	install -m 644 $(addprefix ${MODULES}/,spl.ko splat.ko zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko icp.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs | 	install -m 644 $(addprefix ${MODULES}/,spl.ko splat.ko zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko icp.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs | ||||||
| @ -152,7 +153,9 @@ binary: install | |||||||
| 	ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build | 	ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build | ||||||
| 	touch $@ | 	touch $@ | ||||||
| 
 | 
 | ||||||
| .modules_compile_mark: $(addprefix ${MODULES}/,igb.ko ixgbe.ko e1000e.ko spl.ko zfs.ko) | # intel out-of-tree drivers disabled for now - incompatible with 4.15 | ||||||
|  | #.modules_compile_mark: $(addprefix ${MODULES}/,igb.ko ixgbe.ko e1000e.ko spl.ko zfs.ko) | ||||||
|  | .modules_compile_mark: $(addprefix ${MODULES}/,spl.ko zfs.ko) | ||||||
| 	touch $@ | 	touch $@ | ||||||
| 
 | 
 | ||||||
| ${MODULES}/spl.ko: .compile_mark | ${MODULES}/spl.ko: .compile_mark | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Fabian Grünbichler
						Fabian Grünbichler