From 2f7beffd96cc45ba31338f99a9ce23cb70a0c4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 14 Sep 2017 11:47:44 +0200 Subject: [PATCH] build: move intel NIC patches --- Makefile | 18 +++++++++--------- .../intel/e1000e/e1000e_4.10_compat.patch | 0 .../intel/e1000e/e1000e_4.10_max-mtu.patch | 0 .../intel/igb/igb_4.10_compat.patch | 0 .../intel/igb/igb_4.10_max-mtu.patch | 0 .../intel/igb/igb_4.9_compat.patch | 0 .../intel/intel-module-gcc6-compat.patch | 0 .../intel/ixgbe/ixgbe_4.10_compat.patch | 0 .../intel/ixgbe/ixgbe_4.10_max-mtu.patch | 0 9 files changed, 9 insertions(+), 9 deletions(-) rename e1000e_4.10_compat.patch => patches/intel/e1000e/e1000e_4.10_compat.patch (100%) rename e1000e_4.10_max-mtu.patch => patches/intel/e1000e/e1000e_4.10_max-mtu.patch (100%) rename igb_4.10_compat.patch => patches/intel/igb/igb_4.10_compat.patch (100%) rename igb_4.10_max-mtu.patch => patches/intel/igb/igb_4.10_max-mtu.patch (100%) rename igb_4.9_compat.patch => patches/intel/igb/igb_4.9_compat.patch (100%) rename intel-module-gcc6-compat.patch => patches/intel/intel-module-gcc6-compat.patch (100%) rename ixgbe_4.10_compat.patch => patches/intel/ixgbe/ixgbe_4.10_compat.patch (100%) rename ixgbe_4.10_max-mtu.patch => patches/intel/ixgbe/ixgbe_4.10_max-mtu.patch (100%) diff --git a/Makefile b/Makefile index 755b013..85429e4 100644 --- a/Makefile +++ b/Makefile @@ -244,9 +244,9 @@ e1000e.ko e1000e: .compile_mark ${E1000ESRC} rm -rf ${E1000EDIR} tar xf ${E1000ESRC} [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false) - cd ${E1000EDIR}; patch -p1 < ../intel-module-gcc6-compat.patch - cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_compat.patch - cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_max-mtu.patch + cd ${E1000EDIR}; patch -p1 < ../patches/intel/intel-module-gcc6-compat.patch + cd ${E1000EDIR}; patch -p1 < ../patches/intel/e1000e/e1000e_4.10_compat.patch + cd ${E1000EDIR}; patch -p1 < ../patches/intel/e1000e/e1000e_4.10_max-mtu.patch cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} cp ${E1000EDIR}/src/e1000e.ko e1000e.ko @@ -254,10 +254,10 @@ igb.ko igb: .compile_mark ${IGBSRC} rm -rf ${IGBDIR} tar xf ${IGBSRC} [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false) - cd ${IGBDIR}; patch -p1 < ../intel-module-gcc6-compat.patch - cd ${IGBDIR}; patch -p1 < ../igb_4.9_compat.patch - cd ${IGBDIR}; patch -p1 < ../igb_4.10_compat.patch - cd ${IGBDIR}; patch -p1 < ../igb_4.10_max-mtu.patch + cd ${IGBDIR}; patch -p1 < ../patches/intel/intel-module-gcc6-compat.patch + cd ${IGBDIR}; patch -p1 < ../patches/intel/igb/igb_4.9_compat.patch + cd ${IGBDIR}; patch -p1 < ../patches/intel/igb/igb_4.10_compat.patch + cd ${IGBDIR}; patch -p1 < ../patches/intel/igb/igb_4.10_max-mtu.patch cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} cp ${IGBDIR}/src/igb.ko igb.ko @@ -265,8 +265,8 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC} rm -rf ${IXGBEDIR} tar xf ${IXGBESRC} [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false) - cd ${IXGBEDIR}; patch -p1 < ../ixgbe_4.10_compat.patch - cd ${IXGBEDIR}; patch -p1 < ../ixgbe_4.10_max-mtu.patch + cd ${IXGBEDIR}; patch -p1 < ../patches/intel/ixgbe/ixgbe_4.10_compat.patch + cd ${IXGBEDIR}; patch -p1 < ../patches/intel/ixgbe/ixgbe_4.10_max-mtu.patch cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko diff --git a/e1000e_4.10_compat.patch b/patches/intel/e1000e/e1000e_4.10_compat.patch similarity index 100% rename from e1000e_4.10_compat.patch rename to patches/intel/e1000e/e1000e_4.10_compat.patch diff --git a/e1000e_4.10_max-mtu.patch b/patches/intel/e1000e/e1000e_4.10_max-mtu.patch similarity index 100% rename from e1000e_4.10_max-mtu.patch rename to patches/intel/e1000e/e1000e_4.10_max-mtu.patch diff --git a/igb_4.10_compat.patch b/patches/intel/igb/igb_4.10_compat.patch similarity index 100% rename from igb_4.10_compat.patch rename to patches/intel/igb/igb_4.10_compat.patch diff --git a/igb_4.10_max-mtu.patch b/patches/intel/igb/igb_4.10_max-mtu.patch similarity index 100% rename from igb_4.10_max-mtu.patch rename to patches/intel/igb/igb_4.10_max-mtu.patch diff --git a/igb_4.9_compat.patch b/patches/intel/igb/igb_4.9_compat.patch similarity index 100% rename from igb_4.9_compat.patch rename to patches/intel/igb/igb_4.9_compat.patch diff --git a/intel-module-gcc6-compat.patch b/patches/intel/intel-module-gcc6-compat.patch similarity index 100% rename from intel-module-gcc6-compat.patch rename to patches/intel/intel-module-gcc6-compat.patch diff --git a/ixgbe_4.10_compat.patch b/patches/intel/ixgbe/ixgbe_4.10_compat.patch similarity index 100% rename from ixgbe_4.10_compat.patch rename to patches/intel/ixgbe/ixgbe_4.10_compat.patch diff --git a/ixgbe_4.10_max-mtu.patch b/patches/intel/ixgbe/ixgbe_4.10_max-mtu.patch similarity index 100% rename from ixgbe_4.10_max-mtu.patch rename to patches/intel/ixgbe/ixgbe_4.10_max-mtu.patch