diff options
author | WU CHIA CHUAN <chia.chuan.wu@intel.com> | 2015-07-10 21:23:50 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2015-07-10 08:17:08 -0700 |
commit | 97031827947b56dac4190970bf18376d3b55f323 (patch) | |
tree | 05dd87b4b09a6a564d8f0dad07de21e692829e26 /meta-isg/common | |
parent | 90189cb6226738a9241ff98d8bcff7442efbfe5a (diff) | |
download | meta-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/common')
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk.inc | 2 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb | 6 |
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 41251269..85b88fa0 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 a0f8d8a8..cab76cc4 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" | |||
27 | export CONFIG_EXAMPLE_DPDK_QAT = "${@base_contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}" | 27 | export CONFIG_EXAMPLE_DPDK_QAT = "${@base_contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}" |
28 | export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@base_contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}" | 28 | export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@base_contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}" |
29 | export CONFIG_VHOST_ENABLED = "${@base_contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}" | 29 | export CONFIG_VHOST_ENABLED = "${@base_contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}" |
30 | |||
31 | do_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 | } | ||