JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21559 from abuibrahim/master

Browse Source 
update dpdk and related packages
This commit is contained in:
Joachim F 2017-01-01 04:28:13 +01:00 committed by GitHub
commit 777a75e324
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/dpdk/default.nix
View File

@ -4,11 +4,11 @@ assert lib.versionAtLeast kernel.version "3.18";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dpdk-${version}-${kernel.version}"; name = "dpdk-${version}-${kernel.version}";
version = "16.07"; version = "16.07.2";
src = fetchurl { src = fetchurl {
url = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${version}.tar.gz"; url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
sha256 = "1sgh55w3xpc0lb70s74cbyryxdjijk1fbv9b25jy8ms3lxaj966c"; sha256 = "1mzwazmzpq8mvwiham80y6h53qpvjpp76v0d58gz9bfiphbi9876";
}; };
buildInputs = [ pkgconfig libvirt ]; buildInputs = [ pkgconfig libvirt ];

12
pkgs/os-specific/linux/odp-dpdk/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "odp-dpdk-${version}"; name = "odp-dpdk-${version}";
version = "2016-08-16"; version = "1.12.0.0";
src = fetchgit { src = fetchgit {
url = "https://git.linaro.org/lng/odp-dpdk.git"; url = "https://git.linaro.org/lng/odp-dpdk.git";
rev = "7068593f600e2b5a23ee1780d5c722c54e966df1"; rev = "5e370e1113973feafb43a8e57d4c59be40e9aeab";
sha256 = "0pz0zkxqaac193x21wmj3x88gfza6bvhmv5yf8fzkpm9zxnl2sy4"; sha256 = "0rrakbxnbsqaj148xaz2hwxjvg3cmzlynfkvcp8w56sqyly75d0n";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
@ -16,12 +16,6 @@ stdenv.mkDerivation rec {
RTE_SDK = "${dpdk}"; RTE_SDK = "${dpdk}";
RTE_TARGET = "x86_64-native-linuxapp-gcc"; RTE_TARGET = "x86_64-native-linuxapp-gcc";
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
'';
dontDisableStatic = true; dontDisableStatic = true;
configureFlags = [ configureFlags = [

11
pkgs/os-specific/linux/pktgen/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pktgen-${version}"; name = "pktgen-${version}";
version = "3.0.13"; version = "3.1.0";
src = fetchurl { src = fetchurl {
url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.gz"; url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-v${version}.tar.gz";
sha256 = "64629b454ed8dc036d5e9bb30b3ae84a0bab0142b651c72da85ab1454e9ae0d6"; sha256 = "1a1dl8h8p76wlcjlvn736mz4nc2nc5c3764rlydiz86wl45mb0nb";
}; };
nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ]; nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ];
@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-march=core2" ]; NIX_CFLAGS_COMPILE = [ "-march=core2" ];
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 = '' installPhase = ''
install -d $out/bin install -d $out/bin
install -m 0755 app/app/${RTE_TARGET}/app/pktgen $out/bin install -m 0755 app/app/${RTE_TARGET}/app/pktgen $out/bin