From 60585d192208ca1cbebe1c7723ebb4c9d4649046 Mon Sep 17 00:00:00 2001
From: Chunrong Guo <chunrong.guo@nxp.com>
Date: Wed, 10 Jul 2019 14:53:11 +0800
Subject: pktgen-dpdk:  Upgrade version to 3.6.6

include the following changes:
b3d08bb - update version number and log
7c4187c - add new portInfo lua data
0c39019 - Cleanup build, add plugin support and meson build not working
f6e9e33 - fix crash not resetting tty and other fixes
4199555 - Merge branch 'bug-fix'
3942af7 - fix Update to version 3.6.5
176df0a - fix ldflags order for lua lib
8c746d0 - minor message missing a word
5e29e43 - reorder the defines on the LDFLAGS line
6ed0bde - convert to DPDK network structs and fix offload code.
0e8ac37 - fix lua builds oni ubuntu 18.10
5b537c9 - change port command to use uint16_t
96776e5 - update .cfg file information
b5133f1 - add page stats screen
5b883b2 - add more color to static info
a0c5819 - convert all rte_delay_ms to rte_delay_us_sleep
83b1bfa - remove need for rte_timer_manage
4dcc2db - use faster timer routines then rte_timer_manage
cca5864 - remove cycles.h header
0d5d9ab - change cli_use_timers routine to run rte_timer_manage
7283ba7 - remove crc-strip option
b44f9e6 - remove init stats structure
a82bbf5 - fix formatting with spaces
81623f1 - update readme, version and changelog

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-extended/pktgen-dpdk/pktgen-dpdk_3.6.6.bb | 34 +++++++++++++++++++++++
 recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb   | 33 ----------------------
 2 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 recipes-extended/pktgen-dpdk/pktgen-dpdk_3.6.6.bb
 delete mode 100644 recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb

(limited to 'recipes-extended')

diff --git a/recipes-extended/pktgen-dpdk/pktgen-dpdk_3.6.6.bb b/recipes-extended/pktgen-dpdk/pktgen-dpdk_3.6.6.bb
new file mode 100644
index 00000000..29ed267e
--- /dev/null
+++ b/recipes-extended/pktgen-dpdk/pktgen-dpdk_3.6.6.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "PKTGEN DPDK"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=30ac8fa65a07ea7cc1c7ee84e1c80294"
+
+DEPENDS += "libpcap dpdk lua lua-native"
+
+SRC_URI = "git://dpdk.org/git/apps/pktgen-dpdk;protocol=https;nobranch=1 \
+"
+SRCREV = "b3d08bb3c29c999b261c7d74443da03079a012e9"
+
+S = "${WORKDIR}/git"
+
+DPAA_VER ?= "dpaa"
+export RTE_TARGET = "arm64-${DPAA_VER}-linuxapp-gcc"
+export RTE_SDK = "${RECIPE_SYSROOT}/usr/share/"
+
+EXTRA_OEMAKE += 'CC="${CC}" LD="${LD}"  RTE_SDK="${RECIPE_SYSROOT}/usr/share/" RTE_TARGET="arm64-${DPAA_VER}-linuxapp-gcc"'
+
+do_compile() {
+      unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS
+      oe_runmake  EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" 
+}
+
+do_install() {
+	install -d ${D}${bindir}/
+	cp -f  ${S}/app/arm64-dpaa-linuxapp-gcc/pktgen ${D}${bindir}/
+        cp -f  ${S}/Pktgen.lua ${D}${bindir}/
+}
+
+INSANE_SKIP_${PN} = "ldflags"
+INHIBIT_PACKAGE_STRIP = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PARALLEL_MAKE = ""
+COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb b/recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb
deleted file mode 100644
index 0a6d97de..00000000
--- a/recipes-extended/pktgen-dpdk/pktgen-dpdk_git.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "PKTGEN DPDK"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8120b89a783571da3cb492c35ac6b1f9"
-
-DEPENDS += "libpcap dpdk"
-
-SRC_URI = "git://dpdk.org/git/apps/pktgen-dpdk;protocol=http;nobranch=1"
-SRCREV = "ffbe7becf8dd75fd7d46b97b10374531878cb9c5"
-
-S = "${WORKDIR}/git"
-
-DPAA_VER ?= "dpaa"
-export RTE_TARGET = "arm64-${DPAA_VER}-linuxapp-gcc"
-export RTE_SDK = "${RECIPE_SYSROOT}/usr/share"
-
-EXTRA_OEMAKE += 'CC="${CC}" LD="${LD}"  RTE_SDK="${RECIPE_SYSROOT}/usr/share" RTE_TARGET="arm64-${DPAA_VER}-linuxapp-gcc"'
-
-do_compile() {
-      unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS
-      oe_runmake 
-}
-
-do_install() {
-	install -d ${D}${bindir}/
-	cp -f  ${S}/app/arm64-dpaa-linuxapp-gcc/pktgen ${D}${bindir}/
-        cp -f  ${S}/Pktgen.lua ${D}${bindir}/
-}
-
-INSANE_SKIP_${PN} = "ldflags"
-INHIBIT_PACKAGE_STRIP = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PARALLEL_MAKE = ""
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
-- 
cgit v1.2.3-54-g00ecf