From 97031827947b56dac4190970bf18376d3b55f323 Mon Sep 17 00:00:00 2001 From: WU CHIA CHUAN Date: Fri, 10 Jul 2015 21:23:50 +0800 Subject: 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 Signed-off-by: Ong Boon Leong Signed-off-by: Saul Wold --- meta-isg/common/recipes-extended/dpdk/dpdk.inc | 2 -- meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'meta-isg') 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 () { ${D}/${INSTALL_PATH}/tools \ ${D}/${INSTALL_PATH}/${RTE_TARGET} \ ${D}/${INSTALL_PATH}/${RTE_TARGET}/app \ - ${D}/${INSTALL_PATH}/${RTE_TARGET}/hostapp \ ${D}${includedir} \ ${D}${includedir}/${ARCHDIR} \ ${D}${includedir}/exec-env \ @@ -90,7 +89,6 @@ do_install () { # Install applications install -m 0755 ${S}/${RTE_TARGET}/app/* ${D}/${INSTALL_PATH}/${RTE_TARGET}/app/ - install -m 0755 ${S}/${RTE_TARGET}/hostapp/* ${D}/${INSTALL_PATH}/${RTE_TARGET}/hostapp/ # Install examples 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" export CONFIG_EXAMPLE_DPDK_QAT = "${@base_contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}" export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@base_contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}" export CONFIG_VHOST_ENABLED = "${@base_contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}" + +do_install_append () { + + install -m 0755 -d ${D}/${INSTALL_PATH}/${RTE_TARGET}/hostapp + install -m 0755 ${S}/${RTE_TARGET}/hostapp/* ${D}/${INSTALL_PATH}/${RTE_TARGET}/hostapp/ +} -- cgit v1.2.3-54-g00ecf