aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro/recipes-extra
diff options
context:
space:
mode:
authorMaxim Uvarov <maxim.uvarov@linaro.org>2013-12-27 14:07:31 +0400
committerFathi Boudra <fathi.boudra@linaro.org>2014-01-10 08:57:05 +0000
commitf0a54541c3a11100829f9cd50b235bccc266ff71 (patch)
treeecfe773a2b98c266eb922e7e3f5b0c89373217f7 /meta-linaro/recipes-extra
parentb4a8cb119b4499461a9b63dcf608b1a6ff00ee81 (diff)
downloadmeta-linaro-f0a54541c3a11100829f9cd50b235bccc266ff71.tar.gz
split odp.bb for odp and openem
Now odp.bb has only Open Data Plane project files. DPDK and OpenEm which we use for reference moved to openem.bb. Change-Id: I8f44eaa48128587435bd8f14a235ea2d8e5c187e Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'meta-linaro/recipes-extra')
-rw-r--r--meta-linaro/recipes-extra/odp/odp.bb58
-rw-r--r--meta-linaro/recipes-extra/odp/openem.bb66
2 files changed, 70 insertions, 54 deletions
diff --git a/meta-linaro/recipes-extra/odp/odp.bb b/meta-linaro/recipes-extra/odp/odp.bb
index 28ab571f..8a686c6b 100644
--- a/meta-linaro/recipes-extra/odp/odp.bb
+++ b/meta-linaro/recipes-extra/odp/odp.bb
@@ -5,71 +5,21 @@ SECTION = "console/tools"
LICENSE = "BSD | GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=dd8b05a36dd5410381ad0679f9151808"
-PV = "20131206"
+PV = "20131227"
-SRC_URI = "git://git.linaro.org/lng/odp.git;name=odp \
- git://git.linaro.org/lng/dpdk.git;destsuffix=git/dpdk;name=dpdk \
- git://git.linaro.org/lng/eventmachine-code.git;destsuffix=git/openem;name=openem"
+SRC_URI = "git://git.linaro.org/lng/odp.git;name=odp"
-SRCREV_odp = "66cd614e9036084242ce7d3d742a4fa00791b59d"
-SRCREV_dpdk = "0e108af9f3cb50020a50903f8b22447257ebbac1"
-SRCREV_openem = "a38131fb2284a006b06be8becd5ccdffe90f17a7"
+SRCREV_odp = "9dde32f3d5f4201293f279b2ea51ee21f5335093"
SRCREV_FORMAT = "odp"
S = "${WORKDIR}/git"
-# Openem works badly with parallel make. Because of this code will be dropped in future,
-# unsetting parallel make here.
-PARALLEL_MAKE = ""
-
-# DPDK unables to parse syntax with white spaces like: CC=...-gcc --sysbin=../ --. DPDK itself is huge
-# project which has 54 different make files half of them are generated through configs. And the idea was to use this hack and
-# do not spend time on fixing external project, because we are integrating code from dpdk and openem to odp. So that both
-# dpdk and openem reference will be dropped and we will go only with single odp.
-EXTRA_OEMAKE = "CC=`echo ${CC} | cut -d " " -f 1` LD=`echo ${LD} | cut -d " " -f 1` AR=`echo ${AR} | cut -d " " -f 1`"
-
-do_compile() {
- # Unset prefix is hack around dpdk. It uses $prefix almost everywhere.
- # And openem prefix corrupts makefile logic. So it has to be unset.
- unset prefix
- oe_runmake dpdk
- oe_runmake openem
- oe_runmake odp
-}
-
do_install() {
oe_runmake install DESTDIR=${D}
-
- #copy dpdk files to image
- install -d ${D}/${libdir}/dpdk
- cp -a dpdk/generic_32-default-linuxapp-gcc-openem/lib/* ${D}/${libdir}/dpdk/
- install -d ${D}/${includedir}/dpdk
- cp -rL dpdk/generic_32-default-linuxapp-gcc-openem/include ${D}/${includedir}/dpdk/
-
- #copy openem
- install -d ${D}/${libdir}/openem
- find openem -type f -perm -o+rx -exec cp {} ${D}/${libdir}/openem \;
}
# ODP
# ODP primary shipped as static library plus some API test and samples/
# Current makefile installs it to /usr/share/odp so use this folder here.
-PACKAGES =+ "${PN}-example"
-PACKAGES =+ "${PN}-example-dbg"
-FILES_${PN}-example-dbg += "${datadir}/odp/.debug"
-FILES_${PN}-example += "${datadir}/odp/odp_app"
-
-# DPDK
-# DPDK is software framework which consist of static libraries
-# and include files to build applications with that static libraries.
-# Include files MUST be in same package as static libraries.
-PACKAGES =+ "${PN}-dpdk-staticdev"
-FILES_${PN}-dpdk-staticdev += "${libdir}/dpdk/*.a"
-FILES_${PN}-dpdk-staticdev += "${includedir}/dpdk"
-
-# OPENEM
-PACKAGES =+ "${PN}-openem-example"
-PACKAGES =+ "${PN}-openem-example-dbg"
-FILES_${PN}-openem-example-dbg += "${libdir}/openem/.debug"
-FILES_${PN}-openem-example += "${libdir}/openem"
+FILES_${PN}-dbg += "${datadir}/odp/.debug"
diff --git a/meta-linaro/recipes-extra/odp/openem.bb b/meta-linaro/recipes-extra/odp/openem.bb
new file mode 100644
index 00000000..a5951c08
--- /dev/null
+++ b/meta-linaro/recipes-extra/odp/openem.bb
@@ -0,0 +1,66 @@
+DESCRIPTION = "Open Event Machine and Intel DPDK used for OpenDataPlane (ODP) for reference implementation and performance measurements."
+SECTION = "console/tools"
+
+LICENSE = "BSD | GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=dd8b05a36dd5410381ad0679f9151808"
+PV = "20131206"
+
+SRC_URI = "git://git.linaro.org/lng/odp.git;name=odp \
+ git://git.linaro.org/lng/dpdk.git;destsuffix=git/dpdk;name=dpdk \
+ git://git.linaro.org/lng/eventmachine-code.git;destsuffix=git/openem;name=openem"
+
+SRCREV_odp = "66cd614e9036084242ce7d3d742a4fa00791b59d"
+SRCREV_dpdk = "0e108af9f3cb50020a50903f8b22447257ebbac1"
+SRCREV_openem = "a38131fb2284a006b06be8becd5ccdffe90f17a7"
+SRCREV_FORMAT = "odp"
+
+S = "${WORKDIR}/git"
+
+# Openem works badly with parallel make. Because of this code will be dropped in future,
+# unsetting parallel make here.
+PARALLEL_MAKE = ""
+
+# DPDK unables to parse syntax with white spaces like: CC=...-gcc --sysbin=../ --. DPDK itself is huge
+# project which has 54 different make files half of them are generated through configs. And the idea was to use this hack and
+# do not spend time on fixing external project, because we are integrating code from dpdk and openem to odp. So that both
+# dpdk and openem reference will be dropped and we will go only with single odp.
+EXTRA_OEMAKE = "CC=`echo ${CC} | cut -d " " -f 1` LD=`echo ${LD} | cut -d " " -f 1` AR=`echo ${AR} | cut -d " " -f 1`"
+
+do_compile() {
+ # Unset prefix is hack around dpdk. It uses $prefix almost everywhere.
+ # And openem prefix corrupts makefile logic. So it has to be unset.
+ unset prefix
+ oe_runmake dpdk
+ oe_runmake openem
+}
+
+do_install() {
+ #ODP project now builds from odp.bb, however we use for openem and dpdk
+ #old tree of odp which has all all makefiles in it.
+ #oe_runmake install DESTDIR=${D}
+
+ #copy dpdk files to image
+ install -d ${D}/${libdir}/dpdk
+ cp -a dpdk/generic_32-default-linuxapp-gcc-openem/lib/* ${D}/${libdir}/dpdk/
+ install -d ${D}/${includedir}/dpdk
+ cp -rL dpdk/generic_32-default-linuxapp-gcc-openem/include ${D}/${includedir}/dpdk/
+
+ #copy openem
+ install -d ${D}/${libdir}/openem
+ find openem -type f -perm -o+rx -exec cp {} ${D}/${libdir}/openem \;
+}
+
+# DPDK
+# DPDK is software framework which consist of static libraries
+# and include files to build applications with that static libraries.
+# Include files MUST be in same package as static libraries.
+PACKAGES =+ "${PN}-dpdk-staticdev"
+FILES_${PN}-dpdk-staticdev += "${libdir}/dpdk/*.a"
+FILES_${PN}-dpdk-staticdev += "${includedir}/dpdk"
+
+# OPENEM
+PACKAGES =+ "${PN}-example"
+PACKAGES =+ "${PN}-example-dbg"
+FILES_${PN}-example-dbg += "${libdir}/openem/.debug"
+FILES_${PN}-example += "${libdir}/openem"
+