diff options
-rw-r--r-- | recipes-extended/dpdk/dpdk.inc | 21 | ||||
-rw-r--r-- | recipes-extended/dpdk/dpdk_19.11.0.bb | 16 |
2 files changed, 28 insertions, 9 deletions
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index 4b91403..068e751 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc | |||
@@ -62,6 +62,9 @@ DPDK_RTE_TARGET_x86 = "i686-native-linuxapp-gcc" | |||
62 | DPDK_RTE_TARGET_aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc" | 62 | DPDK_RTE_TARGET_aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc" |
63 | export RTE_TARGET = "${DPDK_RTE_TARGET}" | 63 | export RTE_TARGET = "${DPDK_RTE_TARGET}" |
64 | 64 | ||
65 | CONFIG_FILE_NAME = "common_linux" | ||
66 | TEST_DIR = "test" | ||
67 | |||
65 | # The list of intel Comms platforms and their target machine | 68 | # The list of intel Comms platforms and their target machine |
66 | # process mapping. The supported target machine is listed under | 69 | # process mapping. The supported target machine is listed under |
67 | # dpdk/mk/machine | 70 | # dpdk/mk/machine |
@@ -83,14 +86,14 @@ do_configure () { | |||
83 | sed -e "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#" -i ${S}/config/defconfig_${RTE_TARGET} | 86 | sed -e "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#" -i ${S}/config/defconfig_${RTE_TARGET} |
84 | 87 | ||
85 | # Fix-up vhost configs based on package config | 88 | # Fix-up vhost configs based on package config |
86 | sed -e "s#CONFIG_RTE_KNI_VHOST=n#CONFIG_RTE_KNI_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/common_linuxapp | 89 | sed -e "s#CONFIG_RTE_KNI_VHOST=n#CONFIG_RTE_KNI_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME} |
87 | sed -e "s#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/common_linuxapp | 90 | sed -e "s#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME} |
88 | sed -e "s#CONFIG_RTE_LIBRTE_VHOST=n#CONFIG_RTE_LIBRTE_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/common_linuxapp | 91 | sed -e "s#CONFIG_RTE_LIBRTE_VHOST=n#CONFIG_RTE_LIBRTE_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/${CONFIG_NAME} |
89 | sed -e "s#CONFIG_RTE_LIBRTE_VHOST_NUMA=.*#CONFIG_RTE_LIBRTE_VHOST_NUMA=${CONFIG_HAVE_NUMA}#" -i ${S}/config/common_linuxapp | 92 | sed -e "s#CONFIG_RTE_LIBRTE_VHOST_NUMA=.*#CONFIG_RTE_LIBRTE_VHOST_NUMA=${CONFIG_HAVE_NUMA}#" -i ${S}/config/${CONFIG_NAME} |
90 | sed -e "s#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=.*#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=${CONFIG_HAVE_NUMA}#" -i ${S}/config/common_linuxapp | 93 | sed -e "s#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=.*#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=${CONFIG_HAVE_NUMA}#" -i ${S}/config/${CONFIG_NAME} |
91 | 94 | ||
92 | # Fix-up CONFIG_RTE_LIBRTE_POWER based on package config for libvirt | 95 | # Fix-up CONFIG_RTE_LIBRTE_POWER based on package config for libvirt |
93 | sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/common_linuxapp | 96 | sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/${CONFIG_NAME} |
94 | 97 | ||
95 | make O=$RTE_TARGET T=$RTE_TARGET config | 98 | make O=$RTE_TARGET T=$RTE_TARGET config |
96 | } | 99 | } |
@@ -109,10 +112,10 @@ do_compile () { | |||
109 | EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -O3 -I${STAGING_INCDIR}" \ | 112 | EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -O3 -I${STAGING_INCDIR}" \ |
110 | CROSS="${TARGET_PREFIX}" O="${S}/examples/$@/" | 113 | CROSS="${TARGET_PREFIX}" O="${S}/examples/$@/" |
111 | 114 | ||
112 | cd ${S}/test/ | 115 | cd ${S}/${TEST_DIR}/ |
113 | oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \ | 116 | oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \ |
114 | EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -O3 -I${STAGING_INCDIR}" \ | 117 | EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -O3 -I${STAGING_INCDIR}" \ |
115 | CROSS="${TARGET_PREFIX}" O="${S}/test/$@/" | 118 | CROSS="${TARGET_PREFIX}" O="${S}/${TEST_DIR}/$@/" |
116 | } | 119 | } |
117 | 120 | ||
118 | do_install () { | 121 | do_install () { |
@@ -131,7 +134,7 @@ do_install () { | |||
131 | done | 134 | done |
132 | done | 135 | done |
133 | 136 | ||
134 | oe_runmake -C test install DESTDIR=${D}${INSTALL_PATH}/test/ | 137 | oe_runmake -C ${TEST_DIR} install DESTDIR=${D}${INSTALL_PATH}/test/ |
135 | 138 | ||
136 | cp -r ${S}/mk ${D}${INSTALL_PATH}/ | 139 | cp -r ${S}/mk ${D}${INSTALL_PATH}/ |
137 | 140 | ||
diff --git a/recipes-extended/dpdk/dpdk_19.11.0.bb b/recipes-extended/dpdk/dpdk_19.11.0.bb new file mode 100644 index 0000000..7a6b9d8 --- /dev/null +++ b/recipes-extended/dpdk/dpdk_19.11.0.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | include dpdk.inc | ||
2 | |||
3 | CONFIG_NAME = "common_linux" | ||
4 | TEST_DIR = "app/test" | ||
5 | |||
6 | SRCREV = "7001c8fdb27357c67147c0a13cb3826e48c0f2bf" | ||
7 | |||
8 | LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2" | ||
9 | LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
10 | file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ | ||
11 | file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" | ||
12 | |||
13 | do_install_append () { | ||
14 | # Remove the unneeded dir | ||
15 | rm -rf ${D}/${INSTALL_PATH}/${RTE_TARGET}/app | ||
16 | } | ||