diff options
| author |   Aihua Li <aihua.li@huawei.com> | 2015-03-27 05:47:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-03-27 05:47:26 +0000 |
| commit | 1056320ef40a7d7111c2c304612f5b01dc62073a (patch) | |
| tree | 2d7f2778a15e1f0211999d6d34cd2c438c8fe6b1 | |
| parent | 6eb90ce135c0e9f7f2e16b82cb29f7c1cf880066 (diff) | |
| parent | da2a139db3043c22c8e6cb3dd330f1b7a4a5acd3 (diff) | |
Merge "src: added mechanism to pull upstream packages and provided single top-level make"
| -rw-r--r-- | src/dpdk/Makefile | 2 | ||||
| -rw-r--r-- | src/package-list.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile index c6cc7bb1..4e99944b 100644 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -62,6 +62,6 @@ $(WORK_DIR): $(TAG_DONE_FLAG): $(WORK_DIR) $(AT)cd $(WORK_DIR); git checkout $(DPDK_TAG) $(AT)sed -i 's/CONFIG_RTE_BUILD_COMBINE_LIBS=n/CONFIG_RTE_BUILD_COMBINE_LIBS=y/g' $(CONFIG_FILE) - # KNI was causing the 1.6.0 build to fail + $(AT)sed -i 's/CONFIG_RTE_LIBRTE_VHOST=n/CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE) $(AT)sed -i 's/CONFIG_RTE_LIBRTE_KNI=y /CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE) $(AT)touch $@ diff --git a/src/package-list.mk b/src/package-list.mk index 0e64457b..0dbdbd29 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -6,8 +6,8 @@ # dpdk section # DPDK_URL ?= git://dpdk.org/dpdk DPDK_URL ?= http://dpdk.org/git/dpdk -DPDK_TAG ?= v1.6.0r0 +DPDK_TAG ?= v1.8.0 # OVS section OVS_URL ?= https://github.com/openvswitch/ovs -OVS_TAG ?= v2.3.1 +OVS_TAG ?= da79ce2b71dd879e7f20fdddc715568f6a74185a |