meta-isg: dpdk: rearrange common meta-data from dpdk_1.8.0.bb into dpdk.inc

Extract out common meta-data from dpdk_1.8.0.bb into dpdk.inc for better
scalability into future dpdk.

Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

2 files changed, 24 insertions, 32 deletions

diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
index e1670c50..41251269 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
@@ -18,6 +18,25 @@ export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib"
 export RTE_KERNELDIR = "${STAGING_KERNEL_DIR}"
 export RTE_KERNELDIR_OUT = "${STAGING_KERNEL_BUILDDIR}"
 export INSTALL_PATH = "${prefix}/dpdk"
+export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}"
+export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}"
+
+# The list of intel Comms platforms and their target machine
+# process mapping. The supported target machine is listed under
+# dpdk/mk/machine
+def get_dpdk_target_mach(bb, d):
+    target_arch = d.getVar('MACHINE_ARCH', True)
+    multiarch_options = {
+        "mohonpeak64":    "atm",
+        "mohonpeak32":    "atm",
+        "crystalforest":  "ivb",
+        "romley":         "snd",
+        "romley-ivb":     "ivb",
+    }
+
+    if target_arch in multiarch_options :
+            return multiarch_options[target_arch]
+    return ""
 
 do_configure () {
         #############################################################
@@ -38,6 +57,11 @@ do_compile () {
                    EXTRA_CFLAGS="--sysroot=${STAGING_DIR_HOST} -I${STAGING_INCDIR}" \
                    CROSS="${TARGET_PREFIX}" \
                    prefix=""  LDFLAGS=""  WERROR_FLAGS="-w" V=1
+
+        cd ${S}/examples/
+        oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR}" \
+                   EXTRA_CFLAGS="--sysroot=${STAGING_DIR_HOST} -I${STAGING_INCDIR}" \
+                   CROSS="${TARGET_PREFIX}" O="${S}/examples/$@/"
 }
 
 do_install () {
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 7a278b60..a0f8d8a8 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
@@ -24,38 +24,6 @@ PACKAGECONFIG[dpdk_qat] = ",,qat"
 PACKAGECONFIG[vhost] = ",,fuse"
 PACKAGECONFIG[libvirt] = ",,libvirt"
 
-# The list of intel Comms platforms and their target machine
-# process mapping. The supported target machine is listed under
-# dpdk/mk/machine
-def get_dpdk_target_mach(bb, d):
-    target_arch = d.getVar('MACHINE_ARCH', True)
-    multiarch_options = {
-        "mohonpeak64":    "atm",
-        "mohonpeak32":    "atm",
-        "crystalforest":  "ivb",
-        "romley":         "snd",
-        "romley-ivb":     "ivb",
-    }
-
-    if target_arch in multiarch_options :
-            return multiarch_options[target_arch]
-    return ""
-
 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)}"
-export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}"
-export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}"
-
-do_compile_append () {
-
-        cd ${S}/examples/
-
-        ###############################################################
-        # In order to make use of dpdk.inc for example app installation
-        # without failure, override the default build directory
-        ###############################################################
-        oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR}" \
-                   EXTRA_CFLAGS="--sysroot=${STAGING_DIR_HOST} -I${STAGING_INCDIR}" \
-                   CROSS="${TARGET_PREFIX}" O="${S}/examples/$@/"
-}