summaryrefslogtreecommitdiffstats
path: root/meta-isg
diff options
context:
space:
mode:
authorWU CHIA CHUAN <chia.chuan.wu@intel.com>2015-07-10 13:23:50 (GMT)
committerSaul Wold <sgw@linux.intel.com>2015-07-10 15:17:08 (GMT)
commit97031827947b56dac4190970bf18376d3b55f323 (patch)
tree05dd87b4b09a6a564d8f0dad07de21e692829e26 /meta-isg
parent90189cb6226738a9241ff98d8bcff7442efbfe5a (diff)
downloadmeta-intel-97031827947b56dac4190970bf18376d3b55f323.tar.gz
meta-isg: dpdk: move the do_install hostapp directory from dpdk.inc to dpdk_1.8.0.bb
dpdk.inc is common to dpdk_1.8.0.bb and dpdk_2.0.0.bb, since DPDK v2.0 is no longer have hostapp directory, so we only perform hostapp installation for DPDK v1.8. Signed-off-by: WU CHIA CHUAN <chia.chuan.wu@intel.com> Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta-isg')
-rw-r--r--meta-isg/common/recipes-extended/dpdk/dpdk.inc2
-rw-r--r--meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb6
2 files changed, 6 insertions, 2 deletions
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
index 4125126..85b88fa 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
@@ -71,7 +71,6 @@ do_install () {
71 ${D}/${INSTALL_PATH}/tools \ 71 ${D}/${INSTALL_PATH}/tools \
72 ${D}/${INSTALL_PATH}/${RTE_TARGET} \ 72 ${D}/${INSTALL_PATH}/${RTE_TARGET} \
73 ${D}/${INSTALL_PATH}/${RTE_TARGET}/app \ 73 ${D}/${INSTALL_PATH}/${RTE_TARGET}/app \
74 ${D}/${INSTALL_PATH}/${RTE_TARGET}/hostapp \
75 ${D}${includedir} \ 74 ${D}${includedir} \
76 ${D}${includedir}/${ARCHDIR} \ 75 ${D}${includedir}/${ARCHDIR} \
77 ${D}${includedir}/exec-env \ 76 ${D}${includedir}/exec-env \
@@ -90,7 +89,6 @@ do_install () {
90 89
91 # Install applications 90 # Install applications
92 install -m 0755 ${S}/${RTE_TARGET}/app/* ${D}/${INSTALL_PATH}/${RTE_TARGET}/app/ 91 install -m 0755 ${S}/${RTE_TARGET}/app/* ${D}/${INSTALL_PATH}/${RTE_TARGET}/app/
93 install -m 0755 ${S}/${RTE_TARGET}/hostapp/* ${D}/${INSTALL_PATH}/${RTE_TARGET}/hostapp/
94 92
95 # Install examples 93 # Install examples
96 for dirname in ${S}/examples/* 94 for dirname in ${S}/examples/*
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb b/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb
index a0f8d8a..cab76cc 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb
@@ -27,3 +27,9 @@ PACKAGECONFIG[libvirt] = ",,libvirt"
27export CONFIG_EXAMPLE_DPDK_QAT = "${@base_contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}" 27export CONFIG_EXAMPLE_DPDK_QAT = "${@base_contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}"
28export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@base_contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}" 28export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@base_contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
29export CONFIG_VHOST_ENABLED = "${@base_contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}" 29export CONFIG_VHOST_ENABLED = "${@base_contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}"
30
31do_install_append () {
32
33 install -m 0755 -d ${D}/${INSTALL_PATH}/${RTE_TARGET}/hostapp
34 install -m 0755 ${S}/${RTE_TARGET}/hostapp/* ${D}/${INSTALL_PATH}/${RTE_TARGET}/hostapp/
35}