From 6ab74151605998436d2480d90d6d5d9efeab1d91 Mon Sep 17 00:00:00 2001
From: Ting Liu <ting.liu@nxp.com>
Date: Thu, 14 Oct 2021 16:42:40 +0800
Subject: [PATCH] ovs-dpdk: upgrade to 2.15

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb | 48 --------------------
 recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb   | 36 +++++++++++++++
 2 files changed, 36 insertions(+), 48 deletions(-)
 delete mode 100644 recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb
 create mode 100644 recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb

diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb
deleted file mode 100644
index f9d32773..00000000
--- a/recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "OVS DPDK"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab"
-
-DEPENDS = "dpdk python3-six-native coreutils-native"
-RDEPENDS:${PN} = "bash libcrypto libssl python3"
-
-inherit python3native
-
-SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ovs-dpdk;nobranch=1"
-SRCREV = "072130412196029bcc284e353023d81019a8daa7"
-
-S = "${WORKDIR}/git"
-
-DPAA_VER ?= "dpaa"
-export RTE_TARGET = "${ARCH}-${DPAA_VER}-linuxapp-gcc"
-
-EXTRA_OEMAKE += 'ARCH="${ARCH}" CROSS="${TARGET_PREFIX}" \
-    CPU_CFLAGS="--sysroot=${STAGING_DIR_HOST}" RTE_SDK="${S}" \
-    OPENSSL_PATH="${STAGING_DIR_HOST}" RTE_KERNELDIR="${STAGING_KERNEL_DIR}" \
-    RTE_KERNELDIR_OUT="${STAGING_KERNEL_BUILDDIR}" \
-'
-
-do_configure() {
-	export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR}
-	${S}/boot.sh
-	${S}/configure --host aarch64-fsl-linux --with-dpdk=${SYSROOT_DPDK}/usr/share/${RTE_TARGET} --with-openssl=${SYSROOT_DPDK}/usr CFLAGS="-g -Wno-cast-align -Ofast" 
-}
-
-do_compile() {
-	oe_runmake O="${RTE_TARGET}" T="${RTE_TARGET}" 
-}
-
-do_install() {
-	install -d ${D}${bindir}/ovs-dpdk
-	cp -rf  ${S}/ovsdb/ovsdb-tool ${D}${bindir}/ovs-dpdk
-	cp -rf  ${S}/ovsdb/ovsdb-server ${D}${bindir}/ovs-dpdk
-	cp -rf  ${S}/vswitchd/vswitch.ovsschema ${D}${bindir}/ovs-dpdk
-	cp -rf  ${S}/vswitchd/ovs-vswitchd ${D}${bindir}/ovs-dpdk
-	cp -rf  ${S}/utilities/ovs-vsctl ${D}${bindir}/ovs-dpdk
-	cp -rf  ${S}/utilities/ovs-ofctl ${D}${bindir}/ovs-dpdk
-	chmod 777 -R ${D}${bindir}/ovs-dpdk/*
-}
-
-ALLOW_EMPTY:${PN} = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb
new file mode 100644
index 00000000..fb41b457
--- /dev/null
+++ b/recipes-extended/ovs-dpdk/ovs-dpdk_2.15.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "OVS DPDK"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab"
+
+DEPENDS = "dpdk python3-six-native coreutils-native autoconf-native automake-native"
+RDEPENDS:${PN} = "bash libcrypto libssl python3"
+
+inherit python3native pkgconfig
+
+SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ovs-dpdk;nobranch=1"
+SRCREV = "f2c0744d2f68c4cd2840d6e409d7b0520e4caf99"
+
+S = "${WORKDIR}/git"
+
+do_configure() {
+	export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR}
+	${S}/boot.sh
+	${S}/configure --host aarch64-fsl-linux --with-dpdk=static --with-openssl=${SYSROOT_DPDK}/usr CFLAGS="-g -Wno-cast-align -Ofast" 
+}
+
+do_install:append() {
+        install -d ${D}${bindir}/ovs-dpdk
+        cp -rf  ${S}/ovsdb/ovsdb-tool ${D}${bindir}/ovs-dpdk
+        cp -rf  ${S}/ovsdb/ovsdb-server ${D}${bindir}/ovs-dpdk
+        cp -rf  ${S}/ovsdb/ovsdb-client ${D}${bindir}/ovs-dpdk
+        cp -rf  ${S}/vswitchd/vswitch.ovsschema ${D}${bindir}/ovs-dpdk
+        cp -rf  ${S}/vswitchd/ovs-vswitchd ${D}${bindir}/ovs-dpdk
+        cp -rf  ${S}/utilities/ovs-vsctl ${D}${bindir}/ovs-dpdk
+        cp -rf  ${S}/utilities/ovs-ofctl ${D}${bindir}/ovs-dpdk
+        chmod 777 -R ${D}${bindir}/ovs-dpdk/*
+}
+
+ALLOW_EMPTY:${PN} = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
-- 
2.40.1