This cleans up the versioned recipes and moves the common fragments to the include so to make the maintenance easy.
Signed-off-by: Awais Belal <awais_be...@mentor.com> --- recipes-extended/dpdk/dpdk.inc | 8 +++++++- recipes-extended/dpdk/dpdk_17.11.1.bb | 9 --------- recipes-extended/dpdk/dpdk_18.02.bb | 10 ---------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index 69259d3..4c6cfd9 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc @@ -14,7 +14,7 @@ SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \ COMPATIBLE_MACHINE = "null" COMPATIBLE_HOST_libc-musl_class-target = "null" - +COMPATIBLE_HOST_linux-gnux32 = "null" # dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat. # fuse is in meta-filesystems and qat is not yet upstreamed. @@ -53,6 +53,9 @@ export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}" export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}" export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac" +export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" +export ARCHDIR = "generic" + # The list of intel Comms platforms and their target machine # process mapping. The supported target machine is listed under # dpdk/mk/machine @@ -81,6 +84,9 @@ do_configure () { sed -e "s#CONFIG_RTE_LIBRTE_VHOST_NUMA=.*#CONFIG_RTE_LIBRTE_VHOST_NUMA=${CONFIG_HAVE_NUMA}#" -i ${S}/config/common_linuxapp sed -e "s#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=.*#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=${CONFIG_HAVE_NUMA}#" -i ${S}/config/common_linuxapp + # Fix-up CONFIG_RTE_LIBRTE_POWER based on package config for libvirt + sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/common_linuxapp + make O=$RTE_TARGET T=$RTE_TARGET config } diff --git a/recipes-extended/dpdk/dpdk_17.11.1.bb b/recipes-extended/dpdk/dpdk_17.11.1.bb index e323bf2..840f425 100644 --- a/recipes-extended/dpdk/dpdk_17.11.1.bb +++ b/recipes-extended/dpdk/dpdk_17.11.1.bb @@ -8,12 +8,3 @@ SRC_URI[dpdk.md5sum] = "75a2f0922baadc19dc8a222a7547798a" SRC_URI[dpdk.sha256sum] = "47f43a3ef66cc351ab639ae313830dc08760089c7d227e5f73daa0d6df38b201" S = "${WORKDIR}/${BPN}-stable-${PV}" -export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" -export ARCHDIR = "generic" - -do_configure_prepend () { - sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/common_linuxapp -} - -COMPATIBLE_HOST_linux-gnux32 = "null" -COMPATIBLE_HOST_libc-musl_class-target = "null" diff --git a/recipes-extended/dpdk/dpdk_18.02.bb b/recipes-extended/dpdk/dpdk_18.02.bb index 8a21714..3155d1b 100644 --- a/recipes-extended/dpdk/dpdk_18.02.bb +++ b/recipes-extended/dpdk/dpdk_18.02.bb @@ -12,13 +12,3 @@ SRC_URI += "\ SRC_URI[dpdk.md5sum] = "49d08ced0a978a71cc3942af5cf51b95" SRC_URI[dpdk.sha256sum] = "f1210310fd5f01a3babe3a09d9b3e5a9db791c2ec6ecfbf94ade9f893a0632b8" - -export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" -export ARCHDIR = "generic" - -do_configure_prepend () { - sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/common_linuxapp -} - -COMPATIBLE_HOST_linux-gnux32 = "null" -COMPATIBLE_HOST_libc-musl_class-target = "null" -- 2.7.4 -- _______________________________________________ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
