[meta-intel] [meta-dpdk v3 1/3] dpdk_18.05: Make the LICENSE more accurate
Adjust the LICENSE according to the license files. Signed-off-by: Kevin Hao --- v3: A new patch. recipes-extended/dpdk/dpdk_18.05.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-extended/dpdk/dpdk_18.05.bb b/recipes-extended/dpdk/dpdk_18.05.bb index f914214b6e7e..108d6838aa6b 100644 --- a/recipes-extended/dpdk/dpdk_18.05.bb +++ b/recipes-extended/dpdk/dpdk_18.05.bb @@ -2,7 +2,7 @@ include dpdk.inc SRCREV = "a5dce6286cc56655320d975c67b0dbe08693" -LICENSE = "BSD & LGPLv2 & GPLv2" +LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2" LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" -- 2.14.4 -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk v3 2/3] Move two patches to the version specific bb
These two patches can't be applied to the new version DPDK, so move
them to the version specific bb.
Signed-off-by: Kevin Hao
---
v3: No change.
recipes-extended/dpdk/dpdk.inc| 2 --
recipes-extended/dpdk/dpdk_17.11.3.bb | 6 +-
recipes-extended/dpdk/dpdk_18.05.bb | 2 ++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 92042bb74d5d..a0e081a3a8fe 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -8,8 +8,6 @@ S = "${WORKDIR}/git"
SRC_URI = "git://dpdk.org/dpdk${STABLE};branch=${BRANCH} \
file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
- file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
- file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
"
COMPATIBLE_MACHINE = "null"
diff --git a/recipes-extended/dpdk/dpdk_17.11.3.bb
b/recipes-extended/dpdk/dpdk_17.11.3.bb
index b4b002332be7..7fc89d2d7cc8 100644
--- a/recipes-extended/dpdk/dpdk_17.11.3.bb
+++ b/recipes-extended/dpdk/dpdk_17.11.3.bb
@@ -8,4 +8,8 @@ LICENSE = "LGPLv2 & GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe\
file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI += "file://dpdk-17.11-Fix-strncpy-error-for-GCC8.patch"
+SRC_URI += "\
+file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
+file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
+file://dpdk-17.11-Fix-strncpy-error-for-GCC8.patch \
+"
diff --git a/recipes-extended/dpdk/dpdk_18.05.bb
b/recipes-extended/dpdk/dpdk_18.05.bb
index 108d6838aa6b..b6897a82c873 100644
--- a/recipes-extended/dpdk/dpdk_18.05.bb
+++ b/recipes-extended/dpdk/dpdk_18.05.bb
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM =
"file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4
file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
SRC_URI += "\
+file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
+file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \
file://0001-examples-Fix-maybe-uninitialized-warning.patch \
"
--
2.14.4
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk v3 3/3] Introduce the v18.11.1 bb
This is the latest LTS version.
Signed-off-by: Kevin Hao
---
v3: Drop the two unneeded patches and adjust the LICENSE.
recipes-extended/dpdk/dpdk_18.11.1.bb | 15 +++
1 file changed, 15 insertions(+)
create mode 100644 recipes-extended/dpdk/dpdk_18.11.1.bb
diff --git a/recipes-extended/dpdk/dpdk_18.11.1.bb
b/recipes-extended/dpdk/dpdk_18.11.1.bb
new file mode 100644
index ..2d0434651bc4
--- /dev/null
+++ b/recipes-extended/dpdk/dpdk_18.11.1.bb
@@ -0,0 +1,15 @@
+include dpdk.inc
+
+STABLE = "-stable"
+BRANCH = "18.11"
+SRCREV = "16ece46735c9b70b7033ca7ae095930e9038d9fd"
+
+LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2"
+LIC_FILES_CHKSUM =
"file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+
file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
+
file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
+
+do_install_append () {
+# Remove the unneeded dir
+rm -rf ${D}/${INSTALL_PATH}/${RTE_TARGET}/app
+}
--
2.14.4
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
Re: [meta-intel] [meta-dpdk v2 2/2] Introduce the v18.11.1 bb
On Mon, May 27, 2019 at 01:48:52AM +, Mittal, Anuj wrote:
> On Sun, 2019-05-26 at 14:54 +0800, Kevin Hao wrote:
> > > If not, we should probably just remove it in do_install_append and
> > not
> > > carry this patch.
> >
> > Do you mean something like this in the dpdk_18.11.1.bb:
> > do_install_append () {
> > # Remove the unneeded dir
> > dir=${D}/${INSTALL_PATH}/${RTE_TARGET}/app
> > test -d $dir && rm -rf $dir
> > }
>
> Yes but I don't think you need to check if the dir is present when
> using -f with rm.
OK, I will remove the test.
Thanks,
Kevin
>
> Thanks,
> Anuj
signature.asc
Description: PGP signature
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
Re: [meta-intel] [meta-dpdk v2 2/2] Introduce the v18.11.1 bb
On Fri, May 24, 2019 at 03:45:07AM +, Mittal, Anuj wrote:
> Hi Kevin,
>
> I have a few comments:
>
> On Fri, 2019-05-24 at 09:36 +0800, Kevin Hao wrote:
> ...
>
> > +From d50d2a8f3da588c0aaeb95116a88be5a598b4b16 Mon Sep 17 00:00:00
> > 2001
> > +From: Kevin Hao
> > +Date: Thu, 23 May 2019 15:34:20 +0800
> > +Subject: [PATCH] Drop the unneeded files when installation
> > +
> > +These are not needed as part of image. Drop them to avoid the QA
> > +warning.
> > +
>
> Since it's only just one app, could we package it in FILES_PN-examples?
No, it is supposed to be executed on the host instead of target.
> If not, we should probably just remove it in do_install_append and not
> carry this patch.
Do you mean something like this in the dpdk_18.11.1.bb:
do_install_append () {
# Remove the unneeded dir
dir=${D}/${INSTALL_PATH}/${RTE_TARGET}/app
test -d $dir && rm -rf $dir
}
>
> We also probably don't need to delete the installation of mk folder
> since they are being packaged now:
>
> https://git.yoctoproject.org/cgit/cgit.cgi/meta-dpdk/commit/?id=4582cde191b3b06b9b8f34bcd3fdd6c8a2d5e838
Aha, the git repo which I was used to do the build for arm64 missed this commit.
>
> Can you please check?
>
> ...
>
> > diff --git a/recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-
> > parellel-make-issue.patch b/recipes-extended/dpdk/dpdk/dpdk-18.11-
> > dpdk-fix-for-parellel-make-issue.patch
> > new file mode 100644
> > index ..e95c9a4ff5ce
> > --- /dev/null
> > +++ b/recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-
> > make-issue.patch
> > @@ -0,0 +1,42 @@
> > +From 5e78af18b6dda83e317ccadab1654fca26aaf6dd Mon Sep 17 00:00:00
> > 2001
> > +From: Rahul Kumar Gupta
> > +Date: Fri, 2 Sep 2016 15:48:52 +0800
> > +Subject: [PATCH] dpdk: fix for parellel make issue
> > +
> > +To make sure that the path of libraries should be correct and
> > +libraries will be build before, And available at the time of
> > +linking example apps.
>
> Can you add Upstream-Status here please and try submitting it upstream?
According to the codes, the depended libraries should be added to the
app makefile prerequisites automatically. I also have done build test without
this patch and don't get any failure. So it seems that this patch is not
needed (at least for the v18.11.1 version). I will drop this patch.
>
> ...
>
> > diff --git a/recipes-extended/dpdk/dpdk_18.11.1.bb b/recipes-
> > extended/dpdk/dpdk_18.11.1.bb
> > new file mode 100644
> > index ..2cb84924a757
> > --- /dev/null
> > +++ b/recipes-extended/dpdk/dpdk_18.11.1.bb
> > @@ -0,0 +1,15 @@
> > +include dpdk.inc
> > +
> > +STABLE = "-stable"
> > +BRANCH = "18.11"
> > +SRCREV = "16ece46735c9b70b7033ca7ae095930e9038d9fd"
> > +
> > +LICENSE = "BSD & LGPLv2 & GPLv2"
>
> Should these be BSD-3-Clause & LGPLv2.1 & GPLv2 based on the files
> included below?
Hmm, this is copied from the dpdk_18.05.bb. I will adjust them according to
the license files.
Thanks,
Kevin
>
> > +LIC_FILES_CHKSUM = "file://license/gpl-
> > 2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> > +file://license/lgpl-
> > 2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
> > +file://license/bsd-3-
> > clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
> > +
> > +SRC_URI += "\
> > +file://dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch
> > \
> > +file://dpdk-18.11-Drop-the-unneeded-files-when-
> > installation.patch \
> > +"
>
>
>
signature.asc
Description: PGP signature
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk v2 1/2] Move two patches to the version specific bb
These two patches can't be applied to the new version DPDK, so move
them to the version specific bb.
Signed-off-by: Kevin Hao
---
v2: No change.
recipes-extended/dpdk/dpdk.inc| 2 --
recipes-extended/dpdk/dpdk_17.11.3.bb | 6 +-
recipes-extended/dpdk/dpdk_18.05.bb | 2 ++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 92042bb74d5d..a0e081a3a8fe 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -8,8 +8,6 @@ S = "${WORKDIR}/git"
SRC_URI = "git://dpdk.org/dpdk${STABLE};branch=${BRANCH} \
file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
- file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
- file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
"
COMPATIBLE_MACHINE = "null"
diff --git a/recipes-extended/dpdk/dpdk_17.11.3.bb
b/recipes-extended/dpdk/dpdk_17.11.3.bb
index b4b002332be7..7fc89d2d7cc8 100644
--- a/recipes-extended/dpdk/dpdk_17.11.3.bb
+++ b/recipes-extended/dpdk/dpdk_17.11.3.bb
@@ -8,4 +8,8 @@ LICENSE = "LGPLv2 & GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe\
file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI += "file://dpdk-17.11-Fix-strncpy-error-for-GCC8.patch"
+SRC_URI += "\
+file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
+file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
+file://dpdk-17.11-Fix-strncpy-error-for-GCC8.patch \
+"
diff --git a/recipes-extended/dpdk/dpdk_18.05.bb
b/recipes-extended/dpdk/dpdk_18.05.bb
index f914214b6e7e..2bb89c4aef19 100644
--- a/recipes-extended/dpdk/dpdk_18.05.bb
+++ b/recipes-extended/dpdk/dpdk_18.05.bb
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM =
"file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4
file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
SRC_URI += "\
+file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
+file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \
file://0001-examples-Fix-maybe-uninitialized-warning.patch \
"
--
2.14.4
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk v2 2/2] Introduce the v18.11.1 bb
This is the latest LTS version. Signed-off-by: Kevin Hao --- v2: Also drop the mk files to avoid the QA warning. ...Drop-the-unneeded-files-when-installation.patch | 33 + ...dk-18.11-dpdk-fix-for-parellel-make-issue.patch | 42 ++ recipes-extended/dpdk/dpdk_18.11.1.bb | 15 3 files changed, 90 insertions(+) create mode 100644 recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch create mode 100644 recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch create mode 100644 recipes-extended/dpdk/dpdk_18.11.1.bb diff --git a/recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch b/recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch new file mode 100644 index ..210de429b44d --- /dev/null +++ b/recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch @@ -0,0 +1,33 @@ +From d50d2a8f3da588c0aaeb95116a88be5a598b4b16 Mon Sep 17 00:00:00 2001 +From: Kevin Hao +Date: Thu, 23 May 2019 15:34:20 +0800 +Subject: [PATCH] Drop the unneeded files when installation + +These are not needed as part of image. Drop them to avoid the QA +warning. + +Signed-off-by: Kevin Hao +--- + mk/rte.sdkinstall.mk | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk +index 2d34b4e5af9f..4682615030f1 100644 +--- a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk +@@ -127,11 +127,9 @@ install-sdk: + $(Q)tar -chf - -C $O include | \ + tar -xf - -C $(DESTDIR)$(includedir) $(TAR_X_FLAGS) + $(Q)$(call rte_mkdir,$(DESTDIR)$(sdkdir)) +- $(Q)cp $(CP_FLAGS) $(RTE_SDK)/mk$(DESTDIR)$(sdkdir) + $(Q)cp $(CP_FLAGS) $(RTE_SDK)/buildtools$(DESTDIR)$(sdkdir) +- $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) ++ $(Q)$(call rte_mkdir,$(DESTDIR)$(targetdir)) + $(Q)cp $(CP_FLAGS) $O/.config $(DESTDIR)$(targetdir) +- $(Q)cp $(CP_FLAGS) $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app + $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) + $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) + +-- +2.14.4 + diff --git a/recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch b/recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch new file mode 100644 index ..e95c9a4ff5ce --- /dev/null +++ b/recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch @@ -0,0 +1,42 @@ +From 5e78af18b6dda83e317ccadab1654fca26aaf6dd Mon Sep 17 00:00:00 2001 +From: Rahul Kumar Gupta +Date: Fri, 2 Sep 2016 15:48:52 +0800 +Subject: [PATCH] dpdk: fix for parellel make issue + +To make sure that the path of libraries should be correct and +libraries will be build before, And available at the time of +linking example apps. + +Signed-off-by: Rahul Kumar Gupta +--- + examples/Makefile | 1 + + examples/ethtool/ethtool-app/Makefile | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/examples/Makefile b/examples/Makefile +index 33fe0e586d97..1a3966f9e95a 100644 +--- a/examples/Makefile b/examples/Makefile +@@ -14,6 +14,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += bbdev_app + DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond + DIRS-y += cmdline + DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor ++DEPDIRS-y += examples/ethtool/lib + DIRS-y += ethtool + DIRS-y += exception_path + DIRS-$(CONFIG_RTE_LIBRTE_EFD) += server_node_efd +diff --git a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile +index 9ecfc0b89367..fb5fdc43818c 100644 +--- a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile +@@ -19,6 +19,7 @@ SRCS-y := main.c ethapp.c + CFLAGS += -O3 -pthread -I$(SRCDIR)/../lib + CFLAGS += $(WERROR_FLAGS) + ++LDLIBS += -L$(ETHTOOL_LIB_PATH)/ + LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib + LDLIBS += -lrte_ethtool + +-- +2.14.4 + diff --git a/recipes-extended/dpdk/dpdk_18.11.1.bb b/recipes-extended/dpdk/dpdk_18.11.1.bb new file mode 100644 index ..2cb84924a757 --- /dev/null +++ b/recipes-extended/dpdk/dpdk_18.11.1.bb @@ -0,0 +1,15 @@ +include dpdk.inc + +STABLE = "-stable" +BRANCH = "18.11" +SRCREV = "16ece46735c9b70b7033ca7ae095930e9038d9fd" + +LICENSE = "BSD & LGPLv2 & GPLv2" +LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" + +SRC_URI += "\ +file://dpdk-18.11-dpdk-fix
Re: [meta-intel] [meta-dpdk 2/2] Introduce the v18.11.1 bb
On Thu, May 23, 2019 at 04:05:24PM +0800, Kevin Hao wrote: > This is the latest LTS version. > > Signed-off-by: Kevin Hao > --- > ...Drop-the-unneeded-files-when-installation.patch | 31 > ...dk-18.11-dpdk-fix-for-parellel-make-issue.patch | 42 > ++ > recipes-extended/dpdk/dpdk_18.11.1.bb | 15 > 3 files changed, 88 insertions(+) > create mode 100644 > recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch > create mode 100644 > recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch > create mode 100644 recipes-extended/dpdk/dpdk_18.11.1.bb > > diff --git > a/recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch > > b/recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch > new file mode 100644 > index ..82f6f4b159e9 > --- /dev/null > +++ > b/recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch > @@ -0,0 +1,31 @@ > +From e4930e1c46ef494186ee54766d2f49876b9f460e Mon Sep 17 00:00:00 2001 > +From: Kevin Hao > +Date: Thu, 23 May 2019 15:34:20 +0800 > +Subject: [PATCH] Drop the unneeded files when installation > + > +These are not needed as part of image. Drop them to avoid the QA > +warning. > + > +Signed-off-by: Kevin Hao > +--- > + mk/rte.sdkinstall.mk | 3 +-- > + 1 file changed, 1 insertion(+), 2 deletions(-) > + > +diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk > +index 2d34b4e5af9f..389654c292ab 100644 > +--- a/mk/rte.sdkinstall.mk > b/mk/rte.sdkinstall.mk > +@@ -129,9 +129,8 @@ install-sdk: > + $(Q)$(call rte_mkdir,$(DESTDIR)$(sdkdir)) > + $(Q)cp $(CP_FLAGS) $(RTE_SDK)/mk$(DESTDIR)$(sdkdir) We still need to drop the files in this dir because I got the QA warning when building on amr64 platform. No idea why it didn't occur on the x86-64 platform. I will send a v2 version. Thanks, Kevin > + $(Q)cp $(CP_FLAGS) $(RTE_SDK)/buildtools$(DESTDIR)$(sdkdir) > +-$(Q)$(call rte_mkdir, > $(DESTDIR)$(targetdir)/app) > ++$(Q)$(call rte_mkdir,$(DESTDIR)$(targetdir)) > + $(Q)cp $(CP_FLAGS) $O/.config $(DESTDIR)$(targetdir) > +-$(Q)cp $(CP_FLAGS) $O/app/dpdk-pmdinfogen > $(DESTDIR)$(targetdir)/app > + $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), > $(DESTDIR)$(targetdir)/include) > + $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), > $(DESTDIR)$(targetdir)/lib) > + > +-- > +2.14.4 > + > diff --git > a/recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch > > b/recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch > new file mode 100644 > index ..e95c9a4ff5ce > --- /dev/null > +++ > b/recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch > @@ -0,0 +1,42 @@ > +From 5e78af18b6dda83e317ccadab1654fca26aaf6dd Mon Sep 17 00:00:00 2001 > +From: Rahul Kumar Gupta > +Date: Fri, 2 Sep 2016 15:48:52 +0800 > +Subject: [PATCH] dpdk: fix for parellel make issue > + > +To make sure that the path of libraries should be correct and > +libraries will be build before, And available at the time of > +linking example apps. > + > +Signed-off-by: Rahul Kumar Gupta > +--- > + examples/Makefile | 1 + > + examples/ethtool/ethtool-app/Makefile | 1 + > + 2 files changed, 2 insertions(+) > + > +diff --git a/examples/Makefile b/examples/Makefile > +index 33fe0e586d97..1a3966f9e95a 100644 > +--- a/examples/Makefile > b/examples/Makefile > +@@ -14,6 +14,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += bbdev_app > + DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond > + DIRS-y += cmdline > + DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor > ++DEPDIRS-y += examples/ethtool/lib > + DIRS-y += ethtool > + DIRS-y += exception_path > + DIRS-$(CONFIG_RTE_LIBRTE_EFD) += server_node_efd > +diff --git a/examples/ethtool/ethtool-app/Makefile > b/examples/ethtool/ethtool-app/Makefile > +index 9ecfc0b89367..fb5fdc43818c 100644 > +--- a/examples/ethtool/ethtool-app/Makefile > b/examples/ethtool/ethtool-app/Makefile > +@@ -19,6 +19,7 @@ SRCS-y := main.c ethapp.c > + CFLAGS += -O3 -pthread -I$(SRCDIR)/../lib > + CFLAGS += $(WERROR_FLAGS) > + > ++LDLIBS += -L$(ETHTOOL_LIB_PATH)/ > + LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib > + LDLIBS += -lrte_ethtool > + > +-- > +2.14.4 > + > diff --git a/recipes-extended/dpdk/dpdk_18.11.1.bb > b/recipes-extended/dpdk/dpdk_18.11.1.bb > n
[meta-intel] [meta-dpdk 1/2] Move two patches to the version specific bb
These two patches can't be applied to the new version DPDK, so move
them to the version specific bb.
Signed-off-by: Kevin Hao
---
recipes-extended/dpdk/dpdk.inc| 2 --
recipes-extended/dpdk/dpdk_17.11.3.bb | 6 +-
recipes-extended/dpdk/dpdk_18.05.bb | 2 ++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 92042bb74d5d..a0e081a3a8fe 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -8,8 +8,6 @@ S = "${WORKDIR}/git"
SRC_URI = "git://dpdk.org/dpdk${STABLE};branch=${BRANCH} \
file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
- file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
- file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
"
COMPATIBLE_MACHINE = "null"
diff --git a/recipes-extended/dpdk/dpdk_17.11.3.bb
b/recipes-extended/dpdk/dpdk_17.11.3.bb
index b4b002332be7..7fc89d2d7cc8 100644
--- a/recipes-extended/dpdk/dpdk_17.11.3.bb
+++ b/recipes-extended/dpdk/dpdk_17.11.3.bb
@@ -8,4 +8,8 @@ LICENSE = "LGPLv2 & GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe\
file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI += "file://dpdk-17.11-Fix-strncpy-error-for-GCC8.patch"
+SRC_URI += "\
+file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
+file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
+file://dpdk-17.11-Fix-strncpy-error-for-GCC8.patch \
+"
diff --git a/recipes-extended/dpdk/dpdk_18.05.bb
b/recipes-extended/dpdk/dpdk_18.05.bb
index f914214b6e7e..2bb89c4aef19 100644
--- a/recipes-extended/dpdk/dpdk_18.05.bb
+++ b/recipes-extended/dpdk/dpdk_18.05.bb
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM =
"file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4
file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
SRC_URI += "\
+file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
+file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \
file://0001-examples-Fix-maybe-uninitialized-warning.patch \
"
--
2.14.4
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk 2/2] Introduce the v18.11.1 bb
This is the latest LTS version. Signed-off-by: Kevin Hao --- ...Drop-the-unneeded-files-when-installation.patch | 31 ...dk-18.11-dpdk-fix-for-parellel-make-issue.patch | 42 ++ recipes-extended/dpdk/dpdk_18.11.1.bb | 15 3 files changed, 88 insertions(+) create mode 100644 recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch create mode 100644 recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch create mode 100644 recipes-extended/dpdk/dpdk_18.11.1.bb diff --git a/recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch b/recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch new file mode 100644 index ..82f6f4b159e9 --- /dev/null +++ b/recipes-extended/dpdk/dpdk/dpdk-18.11-Drop-the-unneeded-files-when-installation.patch @@ -0,0 +1,31 @@ +From e4930e1c46ef494186ee54766d2f49876b9f460e Mon Sep 17 00:00:00 2001 +From: Kevin Hao +Date: Thu, 23 May 2019 15:34:20 +0800 +Subject: [PATCH] Drop the unneeded files when installation + +These are not needed as part of image. Drop them to avoid the QA +warning. + +Signed-off-by: Kevin Hao +--- + mk/rte.sdkinstall.mk | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk +index 2d34b4e5af9f..389654c292ab 100644 +--- a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk +@@ -129,9 +129,8 @@ install-sdk: + $(Q)$(call rte_mkdir,$(DESTDIR)$(sdkdir)) + $(Q)cp $(CP_FLAGS) $(RTE_SDK)/mk$(DESTDIR)$(sdkdir) + $(Q)cp $(CP_FLAGS) $(RTE_SDK)/buildtools$(DESTDIR)$(sdkdir) +- $(Q)$(call rte_mkdir, $(DESTDIR)$(targetdir)/app) ++ $(Q)$(call rte_mkdir,$(DESTDIR)$(targetdir)) + $(Q)cp $(CP_FLAGS) $O/.config $(DESTDIR)$(targetdir) +- $(Q)cp $(CP_FLAGS) $O/app/dpdk-pmdinfogen $(DESTDIR)$(targetdir)/app + $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) + $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) + +-- +2.14.4 + diff --git a/recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch b/recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch new file mode 100644 index ..e95c9a4ff5ce --- /dev/null +++ b/recipes-extended/dpdk/dpdk/dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch @@ -0,0 +1,42 @@ +From 5e78af18b6dda83e317ccadab1654fca26aaf6dd Mon Sep 17 00:00:00 2001 +From: Rahul Kumar Gupta +Date: Fri, 2 Sep 2016 15:48:52 +0800 +Subject: [PATCH] dpdk: fix for parellel make issue + +To make sure that the path of libraries should be correct and +libraries will be build before, And available at the time of +linking example apps. + +Signed-off-by: Rahul Kumar Gupta +--- + examples/Makefile | 1 + + examples/ethtool/ethtool-app/Makefile | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/examples/Makefile b/examples/Makefile +index 33fe0e586d97..1a3966f9e95a 100644 +--- a/examples/Makefile b/examples/Makefile +@@ -14,6 +14,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += bbdev_app + DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond + DIRS-y += cmdline + DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor ++DEPDIRS-y += examples/ethtool/lib + DIRS-y += ethtool + DIRS-y += exception_path + DIRS-$(CONFIG_RTE_LIBRTE_EFD) += server_node_efd +diff --git a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile +index 9ecfc0b89367..fb5fdc43818c 100644 +--- a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile +@@ -19,6 +19,7 @@ SRCS-y := main.c ethapp.c + CFLAGS += -O3 -pthread -I$(SRCDIR)/../lib + CFLAGS += $(WERROR_FLAGS) + ++LDLIBS += -L$(ETHTOOL_LIB_PATH)/ + LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib + LDLIBS += -lrte_ethtool + +-- +2.14.4 + diff --git a/recipes-extended/dpdk/dpdk_18.11.1.bb b/recipes-extended/dpdk/dpdk_18.11.1.bb new file mode 100644 index ..2cb84924a757 --- /dev/null +++ b/recipes-extended/dpdk/dpdk_18.11.1.bb @@ -0,0 +1,15 @@ +include dpdk.inc + +STABLE = "-stable" +BRANCH = "18.11" +SRCREV = "16ece46735c9b70b7033ca7ae095930e9038d9fd" + +LICENSE = "BSD & LGPLv2 & GPLv2" +LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" + +SRC_URI += "\ +file://dpdk-18.11-dpdk-fix-for-parellel-make-issue.patch \ +file://dpdk-18.11-Drop-the-unneeded-files-when-installation.patch \ +" -- 2.14.4 -- ___
[meta-intel] [meta-dpdk 2/2] Add maintainer info for this layer
Add maintainer info in the README and also drop a stale maintainers.inc file. Signed-off-by: Kevin Hao --- README | 2 ++ conf/include/maintainers.inc | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 conf/include/maintainers.inc diff --git a/README b/README index 18407b2031eb..7430eec6216d 100644 --- a/README +++ b/README @@ -68,3 +68,5 @@ The meta-dpdk maintainers will do their best to review and/or pull in a patch or patchset within 24 hours of the time it was posted. For larger and/or more involved patches and patchsets, the review process may take longer. + +Maintainer: Anuj Mittal diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc deleted file mode 100644 index a89a54aeb45a.. --- a/conf/include/maintainers.inc +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains a list of recipe maintainers for meta-intel - -RECIPE_MAINTAINER_pn-dpdk = "TBD DPDK Flex Team" -- 2.14.4 -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk 1/2] Drop the reference of meta-intel in README
This has been created as a separate layer for a long time, the reference of meta-intel in the README seems a bit confusion. So drop all of them. Signed-off-by: Kevin Hao --- README | 21 +++-- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/README b/README index 6fd77dc30c1d..18407b2031eb 100644 --- a/README +++ b/README @@ -1,18 +1,7 @@ meta-dpdk = -This README file contains information on building and booting -meta-intel BSP layers. Please see the corresponding sections below -for details. - - -Yocto Project Compatible - - -The BSPs contained in this layer are compatible with the Yocto Project -as per the requirements listed here: - - https://www.yoctoproject.org/webform/yocto-project-compatible-registration +This README file contains information on building the DPDK package. Dependencies @@ -71,15 +60,11 @@ Specifically, they should: tested the patch, and for any non-trivial or non-obvious testing setup, provide details of that setup. -Doing a quick 'git log' in meta-intel will provide you with many +Doing a quick 'git log' in meta-dpdk will provide you with many examples of good example commits if you have questions about any aspect of the preferred format. -The meta-intel maintainers will do their best to review and/or pull in +The meta-dpdk maintainers will do their best to review and/or pull in a patch or patchset within 24 hours of the time it was posted. For larger and/or more involved patches and patchsets, the review process may take longer. - -Please see the meta-intel/MAINTAINERS file for the list of maintainers -and their specific areas; it's also a good idea to cc: the specific -maintainer, if applicable. -- 2.14.4 -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
Re: [meta-intel] [meta-dpdk 2/2] Drop the reference of meta-intel in this layer
On Tue, Nov 27, 2018 at 02:39:02PM +0800, Kevin Hao wrote: > On Tue, Nov 27, 2018 at 06:10:46AM +, Mittal, Anuj wrote: > > On Mon, 2018-11-26 at 22:06 +0800, Kevin Hao wrote: > > > conf/include/maintainers.inc | 2 +- > > > > Should this file be removed instead? It shouldn't be needed for this > > layer ... > > Agreed. I can compose a new patch to drop this file. By the way, do you think > that we need to add a MAINTAINERS file for this layer? And who do you think > that we should list as maintainers for this layer? You or California Sullivan, > or both of you? Any comments? Thanks, Kevin > > Thanks, > Kevin > > > > > Thanks, > > Anuj signature.asc Description: PGP signature -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
Re: [meta-intel] [meta-dpdk 2/2] Drop the reference of meta-intel in this layer
On Tue, Nov 27, 2018 at 06:10:46AM +, Mittal, Anuj wrote: > On Mon, 2018-11-26 at 22:06 +0800, Kevin Hao wrote: > > conf/include/maintainers.inc | 2 +- > > Should this file be removed instead? It shouldn't be needed for this > layer ... Agreed. I can compose a new patch to drop this file. By the way, do you think that we need to add a MAINTAINERS file for this layer? And who do you think that we should list as maintainers for this layer? You or California Sullivan, or both of you? Thanks, Kevin > > Thanks, > Anuj signature.asc Description: PGP signature -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk 1/2] Fix the stale dependency info in README
Instead of sticking to one specific version on the dependency layers and having to update it for each release version, just claim that this layer is compatible with the latest version of the dependency layers. Signed-off-by: Kevin Hao --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 6563ff9f51b9..6fd77dc30c1d 100644 --- a/README +++ b/README @@ -21,11 +21,11 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/bitbake - branch: 1.34 + branch: master URI: git://git.openembedded.org/openembedded-core layers: meta - branch: rocko + branch: master Guidelines for submitting patches -- 2.14.4 -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk 2/2] Drop the reference of meta-intel in this layer
This has been created as a separate layer for a long time, the reference of meta-intel in this layer seems a bit confusion. So drop all of them. Signed-off-by: Kevin Hao --- README | 21 +++-- conf/include/maintainers.inc | 2 +- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/README b/README index 6fd77dc30c1d..18407b2031eb 100644 --- a/README +++ b/README @@ -1,18 +1,7 @@ meta-dpdk = -This README file contains information on building and booting -meta-intel BSP layers. Please see the corresponding sections below -for details. - - -Yocto Project Compatible - - -The BSPs contained in this layer are compatible with the Yocto Project -as per the requirements listed here: - - https://www.yoctoproject.org/webform/yocto-project-compatible-registration +This README file contains information on building the DPDK package. Dependencies @@ -71,15 +60,11 @@ Specifically, they should: tested the patch, and for any non-trivial or non-obvious testing setup, provide details of that setup. -Doing a quick 'git log' in meta-intel will provide you with many +Doing a quick 'git log' in meta-dpdk will provide you with many examples of good example commits if you have questions about any aspect of the preferred format. -The meta-intel maintainers will do their best to review and/or pull in +The meta-dpdk maintainers will do their best to review and/or pull in a patch or patchset within 24 hours of the time it was posted. For larger and/or more involved patches and patchsets, the review process may take longer. - -Please see the meta-intel/MAINTAINERS file for the list of maintainers -and their specific areas; it's also a good idea to cc: the specific -maintainer, if applicable. diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc index a89a54aeb45a..6d7218bdfe67 100644 --- a/conf/include/maintainers.inc +++ b/conf/include/maintainers.inc @@ -1,3 +1,3 @@ -# This file contains a list of recipe maintainers for meta-intel +# This file contains a list of recipe maintainers for meta-dpdk RECIPE_MAINTAINER_pn-dpdk = "TBD DPDK Flex Team" -- 2.14.4 -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [PATCH meta-dpdk] dpdk: Install the examples&test app in a dpdk specific directory
Currently the examples&test applications would be installed into
directories like:
/usr/share/examples
/usr/share/test
These directories just seem too general, so change them to:
/usr/share/dpdk/examples
/usr/share/dpdk/test
Signed-off-by: Kevin Hao
---
recipes-extended/dpdk/dpdk.inc | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 3080946ee56b..801f3cae4c1d 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -32,6 +32,10 @@ export CONFIG_EXAMPLE_VM_POWER_MANAGER =
"${@bb.utils.contains('PACKAGECONFIG',
export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost',
'y', 'n', d)}"
export CONFIG_HAVE_NUMA = "${@bb.utils.contains('PACKAGECONFIG', 'numa', 'y',
'n', d)}"
+# Don't use the default value of datadir and let the dpdk set it to a dpdk
+# specific directory
+datadir[unexport] = "1"
+
RDEPENDS_${PN} += "python-subprocess"
DEPENDS = "virtual/kernel"
do_configure[depends] += "virtual/kernel:do_shared_workdir"
@@ -45,7 +49,7 @@ export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include"
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}/share"
+export INSTALL_PATH = "${prefix}/share/dpdk"
export RTE_OUTPUT = "${S}/${RTE_TARGET}"
export ETHTOOL_LIB_PATH = "${S}/examples/ethtool/lib/${RTE_TARGET}/"
export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}"
--
2.14.4
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [PATCH] dpdk: Set the correct RTE_TARGET for x86 machines
The TARGET_ARCH may be different for different x86 machines,
for example i586(qemux86) and i686(genericx86). So choose the "x86"
override to set the correct RTE_TARGET for these machines.
Signed-off-by: Kevin Hao
---
recipes-extended/dpdk/dpdk.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 0dd6f0a57fd9..9026dfeac055 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -59,7 +59,7 @@ export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
export ARCHDIR = "generic"
DPDK_RTE_TARGET_x86-64 = "x86_64-native-linuxapp-gcc"
-DPDK_RTE_TARGET_i686 = "i686-native-linuxapp-gcc"
+DPDK_RTE_TARGET_x86 = "i686-native-linuxapp-gcc"
DPDK_RTE_TARGET_aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc"
export RTE_TARGET = "${DPDK_RTE_TARGET}"
--
2.14.3
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [PATCH] dpdk: Fix the self reference error when building with unsupported arch
Fix the following parse error when building with unsupported arch, such
as arm:
bb.data_smart.ExpansionError: Failure expanding variable RTE_TARGET, expression
was ${RTE_TARGET} which triggered exception Exception: variable RTE_TARGET
references itself!
Signed-off-by: Kevin Hao
---
recipes-extended/dpdk/dpdk.inc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 40f25ee3ed9a..0dd6f0a57fd9 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -58,10 +58,10 @@ export ICP_LAC_API_DIR =
"${STAGING_DIR_TARGET}${includedir}/lac"
export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
export ARCHDIR = "generic"
-RTE_TARGET_x86-64 = "x86_64-native-linuxapp-gcc"
-RTE_TARGET_i686 = "i686-native-linuxapp-gcc"
-RTE_TARGET_aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc"
-export RTE_TARGET="${RTE_TARGET}"
+DPDK_RTE_TARGET_x86-64 = "x86_64-native-linuxapp-gcc"
+DPDK_RTE_TARGET_i686 = "i686-native-linuxapp-gcc"
+DPDK_RTE_TARGET_aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc"
+export RTE_TARGET = "${DPDK_RTE_TARGET}"
# The list of intel Comms platforms and their target machine
# process mapping. The supported target machine is listed under
--
2.14.3
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
Re: [meta-intel] [PATCH] conf/machine/intel-corei7-64.conf: remove DPDK_TARGET_MACHINE
On Mon, Apr 16, 2018 at 05:28:57PM -0700, California Sullivan wrote: > "atm" wasn't a real target and breaks the dpdk build now that the > TARGET_MACHINE selection is fixed. Just allow it to default since that's > what it effectively got before. > > Signed-off-by: California Sullivan > --- > Hi Kevin, > > Was wondering if this was alright or whether you had a better default > target in mind. This seems the right fix to me. Thanks, Kevin > > Thanks, > Cal > > conf/machine/intel-corei7-64.conf | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/conf/machine/intel-corei7-64.conf > b/conf/machine/intel-corei7-64.conf > index 3e802975..f43fa852 100644 > --- a/conf/machine/intel-corei7-64.conf > +++ b/conf/machine/intel-corei7-64.conf > @@ -21,7 +21,6 @@ MACHINEOVERRIDES =. "corei7-64-intel-common:" > # Enable optional dpdk: > COMPATIBLE_MACHINE_pn-dpdk = "intel-corei7-64" > COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "intel-corei7-64" > -DPDK_TARGET_MACHINE ?= "atm" > > # Enable optional QAT items: > COMPATIBLE_MACHINE_pn-openssl-qat = "intel-corei7-64" > -- > 2.14.3 > signature.asc Description: PGP signature -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk 2/3] dpdk: Add the missing return in get_dpdk_target_mach()
Otherwise it always return "default" no matter what we set in
"DPDK_TARGET_MACHINE".
Signed-off-by: Kevin Hao
---
recipes-extended/dpdk/dpdk.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index aa03a67d0639..01724fbe5188 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -65,7 +65,7 @@ export ARCHDIR = "generic"
def get_dpdk_target_mach(bb, d):
target_arch = d.getVar('DPDK_TARGET_MACHINE', True)
if target_arch:
-target_arch
+return target_arch
return "default"
do_configure () {
--
2.14.3
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk 3/3] dpdk: Add support for arm64
Signed-off-by: Kevin Hao
---
recipes-extended/dpdk/dpdk.inc | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 01724fbe5188..40f25ee3ed9a 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -43,7 +43,6 @@ inherit module
export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
export RTE_SDK = "${S}"
-export RTE_TARGET="${@bb.utils.contains("TUNE_FEATURES", "m64",
"x86_64-native-linuxapp-gcc", "i686-native-linuxapp-gcc", d)}"
export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include"
export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib"
@@ -59,6 +58,11 @@ export ICP_LAC_API_DIR =
"${STAGING_DIR_TARGET}${includedir}/lac"
export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
export ARCHDIR = "generic"
+RTE_TARGET_x86-64 = "x86_64-native-linuxapp-gcc"
+RTE_TARGET_i686 = "i686-native-linuxapp-gcc"
+RTE_TARGET_aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc"
+export RTE_TARGET="${RTE_TARGET}"
+
# The list of intel Comms platforms and their target machine
# process mapping. The supported target machine is listed under
# dpdk/mk/machine
@@ -77,8 +81,7 @@ do_configure () {
unset prefix
# Fix-up CONFIG_RTE_MACHINE based on target machine
- sed -e
"s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#"
-i ${S}/config/defconfig_x86_64-native-linuxapp-gcc
- sed -e
"s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#"
-i ${S}/config/defconfig_i686-native-linuxapp-gcc
+ sed -e
"s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#"
-i ${S}/config/defconfig_${RTE_TARGET}
# Fix-up vhost configs based on package config
sed -e
"s#CONFIG_RTE_KNI_VHOST=n#CONFIG_RTE_KNI_VHOST=${CONFIG_VHOST_ENABLED}#" -i
${S}/config/common_linuxapp
--
2.14.3
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk 0/3] dpdk: Add support for arm64
Hi, This patch series adds the arm64 support for dpdk. This has passed build test on x86-64 and arm64. For arm64 build, you need to enable the CONFIG_PCI for kernel and add something like follow in your local.conf: COMPATIBLE_MACHINE_pn-dpdk = "qemuarm64" COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "qemuarm64" COMPATIBLE_HOST_pn-dpdk-dev-libibverbs = '(aarch64).*-linux' DPDK_TARGET_MACHINE ?= "dpaa2" Kevin Hao (3): dpdk: Remove the useless checksums dpdk: Add the missing return in get_dpdk_target_mach() dpdk: Add support for arm64 recipes-extended/dpdk/dpdk.inc| 11 +++ recipes-extended/dpdk/dpdk_17.11.1.bb | 3 --- recipes-extended/dpdk/dpdk_18.02.bb | 3 --- 3 files changed, 7 insertions(+), 10 deletions(-) -- 2.14.3 Thanks, Kevin -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk 1/3] dpdk: Remove the useless checksums
After changing to the git repo, these checksums become useless. Just drop them. Signed-off-by: Kevin Hao --- recipes-extended/dpdk/dpdk_17.11.1.bb | 3 --- recipes-extended/dpdk/dpdk_18.02.bb | 3 --- 2 files changed, 6 deletions(-) diff --git a/recipes-extended/dpdk/dpdk_17.11.1.bb b/recipes-extended/dpdk/dpdk_17.11.1.bb index 4c84281173f0..c3eb59fb905a 100644 --- a/recipes-extended/dpdk/dpdk_17.11.1.bb +++ b/recipes-extended/dpdk/dpdk_17.11.1.bb @@ -7,6 +7,3 @@ SRCREV = "d864d418fa3424098bd14d0b7fd1c8ed078dbb25" LICENSE = "LGPLv2 & GPLv2" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe\ file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[dpdk.md5sum] = "75a2f0922baadc19dc8a222a7547798a" -SRC_URI[dpdk.sha256sum] = "47f43a3ef66cc351ab639ae313830dc08760089c7d227e5f73daa0d6df38b201" diff --git a/recipes-extended/dpdk/dpdk_18.02.bb b/recipes-extended/dpdk/dpdk_18.02.bb index 6178fb1ddb96..a2d1e487d651 100644 --- a/recipes-extended/dpdk/dpdk_18.02.bb +++ b/recipes-extended/dpdk/dpdk_18.02.bb @@ -11,6 +11,3 @@ SRC_URI += "\ file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \ file://0001-examples-Fix-maybe-uninitialized-warning.patch \ " - -SRC_URI[dpdk.md5sum] = "49d08ced0a978a71cc3942af5cf51b95" -SRC_URI[dpdk.sha256sum] = "f1210310fd5f01a3babe3a09d9b3e5a9db791c2ec6ecfbf94ade9f893a0632b8" -- 2.14.3 -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
Re: [meta-intel] [meta-dpdk] dpdk: Use git repo
On Mon, Apr 09, 2018 at 10:27:43AM +0800, Kevin Hao wrote:
> This is more convenient for development.
Hi Cal,
Would you consider merging this patch?
Thanks,
Kevin
>
> Signed-off-by: Kevin Hao
> ---
> recipes-extended/dpdk/dpdk.inc| 6 +-
> recipes-extended/dpdk/dpdk_17.11.1.bb | 5 -
> recipes-extended/dpdk/dpdk_18.02.bb | 2 ++
> 3 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
> index 69259d3222ae..10b9cc842e90 100644
> --- a/recipes-extended/dpdk/dpdk.inc
> +++ b/recipes-extended/dpdk/dpdk.inc
> @@ -1,7 +1,11 @@
> DESCRIPTION = "Intel(r) Data Plane Development Kit"
> HOMEPAGE = "http://dpdk.org";
>
> -SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \
> +STABLE = ""
> +BRANCH = "master"
> +S = "${WORKDIR}/git"
> +
> +SRC_URI = "git://dpdk.org/dpdk${STABLE};branch=${BRANCH} \
> file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
> file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
> file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \
> diff --git a/recipes-extended/dpdk/dpdk_17.11.1.bb
> b/recipes-extended/dpdk/dpdk_17.11.1.bb
> index e323bf21b402..098ba7373ba3 100644
> --- a/recipes-extended/dpdk/dpdk_17.11.1.bb
> +++ b/recipes-extended/dpdk/dpdk_17.11.1.bb
> @@ -1,5 +1,9 @@
> include dpdk.inc
>
> +STABLE = "-stable"
> +BRANCH = "17.11"
> +SRCREV = "d864d418fa3424098bd14d0b7fd1c8ed078dbb25"
> +
> LICENSE = "LGPLv2 & GPLv2"
> LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe\
> file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
> @@ -7,7 +11,6 @@ LIC_FILES_CHKSUM =
> "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe\
> SRC_URI[dpdk.md5sum] = "75a2f0922baadc19dc8a222a7547798a"
> SRC_URI[dpdk.sha256sum] =
> "47f43a3ef66cc351ab639ae313830dc08760089c7d227e5f73daa0d6df38b201"
>
> -S = "${WORKDIR}/${BPN}-stable-${PV}"
> export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
> export ARCHDIR = "generic"
>
> diff --git a/recipes-extended/dpdk/dpdk_18.02.bb
> b/recipes-extended/dpdk/dpdk_18.02.bb
> index 8a217141e694..2c80aef3dc39 100644
> --- a/recipes-extended/dpdk/dpdk_18.02.bb
> +++ b/recipes-extended/dpdk/dpdk_18.02.bb
> @@ -1,5 +1,7 @@
> include dpdk.inc
>
> +SRCREV = "92924b207b124c156f7b6dff75110d6af83d971f"
> +
> LICENSE = "BSD & LGPLv2 & GPLv2"
> LIC_FILES_CHKSUM =
> "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>
> file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
> --
> 2.14.3
>
signature.asc
Description: PGP signature
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
Re: [meta-intel] [meta-dpdk 4/4] dpdk: Refresh the patches for the context changes
On Mon, Apr 09, 2018 at 04:21:21PM -0700, Cal Sullivan wrote: > It looks like dpdk-16.04-Fix-for-misleading-indentation-error.patch is no > longer necessary, as they added braces upstream. > > Otherwise, this set looks good and builds fine. > > I'll merge this and send an additional patch removing > dpdk-16.04-Fix-for-misleading-indentation-error.patch. Thanks Cal. Kevin signature.asc Description: PGP signature -- ___ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk] dpdk: Use git repo
This is more convenient for development.
Signed-off-by: Kevin Hao
---
recipes-extended/dpdk/dpdk.inc| 6 +-
recipes-extended/dpdk/dpdk_17.11.1.bb | 5 -
recipes-extended/dpdk/dpdk_18.02.bb | 2 ++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 69259d3222ae..10b9cc842e90 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -1,7 +1,11 @@
DESCRIPTION = "Intel(r) Data Plane Development Kit"
HOMEPAGE = "http://dpdk.org";
-SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \
+STABLE = ""
+BRANCH = "master"
+S = "${WORKDIR}/git"
+
+SRC_URI = "git://dpdk.org/dpdk${STABLE};branch=${BRANCH} \
file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \
diff --git a/recipes-extended/dpdk/dpdk_17.11.1.bb
b/recipes-extended/dpdk/dpdk_17.11.1.bb
index e323bf21b402..098ba7373ba3 100644
--- a/recipes-extended/dpdk/dpdk_17.11.1.bb
+++ b/recipes-extended/dpdk/dpdk_17.11.1.bb
@@ -1,5 +1,9 @@
include dpdk.inc
+STABLE = "-stable"
+BRANCH = "17.11"
+SRCREV = "d864d418fa3424098bd14d0b7fd1c8ed078dbb25"
+
LICENSE = "LGPLv2 & GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe\
file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
@@ -7,7 +11,6 @@ LIC_FILES_CHKSUM =
"file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe\
SRC_URI[dpdk.md5sum] = "75a2f0922baadc19dc8a222a7547798a"
SRC_URI[dpdk.sha256sum] =
"47f43a3ef66cc351ab639ae313830dc08760089c7d227e5f73daa0d6df38b201"
-S = "${WORKDIR}/${BPN}-stable-${PV}"
export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
export ARCHDIR = "generic"
diff --git a/recipes-extended/dpdk/dpdk_18.02.bb
b/recipes-extended/dpdk/dpdk_18.02.bb
index 8a217141e694..2c80aef3dc39 100644
--- a/recipes-extended/dpdk/dpdk_18.02.bb
+++ b/recipes-extended/dpdk/dpdk_18.02.bb
@@ -1,5 +1,7 @@
include dpdk.inc
+SRCREV = "92924b207b124c156f7b6dff75110d6af83d971f"
+
LICENSE = "BSD & LGPLv2 & GPLv2"
LIC_FILES_CHKSUM =
"file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
--
2.14.3
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk 2/4] dpdk: Introduce the 17.11.1
This is the latest stable version.
Signed-off-by: Kevin Hao
---
recipes-extended/dpdk/dpdk_17.11.1.bb | 19 +++
1 file changed, 19 insertions(+)
create mode 100644 recipes-extended/dpdk/dpdk_17.11.1.bb
diff --git a/recipes-extended/dpdk/dpdk_17.11.1.bb
b/recipes-extended/dpdk/dpdk_17.11.1.bb
new file mode 100644
index ..e323bf21b402
--- /dev/null
+++ b/recipes-extended/dpdk/dpdk_17.11.1.bb
@@ -0,0 +1,19 @@
+include dpdk.inc
+
+LICENSE = "LGPLv2 & GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe\
+file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c"
+
+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"
--
2.14.3
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk 4/4] dpdk: Refresh the patches for the context changes
Using the following commands to refresh the patches in order to
suppress the fuzz warnings.
devtool modify dpdk
devtool finish --force-patch-refresh dpdk meta-dpdk-dir
No code change.
Signed-off-by: Kevin Hao
---
...-examples-Fix-maybe-uninitialized-warning.patch | 14 +--
...6.04-Fix-for-misleading-indentation-error.patch | 28 ++
...-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch | 14 +--
...le-ip_fragmentation-in-common_base-config.patch | 16 ++---
...07-add-sysroot-option-within-app-makefile.patch | 12 --
...dk-16.07-dpdk-fix-for-parellel-make-issue.patch | 16 ++---
...2-dpdk-fix-installation-warning-and-issue.patch | 8 +++
7 files changed, 47 insertions(+), 61 deletions(-)
diff --git
a/recipes-extended/dpdk/dpdk/0001-examples-Fix-maybe-uninitialized-warning.patch
b/recipes-extended/dpdk/dpdk/0001-examples-Fix-maybe-uninitialized-warning.patch
index cc8041e79e73..2facd39dcaca 100644
---
a/recipes-extended/dpdk/dpdk/0001-examples-Fix-maybe-uninitialized-warning.patch
+++
b/recipes-extended/dpdk/dpdk/0001-examples-Fix-maybe-uninitialized-warning.patch
@@ -1,4 +1,4 @@
-From 3924f5df5aca5ba23abbe9a84173280ede8be2dd Mon Sep 17 00:00:00 2001
+From 41ac64efa5050430b73e0f8813dffc7327083273 Mon Sep 17 00:00:00 2001
From: Khem Raj
Date: Tue, 1 Aug 2017 20:18:46 -0700
Subject: [PATCH] examples: Fix maybe-uninitialized warning
@@ -8,16 +8,17 @@ Initialize arrays to 0, makes compiler happy about
error: 'vals[0]' may be used uninitialized in this function
[-Werror=maybe-uninitialized]
Signed-off-by: Khem Raj
+
---
examples/qos_sched/args.c | 2 +-
examples/vhost/virtio_net.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
-index 476a0ee..fd601c3 100644
+index 83eee95cc28e..3d2c0fbd6d0a 100644
--- a/examples/qos_sched/args.c
+++ b/examples/qos_sched/args.c
-@@ -241,7 +241,7 @@ static int
+@@ -212,7 +212,7 @@ static int
app_parse_flow_conf(const char *conf_str)
{
int ret;
@@ -27,10 +28,10 @@ index 476a0ee..fd601c3 100644
uint64_t mask;
diff --git a/examples/vhost/virtio_net.c b/examples/vhost/virtio_net.c
-index cc2c3d8..16b5392 100644
+index f6e00674d9af..a4a90704d7b4 100644
--- a/examples/vhost/virtio_net.c
+++ b/examples/vhost/virtio_net.c
-@@ -327,7 +327,7 @@ vs_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,
+@@ -293,7 +293,7 @@ vs_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,
{
struct vhost_queue *queue;
struct rte_vhost_vring *vr;
@@ -39,6 +40,3 @@ index cc2c3d8..16b5392 100644
uint32_t used_idx;
uint32_t i = 0;
uint16_t free_entries;
---
-2.13.3
-
diff --git
a/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch
b/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch
index 8786af7ced41..78283336d23c 100644
---
a/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch
+++
b/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch
@@ -1,4 +1,4 @@
-From 8cd0a16af531cca0af6b4f9b729c252b8bdbf8e2 Mon Sep 17 00:00:00 2001
+From e7df50cd214e30741a4594c1fb969baa7574c303 Mon Sep 17 00:00:00 2001
From: Rahul Kumar Gupta
Date: Tue, 5 Jul 2016 00:05:25 +0800
Subject: [PATCH] Fix for misleading indentation error
@@ -7,18 +7,19 @@ fix the indentation of the code to match the block structure.
This may cause
build errors if you have -Wall -Werror in your project.
Signed-off-by: Rahul Kumar Gupta
+
---
lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | 8
lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
-index df22470..ba28eba 100644
+index 1934a309cda4..58ed65f062ae 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
-@@ -3302,8 +3302,8 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32
address, u32 *data)
+@@ -3287,8 +3287,8 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32
address, u32 *data)
/* Disable access to mPHY if it was originally disabled */
- if (locked)
+ if (locked) {
ready = e1000_is_mphy_ready(hw);
- if (!ready)
- return -E1000_ERR_PHY;
@@ -26,10 +27,10 @@ index df22470..ba28eba 100644
+ return -E1000_ERR_PHY;
E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
E1000_MPHY_DIS_ACCESS);
-
-@@ -3367,8 +3367,8 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32
address, u32 data,
+ }
+@@ -3353,8 +3353,8 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32
address, u32 data,
/* Disable acce
[meta-intel] [meta-dpdk 3/4] Add compatible for "sumo"
The latest Yocto has changed the LAYERSERIES_CORENAMES to "sumo".
So add it to the compatible list.
Signed-off-by: Kevin Hao
---
conf/layer.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/layer.conf b/conf/layer.conf
index 61331edc9e8a..090d31cc62b7 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -14,6 +14,6 @@ LAYERDEPENDS_dpdk = "core"
# This should only be incremented on significant changes that will
# cause compatibility issues with other layers
LAYERVERSION_dpdk = "1"
-LAYERSERIES_COMPAT_dpdk = "rocko"
+LAYERSERIES_COMPAT_dpdk = "rocko sumo"
require ${LAYERDIR}/conf/include/maintainers.inc
--
2.14.3
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
[meta-intel] [meta-dpdk 1/4] dpdk: Factor out the license info into the specific bb
The license files may be different between different versions. So move
them into the specific bb files.
Signed-off-by: Kevin Hao
---
recipes-extended/dpdk/dpdk.inc | 4
recipes-extended/dpdk/dpdk_18.02.bb | 5 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 0818841b79a3..69259d3222ae 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -1,9 +1,5 @@
DESCRIPTION = "Intel(r) Data Plane Development Kit"
HOMEPAGE = "http://dpdk.org";
-LICENSE = "BSD & LGPLv2 & GPLv2"
-LIC_FILES_CHKSUM =
"file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-
file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
-
file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \
file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
diff --git a/recipes-extended/dpdk/dpdk_18.02.bb
b/recipes-extended/dpdk/dpdk_18.02.bb
index 537d615ccbdf..8a217141e694 100644
--- a/recipes-extended/dpdk/dpdk_18.02.bb
+++ b/recipes-extended/dpdk/dpdk_18.02.bb
@@ -1,5 +1,10 @@
include dpdk.inc
+LICENSE = "BSD & LGPLv2 & GPLv2"
+LIC_FILES_CHKSUM =
"file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+
file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
+
file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
+
SRC_URI += "\
file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \
file://0001-examples-Fix-maybe-uninitialized-warning.patch \
--
2.14.3
--
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel
Re: [meta-intel] [meta-dpdk][PATCH 2/2] dpdk: merge recipe and include
On Wed, Mar 28, 2018 at 11:34:42AM -0700, Cal Sullivan wrote:
> Is patch 1/2 good to merge?
Yes.
>
> It looks like in order for 18.02 and 17.11 to use the same .inc file we will
> need to move the LIC_FILES_CHKSUM out of it, but that can be done later. 17.11
> seems to have upstreamed the same patch that was dropped in this upgrade, so
> we're good on that front as well.
Agreed.
Thanks,
Kevin
>
> Thanks,
> Cal
>
> On 03/28/2018 12:46 AM, Kevin Hao wrote:
>
> On Wed, Mar 28, 2018 at 12:27:48PM +0500, Awais Belal wrote:
>
> Since we only have a single version supported at the
> moment, which is the latest and the greatest. It is
> best that the include and base recipe files are merged
> to allow better maintainability and readability.
>
> Please don't do this because I plan to add the 17.11 (LTS) version to the
> Yocto.
>
> Thanks,
> Kevin
>
>
> Signed-off-by: Awais Belal
> ---
> recipes-extended/dpdk/dpdk.inc | 167
> --
> recipes-extended/dpdk/dpdk_18.02.bb | 175
> ++--
> 2 files changed, 167 insertions(+), 175 deletions(-)
> delete mode 100644 recipes-extended/dpdk/dpdk.inc
>
> diff --git a/recipes-extended/dpdk/dpdk.inc
> b/recipes-extended/dpdk/dpdk.inc
> deleted file mode 100644
> index ce4e8bc..000
> --- a/recipes-extended/dpdk/dpdk.inc
> +++ /dev/null
> @@ -1,167 +0,0 @@
> -DESCRIPTION = "Intel(r) Data Plane Development Kit"
> -HOMEPAGE = "http://dpdk.org";
> -LICENSE = "BSD & LGPLv2 & GPLv2"
> -LIC_FILES_CHKSUM =
> "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> -
> file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
> -
> file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
> -
> -SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \
> -
> file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
> -
> file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
> -
> file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \
> - file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
> -
> file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
> - "
> -
> -# A machine needs to enable this using:
> -# COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = ""
> -
> -COMPATIBLE_MACHINE = "null"
> -COMPATIBLE_HOST_libc-musl_class-target = "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.
> -# So adding mechanism to explicitly disable the use of fuse and qat.
> -# To enable, uncomment the below line or include in .bbappend.
> -# PACKAGECONFIG ?= " dpdk_qat vhost libvirt"
> -
> -PACKAGECONFIG[dpdk_qat] = ",,virtual/qat"
> -PACKAGECONFIG[vhost] = ",,fuse"
> -PACKAGECONFIG[libvirt] = ",,libvirt"
> -
> -export CONFIG_EXAMPLE_DPDK_QAT =
> "${@bb.utils.contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}"
> -export CONFIG_EXAMPLE_VM_POWER_MANAGER =
> "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
> -export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG',
> 'vhost', 'y', 'n', d)}"
> -
> -RDEPENDS_${PN} += "python-subprocess virtual/libibverbs"
> -DEPENDS = "virtual/kernel virtual/libibverbs"
> -do_configure[depends] += "virtual/kernel:do_shared_workdir"
> -
> -inherit module
> -
> -export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
> -export RTE_SDK = "${S}"
> -export RTE_TARGET="${@bb.utils.contains("TUNE_FEATURES", "m64",
> "x86_64-native-linuxapp-gcc", "i686-native-linuxapp-gcc", d)}"
> -
> -export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include"
> -export ICP_LIB_RO
Re: [meta-intel] [meta-dpdk][PATCH 2/2] dpdk: merge recipe and include
On Wed, Mar 28, 2018 at 12:27:48PM +0500, Awais Belal wrote:
> Since we only have a single version supported at the
> moment, which is the latest and the greatest. It is
> best that the include and base recipe files are merged
> to allow better maintainability and readability.
Please don't do this because I plan to add the 17.11 (LTS) version to the Yocto.
Thanks,
Kevin
>
> Signed-off-by: Awais Belal
> ---
> recipes-extended/dpdk/dpdk.inc | 167 --
> recipes-extended/dpdk/dpdk_18.02.bb | 175
> ++--
> 2 files changed, 167 insertions(+), 175 deletions(-)
> delete mode 100644 recipes-extended/dpdk/dpdk.inc
>
> diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
> deleted file mode 100644
> index ce4e8bc..000
> --- a/recipes-extended/dpdk/dpdk.inc
> +++ /dev/null
> @@ -1,167 +0,0 @@
> -DESCRIPTION = "Intel(r) Data Plane Development Kit"
> -HOMEPAGE = "http://dpdk.org";
> -LICENSE = "BSD & LGPLv2 & GPLv2"
> -LIC_FILES_CHKSUM =
> "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> -
> file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
> -
> file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
> -
> -SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \
> -file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
> -file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
> -file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \
> -file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \
> -file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \
> - "
> -
> -# A machine needs to enable this using:
> -# COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = ""
> -
> -COMPATIBLE_MACHINE = "null"
> -COMPATIBLE_HOST_libc-musl_class-target = "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.
> -# So adding mechanism to explicitly disable the use of fuse and qat.
> -# To enable, uncomment the below line or include in .bbappend.
> -# PACKAGECONFIG ?= " dpdk_qat vhost libvirt"
> -
> -PACKAGECONFIG[dpdk_qat] = ",,virtual/qat"
> -PACKAGECONFIG[vhost] = ",,fuse"
> -PACKAGECONFIG[libvirt] = ",,libvirt"
> -
> -export CONFIG_EXAMPLE_DPDK_QAT = "${@bb.utils.contains('PACKAGECONFIG',
> 'dpdk_qat', 'y', 'n', d)}"
> -export CONFIG_EXAMPLE_VM_POWER_MANAGER =
> "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
> -export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG',
> 'vhost', 'y', 'n', d)}"
> -
> -RDEPENDS_${PN} += "python-subprocess virtual/libibverbs"
> -DEPENDS = "virtual/kernel virtual/libibverbs"
> -do_configure[depends] += "virtual/kernel:do_shared_workdir"
> -
> -inherit module
> -
> -export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
> -export RTE_SDK = "${S}"
> -export RTE_TARGET="${@bb.utils.contains("TUNE_FEATURES", "m64",
> "x86_64-native-linuxapp-gcc", "i686-native-linuxapp-gcc", d)}"
> -
> -export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include"
> -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}/share"
> -export RTE_OUTPUT = "${S}/${RTE_TARGET}"
> -export ETHTOOL_LIB_PATH = "${S}/examples/ethtool/lib/${RTE_TARGET}/"
> -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"
> -
> -# 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('DPDK_TARGET_MACHINE', True)
> -if target_arch:
> -target_arch
> -return "default"
> -
> -do_configure () {
> - #
> - ### default value for prefix is "usr", unsetting it, so it
> - ### will not be concatenated in ${RTE_TARGET}/Makefile
> - ### which will cause compilation failure
> - #
> - unset prefix
> -
> - # Fix-up CONFIG_RTE_MACHINE based on target machine
> - sed -e
> "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#"
> -i ${S}/config/defconfig_x86_64-native-linuxapp-gcc
> - sed -e
> "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#"
> -i ${S}/config/defconfig_i686-native-linuxapp-gcc
> -
> - # Fix-up vhost configs based on package config
> - sed -e
> "s#CONFIG_RTE_KNI_VHOST=n#CONFIG_RTE_KNI_VHOST=${CONFIG_VHOST_ENABLED}#" -i
> ${S}/config/common_linuxapp
> - sed -e
> "s#CONFI
