[dora][PATCH] 0/2] Small build fixes for dora

[dora][PATCH] 0/2] Small build fixes for dora

[Martin Jansa]

The following changes since commit ee173678383683e972c7d4d6f0ef5790bfa50274:

  cloud9: Fix branch param (2014-04-20 15:41:44 +0200)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib 08c6c87275ce97d7dd05bb0d10723f614731847a
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/dora-backports

Martin Jansa (2):
  daq: explicitly disable nfq and ipq modules
  glmark2: Add virtual/libx11 dependency

 meta-oe/recipes-benchmark/glmark2/glmark2_2012.12.bb | 2 +-
 meta-oe/recipes-connectivity/daq/daq_2.0.1.bb        | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

-- 
2.0.4

[dora][PATCH] 1/2] daq: explicitly disable nfq and ipq modules

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/daq/daq_2.0.1.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/daq/daq_2.0.1.bb b/meta-oe/recipes-connectivity/daq/daq_2.0.1.bb
index 4c1be44..bbf7263 100644
--- a/meta-oe/recipes-connectivity/daq/daq_2.0.1.bb
+++ b/meta-oe/recipes-connectivity/daq/daq_2.0.1.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f9ce51a65dd738dc1ae631d8b21c40e0"
 
 PARALLEL_MAKE = ""
 
-DEPENDS = "libpcap libpcre "
+DEPENDS = "libpcap libpcre"
 
 SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \
             file://disable-run-test-program-while-cross-compiling.patch "
@@ -13,4 +13,9 @@ SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \
 SRC_URI[md5sum] = "044aa3663d44580d005293eeb8ccf175"
 SRC_URI[sha256sum] = "ebba87c2ec76ac65d2980934423b0597909caead3a86ce5d1ba1ea6ce518ec6d"
 
+# these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking
+# this error from test-dependencies script:
+# daq/daq/latest lost dependency on  libdnet libmnl libnetfilter-queue libnfnetlink
+EXTRA_OECONF += "--disable-nfq-module --disable-ipq-module"
+
 inherit autotools
-- 
2.0.4

[dora][PATCH] 2/2] glmark2: Add virtual/libx11 dependency

[Martin Jansa]

* without it, do_configure fails:
  | Checking for 'x11'                       : not found
  | The configuration failed

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-benchmark/glmark2/glmark2_2012.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_2012.12.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_2012.12.bb
index 9edee14..fbc402b 100644
--- a/meta-oe/recipes-benchmark/glmark2/glmark2_2012.12.bb
+++ b/meta-oe/recipes-benchmark/glmark2/glmark2_2012.12.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv3+ & SGIv1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://COPYING.SGI;beginline=5;md5=269cdab4af6748677acce51d9aa13552"
 
-DEPENDS = "libpng12 jpeg"
+DEPENDS = "libpng12 jpeg virtual/libx11"
 
 SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
 
-- 
2.0.4