From 7334e925b44c7427d94fbc4959f04d654c14da9c Mon Sep 17 00:00:00 2001 From: Ruslan Babayev Date: Wed, 1 Jun 2016 16:35:35 -0700 Subject: [PATCH] dpdk: separate kernel modules --- pkgs/os-specific/linux/dpdk/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index a2657682f5d..e90e8585776 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-march=core2" ]; enableParallelBuilding = true; - outputs = [ "out" "examples" ]; + outputs = [ "out" "kmod" "examples" ]; buildPhase = '' make T=x86_64-native-linuxapp-gcc config @@ -30,7 +30,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - cp -pr x86_64-native-linuxapp-gcc/{lib,include,kmod} $out/ + cp -pr x86_64-native-linuxapp-gcc/{lib,include} $out/ + + mkdir -p $kmod/lib/modules/${kernel.modDirVersion}/kernel/drivers/net + cp ${RTE_TARGET}/kmod/*.ko $kmod/lib/modules/${kernel.modDirVersion}/kernel/drivers/net mkdir -p $examples/bin find examples ${RTE_TARGET}/app -type f -executable -exec cp {} $examples/bin \;