diff options
author | Ruslan Babayev <ruslan@babayev.com> | 2016-06-29 01:34:17 -0700 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2016-06-29 10:34:17 +0200 |
commit | d515d72aba2cec1d11ebe19108d0425354819f4b (patch) | |
tree | b340d472f754451db222854b6c479b51e38d7cce /pkgs | |
parent | 3afa2460386b1472128e302d1db13dba54e68e12 (diff) |
dpdk: pktgen: odp-dpdk: upgrades (#16585)
* dpdk: fix a typo * dpdk: separate configure phase * odp-dpdk: 1.8.0.0 -> 1.10.1.0 * pktgen: 3.0.00 -> 3.0.04 * pktgen: add withGtk build option
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/dpdk/default.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/odp-dpdk/default.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pktgen/default.nix | 22 |
3 files changed, 24 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index b346554c9c653..9d1d3d666ace3 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -16,14 +16,17 @@ stdenv.mkDerivation rec { RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; - # we need ssse3 instructions to build + # we need sse3 instructions to build NIX_CFLAGS_COMPILE = [ "-march=core2" ]; enableParallelBuilding = true; outputs = [ "out" "kmod" "examples" ]; - buildPhase = '' + configurePhase = '' make T=x86_64-native-linuxapp-gcc config + ''; + + buildPhase = '' make T=x86_64-native-linuxapp-gcc install make T=x86_64-native-linuxapp-gcc examples ''; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 85a6675ee9079..faf57450ce134 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "odp-dpdk-${version}"; - version = "1.8.0.0"; + version = "1.10.1.0"; src = fetchgit { url = "https://git.linaro.org/lng/odp-dpdk.git"; - rev = "438a207a39bad213cdc03929452a8199caef5d8c"; - sha256 = "0k4g5zbirbfdcgqz0nbn9san66y178qnigyvrr2apj3apzjjy7zv"; + rev = "0ed1ced007d98980f90604675083bf30c354e867"; + sha256 = "1kf090bizr0p0cxn525qpmypb5j86imvxrfpmwbl7vqqfh74j5ax"; }; nativeBuildInputs = [ autoreconfHook bash ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace scripts/git_hash.sh --replace /bin/bash /bin/sh + substituteInPlace scripts/get_impl_str.sh --replace /bin/bash /bin/sh echo -n ${version} > .scmversion ''; @@ -26,7 +27,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-platform=linux-dpdk" "--disable-shared" - "--disable-shared-dpdk" "--with-sdk-install-path=${dpdk}/${RTE_TARGET}" ]; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 456e9a4679ce7..5154ccce1b490 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,26 +1,34 @@ -{ stdenv, fetchurl, dpdk, libpcap, utillinux }: +{ stdenv, fetchurl, dpdk, libpcap, utillinux +, pkgconfig +, gtk, withGtk ? false +}: stdenv.mkDerivation rec { name = "pktgen-${version}"; - version = "3.0.00"; + version = "3.0.04"; src = fetchurl { url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.gz"; - sha256 = "703f8bd615aa4ae3a3085055483f9889dda09d082abb58afd33c1ba7c766ea65"; + sha256 = "0vrmbpl8zaal5zjwyzlx0y3d6jydfxdmf0psdj7ic37h5yh2iv2q"; }; - buildInputs = [ dpdk libpcap ]; + nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ]; + + buildInputs = + [ dpdk libpcap ] + ++ stdenv.lib.optionals withGtk [gtk]; RTE_SDK = "${dpdk}"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; + GUI = stdenv.lib.optionalString withGtk "true"; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = [ "-march=core2" ]; - patchPhase = '' - sed -i -e s:/usr/local:$out:g lib/lua/src/luaconf.h - sed -i -e s:/usr/bin/lscpu:${utillinux}/bin/lscpu:g lib/common/wr_lscpu.h + postPatch = '' + substituteInPlace lib/lua/src/luaconf.h --replace /usr/local $out + substituteInPlace lib/common/wr_lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu ''; installPhase = '' |