pull merge request

---
 .../iperf-2.0.5/0001-fix-out-of-tree-config.patch  | 52 ++++++++++++++++++++++
 meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb     |  1 +
 2 files changed, 53 insertions(+)
 create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch

meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch new file +52 -0

new file mode 100644
index 0000000..e8a0297
@@ -0,0 +1,52 @@
+iperf: fix out of tree configuration
+
+The configure step uses a package header to check for support of types/declares,
+this package header encapsulates all the required system header for providing
+the needed resources. When configured from an out of tree directory the package
+header is not found due to the hard path.
+We now make the path for package header relative to our 'srcdir' so it is
+found appropriately.
+
+Signed-off-by: Awais Belal <[email protected]>
+---
+diff --git a/configure.ac b/configure.ac
+index 2b3fd20..d420f9e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -176,8 +176,8 @@ dnl Check for system services
+ 
+ dnl check for multicast
+ if test "$ac_cv_multicast" != no; then
+-  AC_CHECK_TYPES(struct ip_mreq,,,[#include "compat/headers_slim.h"])
+-  AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"])
++  AC_CHECK_TYPES(struct ip_mreq,,,[#include "${srcdir}/compat/headers_slim.h"])
++  AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include "${srcdir}/compat/headers_slim.h"])
+   AC_MSG_CHECKING(for multicast support)
+   ac_cv_multicast=no
+   if test "$ac_cv_have_decl_IP_ADD_MEMBERSHIP" = yes; then
+@@ -193,9 +193,9 @@ fi
+ 
+ dnl check for IPv6
+ if test "$ac_cv_have_ipv6" != no; then
+-  AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "compat/headers_slim.h"])
+-  AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "compat/headers_slim.h"])
+-  AC_CHECK_DECLS(AF_INET6,,,[#include "compat/headers_slim.h"])
++  AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "${srcdir}/compat/headers_slim.h"])
++  AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "${srcdir}/compat/headers_slim.h"])
++  AC_CHECK_DECLS(AF_INET6,,,[#include "${srcdir}/compat/headers_slim.h"])
+   AC_MSG_CHECKING(for IPv6 headers and structures)
+   ac_cv_have_ipv6=no
+   if test "$ac_cv_type_struct_sockaddr_storage" = yes; then
+@@ -211,9 +211,9 @@ fi
+ 
+ if test "$ac_cv_have_ipv6" = yes; then
+   if test "$ac_cv_multicast" = yes; then
+-    AC_CHECK_TYPES(struct ipv6_mreq,,,[#include "compat/headers_slim.h"])
+-    AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"])
+-    AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include "compat/headers_slim.h"])
++    AC_CHECK_TYPES(struct ipv6_mreq,,,[#include "${srcdir}/compat/headers_slim.h"])
++    AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "${srcdir}/compat/headers_slim.h"])
++    AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include "${srcdir}/compat/headers_slim.h"])
+     AC_MSG_CHECKING(for IPv6 multicast support)
+     ac_cv_have_ipv6_multicast=no
+     if test "$ac_cv_type_struct_ipv6_mreq" = yes; then

meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb +1 -0

index 1bd554b..20adc0d 100644
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e8478eae9f479e39bc34975193360298"
 
 SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf/${BP}.tar.gz \
             file://iperf-2.0.5_ManPage.patch \
+            file://0001-fix-out-of-tree-config.patch \
           "
 
 SRC_URI[md5sum] = "44b5536b67719f4250faed632a3cd016"

Signature · 1 line

1.9.1

Armin Kuster

author

2015-01-23 22:54 UTC #4 lore raw

PATCH 2/11 meta-gnome: Add LAYERVERSION and LAYERDEPENDS

From: Jackie Huang <[email protected]>

According to README, it depends on oe-core and openembedded-layer

---
 meta-gnome/conf/layer.conf | 6 ++++++
 1 file changed, 6 insertions(+)

meta-gnome/conf/layer.conf +6 -0

index 902ab8f..58e12a9 100644
@@ -7,3 +7,9 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILE_COLLECTIONS += "gnome-layer"
 BBFILE_PATTERN_gnome-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_gnome-layer = "7"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_gnome-layer = "1"
+
+LAYERDEPENDS_gnome-layer = "core openembedded-layer"

Signature · 1 line

1.9.1

Armin Kuster

author

2015-01-23 22:54 UTC #5 lore raw

PATCH 3/11 meta-perl: Add LAYERVERSION and LAYERDEPENDS

From: Jackie Huang <[email protected]>

According to README, it depends on oe-core layer

---
 meta-perl/conf/layer.conf | 6 ++++++
 1 file changed, 6 insertions(+)

meta-perl/conf/layer.conf +6 -0

index 09ed0e5..0485ac8 100644
@@ -8,3 +8,9 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "perl-layer"
 BBFILE_PATTERN_perl-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_perl-layer = "6"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_perl-layer = "1"
+
+LAYERDEPENDS_perl-layer = "core"

Signature · 1 line

1.9.1

Armin Kuster

author

2015-01-23 22:54 UTC #6 lore raw

PATCH 4/11 meta-python: Add LAYERVERSION and LAYERDEPENDS

From: Jackie Huang <[email protected]>

According to README, it depends on oe-core and openembedded-layer

---
 meta-python/conf/layer.conf | 6 ++++++
 1 file changed, 6 insertions(+)

meta-python/conf/layer.conf +6 -0

index 4e8eca3..55169e4 100644
@@ -7,3 +7,9 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
 BBFILE_COLLECTIONS += "meta-python"
 BBFILE_PATTERN_meta-python := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-python = "7"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_meta-python = "1"
+
+LAYERDEPENDS_meta-python = "core openembedded-layer"

Signature · 1 line

1.9.1

Armin Kuster

author

2015-01-23 22:54 UTC #7 lore raw

PATCH 5/11 meta-ruby: Add LAYERVERSION and LAYERDEPENDS

From: Jackie Huang <[email protected]>

According to README, it depends on oe-core and openembedded-layer

---
 meta-ruby/conf/layer.conf | 6 ++++++
 1 file changed, 6 insertions(+)

meta-ruby/conf/layer.conf +6 -0

index 6c2369f..b526a5d 100644
@@ -7,3 +7,9 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILE_COLLECTIONS += "ruby-layer"
 BBFILE_PATTERN_ruby-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_ruby-layer = "7"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_ruby-layer = "1"
+
+LAYERDEPENDS_ruby-layer = "core openembedded-layer"

Signature · 1 line

1.9.1

Armin Kuster

author

2015-01-23 22:54 UTC #8 lore raw

PATCH 6/11 toolchain-layer: Add LAYERVERSION and LAYERDEPENDS

From: Jackie Huang <[email protected]>

According to README, it depends on oe-core layer

---
 toolchain-layer/conf/layer.conf | 5 +++++
 1 file changed, 5 insertions(+)

toolchain-layer/conf/layer.conf +5 -0

index ca81eb1..b377f12 100644
@@ -23,3 +23,8 @@ BBFILE_PATTERN_toolchain-layer := "^${LAYERDIR}/"
 
 BBFILE_PRIORITY_toolchain-layer = "6"
 
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_toolchain-layer = "1"
+
+LAYERDEPENDS_toolchain-layer = "core"

Signature · 1 line

1.9.1

Armin Kuster

author

2015-01-23 22:54 UTC #9 lore raw

PATCH 7/11 meta-efl: Add LAYERVERSION and LAYERDEPENDS

From: Jackie Huang <[email protected]>

According to README, it depends on oe-core and openembedded-layer

---
 meta-efl/conf/layer.conf | 6 ++++++
 1 file changed, 6 insertions(+)

meta-efl/conf/layer.conf +6 -0

index 53f4ff4..ed132aa 100644
@@ -8,6 +8,12 @@ BBFILE_COLLECTIONS += "efl-layer"
 BBFILE_PATTERN_efl-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_efl-layer = "7"
 
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_efl-layer = "1"
+
+LAYERDEPENDS_efl-layer = "core openembedded-layer"
+
 E_MIRROR = "http://download.enlightenment.org/releases"
 E_RELEASES = "http://download.enlightenment.org/rel"
 E_SVN = "svn://svn.enlightenment.org/svn/e"

Signature · 1 line

1.9.1

Armin Kuster

author

2015-01-23 22:54 UTC #10 lore raw

PATCH 8/11 meta-filesystems: Add LAYERVERSION and LAYERDEPENDS

From: Jackie Huang <[email protected]>

According to README, it depends on oe-core and openembedded-layer

---
 meta-filesystems/conf/layer.conf | 6 ++++++
 1 file changed, 6 insertions(+)

meta-filesystems/conf/layer.conf +6 -0

index c0bbd78..9ed6d1b 100644
@@ -8,3 +8,9 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "filesystems-layer"
 BBFILE_PATTERN_filesystems-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_filesystems-layer = "6"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_filesystems-layer = "1"
+
+LAYERDEPENDS_filesystems-layer = "core openembedded-layer"

Signature · 1 line

1.9.1

Armin Kuster

author

2015-01-23 22:54 UTC #11 lore raw

PATCH 9/11 meta-gpe: Add LAYERVERSION and LAYERDEPENDS

From: Jackie Huang <[email protected]>

According to README, it depends on oe-core and openembedded-layer

---
 meta-gpe/conf/layer.conf | 6 ++++++
 1 file changed, 6 insertions(+)

meta-gpe/conf/layer.conf +6 -0

index 6c018b1..00f3929 100644
@@ -7,3 +7,9 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILE_COLLECTIONS += "gpe-layer"
 BBFILE_PATTERN_gpe-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_gpe-layer = "7"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_gpe-layer = "1"
+
+LAYERDEPENDS_gpe-layer = "core openembedded-layer"

Signature · 1 line

1.9.1

Armin Kuster

author

2015-01-23 22:54 UTC #12 lore raw

PATCH 10/11 nbench-byte: Fix license QA error

From: Otavio Salvador <[email protected]>

The license is not a common only and seems to be a 'free distribution' license but without explicit rules about modification or similar. Due that, we copied the license text from the README file and added it onto nbench-byte license file.

This fixes following QA error:

,----

| WARNING: Recipe nbench-byte, LICENSE (freely distributable) has
|     invalid format, LICENSES must have operator "([&|() ])" between
| 	them.

`----

Signed-off-by Otavio Salvador <[email protected]>

---
 meta-oe/licenses/nbench-byte                               | 10 ++++++++++
 meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/licenses/nbench-byte

meta-oe/licenses/nbench-byte new file +10 -0

new file mode 100644
index 0000000..7e47ba6
@@ -0,0 +1,10 @@
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb +1 -1

index a98d507..2eedd7e 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "BYTE Magazine's native benchmarks (also called BYTEmark) \
 designed to expose the capabilities of a system's CPU, FPU, \
 and memory system."
 HOMEPAGE = "http://www.tux.org/~mayer/linux/"
-LICENSE = "freely distributable"
+LICENSE = "nbench-byte"
 LIC_FILES_CHKSUM = "file://README;beginline=57;endline=66;md5=020ef579f8fa5746b7e307a54707834f"
 SECTION = "console/utils"

Signature · 1 line

1.9.1

Armin Kuster

author

2015-01-23 22:54 UTC #13 lore raw

PATCH 11/11 xmlto: remove recipe as it's in OE core

From: "[email protected]" <[email protected]>

Remove xmlto recipe from meta-oe because it's in OE core now.

Signed-off-by Chen Qi <[email protected]>

---
 .../xmlto/xmlto-0.0.25/obsolete_automake_macros.patch  | 12 ------------
 meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb          | 18 ------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 meta-oe/recipes-support/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
 delete mode 100644 meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb

meta-oe/recipes-support/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch deleted +0 ~~-12~~

deleted file mode 100644
index faa8acc..0000000
@@ -1,12 +0,0 @@
-diff -Nurd xmlto-0.0.25/configure.in xmlto-0.0.25/configure.in
---- xmlto-0.0.25/configure.in	2011-12-01 17:49:00.000000000 +0200
-+++ xmlto-0.0.25/configure.in	2013-01-07 05:24:16.169953519 +0200
-@@ -1,7 +1,7 @@
- AC_INIT(xmlto, 0.0.25)
- AC_CONFIG_SRCDIR(xmlto.spec.in)
- AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AC_PROG_CC
- AM_PROG_CC_C_O

meta-oe/recipes-support/xmlto/xmlto_0.0.25.bb deleted +0 ~~-18~~

deleted file mode 100644
index 9188c8a..0000000
@@ -1,18 +0,0 @@
-SUMMARY = "A shell-script tool for converting XML files to various formats"
-HOMEPAGE = "https://fedorahosted.org/xmlto/" 
-SECTION = "docs/xmlto" 
-LICENSE = "GPLv2" 
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-PR = "r1"
-
-SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \
-           file://obsolete_automake_macros.patch \
-"
-SRC_URI[md5sum] = "a88cd3f08789b4825d1ac89fa065170d"
-SRC_URI[sha256sum] = "c52b56d929e8d20fc19cd3b7ec238f8d039730c56ee311cc352e843147e3e31a"
-
-inherit autotools  
-
-BBCLASSEXTEND = "native nativesdk"

Signature · 1 line

1.9.1

Otavio Salvador

Acked-by on the v1 series

2015-01-24 00:50 UTC #14 lore raw

Quoted 24 lines · Armin Kuster

Please consider this changes for meta-openembedded dizzy
The following changes since commit 3b83aa44186fac44a679cd24a5ae64560cb4118f:
xf86-video-glamo: fix build with xserver 1.16 (2015-01-18 16:40:55 -0800)
are available in the git repository at:
git://github.com/akuster/meta-openembedded akuster/dizzy-next
https://github.com/akuster/meta-openembedded/tree/akuster/dizzy-next
Belal, Awais (1):
iperf: fix out of tree configuration
Jackie Huang (8):
meta-gnome: Add LAYERVERSION and LAYERDEPENDS
meta-perl: Add LAYERVERSION and LAYERDEPENDS
meta-python: Add LAYERVERSION and LAYERDEPENDS
meta-ruby: Add LAYERVERSION and LAYERDEPENDS
toolchain-layer: Add LAYERVERSION and LAYERDEPENDS
meta-efl: Add LAYERVERSION and LAYERDEPENDS
meta-filesystems: Add LAYERVERSION and LAYERDEPENDS
meta-gpe: Add LAYERVERSION and LAYERDEPENDS

Quoted 5 lines

Otavio Salvador (1):
nbench-byte: Fix license QA error
[email protected] (1):
xmlto: remove recipe as it's in OE core

Acked-by Otavio Salvador <[email protected]>

Signature · 3 lines

Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Koen Kooi

2015-01-24 09:09 UTC #2 lore raw

Re: [PATCH 01/11] iperf: fix out of tree configuration

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Armin Kuster schreef op 23-01-15 om 23:53:

Quoted 17 lines

From: "Belal, Awais" <[email protected]>
The configure step uses a package header to check for support of types/declares, this package header encapsulates all the required system headers for providing the needed resources. When configured from an out of tree directory the package header is not found due to the hard path. We now make the path for package header relative to 'srcdir' so it is found appropriately.
Signed-off-by Awais Belal <[email protected]> Signed-off-by: Martin
Jansa <[email protected]> Signed-off-by: Armin Kuster <[email protected]> --- .../iperf-2.0.5/0001-fix-out-of-tree-config.patch | 52 ++++++++++++++++++++++ meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch

Quoted 5 lines

diff --git
a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch

new file mode 100644

Quoted 4 lines

index 0000000..e8a0297 --- /dev/null +++ b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch

@@ -0,0 +1,52 @@

Quoted 7 lines

+iperf: fix out of tree configuration + +The configure step uses a package header to check for support of types/declares, +this package header encapsulates all the required system header for providing +the needed resources. When configured from an out of tree directory the package +header is not found due to the hard path. +We now make the path for package header relative to our 'srcdir' so it is +found appropriately. + +Signed-off-by: Awais Belal <[email protected]>

Missing Upstream-status

Quoted 42 lines

+--- +diff --git a/configure.ac b/configure.ac +index 2b3fd20..d420f9e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -176,8 +176,8 @@ dnl Check for system services + + dnl check for multicast + if test "$ac_cv_multicast" != no; then +- AC_CHECK_TYPES(struct ip_mreq,,,[#include "compat/headers_slim.h"]) +- AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"]) ++ AC_CHECK_TYPES(struct ip_mreq,,,[#include "${srcdir}/compat/headers_slim.h"]) ++ AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include
"${srcdir}/compat/headers_slim.h"]) + AC_MSG_CHECKING(for multicast
support) + ac_cv_multicast=no + if test
"$ac_cv_have_decl_IP_ADD_MEMBERSHIP" = yes; then +@@ -193,9 +193,9 @@ fi
+ + dnl check for IPv6 + if test "$ac_cv_have_ipv6" != no; then +- AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "compat/headers_slim.h"]) +- AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "compat/headers_slim.h"]) +- AC_CHECK_DECLS(AF_INET6,,,[#include "compat/headers_slim.h"]) ++ AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "${srcdir}/compat/headers_slim.h"]) ++ AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "${srcdir}/compat/headers_slim.h"]) ++ AC_CHECK_DECLS(AF_INET6,,,[#include "${srcdir}/compat/headers_slim.h"]) +
AC_MSG_CHECKING(for IPv6 headers and structures) + ac_cv_have_ipv6=no +
if test "$ac_cv_type_struct_sockaddr_storage" = yes; then +@@ -211,9
+211,9 @@ fi + + if test "$ac_cv_have_ipv6" = yes; then + if test
"$ac_cv_multicast" = yes; then +- AC_CHECK_TYPES(struct
ipv6_mreq,,,[#include "compat/headers_slim.h"]) +- AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"])
+-    AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include
"compat/headers_slim.h"]) ++    AC_CHECK_TYPES(struct
ipv6_mreq,,,[#include "${srcdir}/compat/headers_slim.h"]) ++ AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "${srcdir}/compat/headers_slim.h"]) ++ AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include
"${srcdir}/compat/headers_slim.h"]) + AC_MSG_CHECKING(for IPv6
multicast support) + ac_cv_have_ipv6_multicast=no + if test
"$ac_cv_type_struct_ipv6_mreq" = yes; then diff --git a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb index 1bd554b..20adc0d 100644 --- a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb +++ b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e8478eae9f479e39bc34975193360298"

Quoted 6 lines

SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf/${BP}.tar.gz \
file://iperf-2.0.5_ManPage.patch \ + file://0001-fix-out-of-tree-config.patch \ "
SRC_URI[md5sum] = "44b5536b67719f4250faed632a3cd016"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFUw2FFMkyGM64RGpERArugAJ4nkEYjuGS9ZOgyq/2ouo8dIUY7xQCeM58n jN/V4SPAvQw8zcM6qCTjyAw=
=4Vn9
-----END PGP SIGNATURE-----

akuster808

author

2015-01-26 15:37 UTC #3 lore raw

Re: [PATCH 01/11] iperf: fix out of tree configuration

I appreciate the review but I got this patch from master with the "Missing Upstream-status". This is for dizzy update. ( I really need to fix my process)

regards,
- Armin

Quoted 101 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Armin Kuster schreef op 23-01-15 om 23:53:
Quoted 17 lines
From: "Belal, Awais" <[email protected]>
The configure step uses a package header to check for support of types/declares, this package header encapsulates all the required system headers for providing the needed resources. When configured from an out of tree directory the package header is not found due to the hard path. We now make the path for package header relative to 'srcdir' so it is found appropriately.
Signed-off-by Awais Belal <[email protected]> Signed-off-by: Martin
Jansa <[email protected]> Signed-off-by: Armin Kuster <[email protected]> --- .../iperf-2.0.5/0001-fix-out-of-tree-config.patch | 52 ++++++++++++++++++++++ meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
Quoted 5 lines
diff --git
a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
new file mode 100644
Quoted 4 lines
index 0000000..e8a0297 --- /dev/null +++ b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
(quoted diff) +0 -0
@@ -0,0 +1,52 @@
Quoted 7 lines
+iperf: fix out of tree configuration + +The configure step uses a package header to check for support of types/declares, +this package header encapsulates all the required system header for providing +the needed resources. When configured from an out of tree directory the package +header is not found due to the hard path. +We now make the path for package header relative to our 'srcdir' so it is +found appropriately. + +Signed-off-by: Awais Belal <[email protected]>
Missing Upstream-status
Quoted 42 lines
+--- +diff --git a/configure.ac b/configure.ac +index 2b3fd20..d420f9e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -176,8 +176,8 @@ dnl Check for system services + + dnl check for multicast + if test "$ac_cv_multicast" != no; then +- AC_CHECK_TYPES(struct ip_mreq,,,[#include "compat/headers_slim.h"]) +- AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"]) ++ AC_CHECK_TYPES(struct ip_mreq,,,[#include "${srcdir}/compat/headers_slim.h"]) ++ AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include
"${srcdir}/compat/headers_slim.h"]) + AC_MSG_CHECKING(for multicast
support) + ac_cv_multicast=no + if test
"$ac_cv_have_decl_IP_ADD_MEMBERSHIP" = yes; then +@@ -193,9 +193,9 @@ fi
+ + dnl check for IPv6 + if test "$ac_cv_have_ipv6" != no; then +- AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "compat/headers_slim.h"]) +- AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "compat/headers_slim.h"]) +- AC_CHECK_DECLS(AF_INET6,,,[#include "compat/headers_slim.h"]) ++ AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "${srcdir}/compat/headers_slim.h"]) ++ AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "${srcdir}/compat/headers_slim.h"]) ++ AC_CHECK_DECLS(AF_INET6,,,[#include "${srcdir}/compat/headers_slim.h"]) +
AC_MSG_CHECKING(for IPv6 headers and structures) + ac_cv_have_ipv6=no +
if test "$ac_cv_type_struct_sockaddr_storage" = yes; then +@@ -211,9
+211,9 @@ fi + + if test "$ac_cv_have_ipv6" = yes; then + if test
"$ac_cv_multicast" = yes; then +- AC_CHECK_TYPES(struct
ipv6_mreq,,,[#include "compat/headers_slim.h"]) +- AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"])
+-    AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include
"compat/headers_slim.h"]) ++    AC_CHECK_TYPES(struct
ipv6_mreq,,,[#include "${srcdir}/compat/headers_slim.h"]) ++ AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "${srcdir}/compat/headers_slim.h"]) ++ AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include
"${srcdir}/compat/headers_slim.h"]) + AC_MSG_CHECKING(for IPv6
multicast support) + ac_cv_have_ipv6_multicast=no + if test
"$ac_cv_type_struct_ipv6_mreq" = yes; then diff --git a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb index 1bd554b..20adc0d 100644 --- a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb +++ b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e8478eae9f479e39bc34975193360298"
Quoted 6 lines
SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf/${BP}.tar.gz \
file://iperf-2.0.5_ManPage.patch \ + file://0001-fix-out-of-tree-config.patch \ "
SRC_URI[md5sum] = "44b5536b67719f4250faed632a3cd016"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFUw2FFMkyGM64RGpERArugAJ4nkEYjuGS9ZOgyq/2ouo8dIUY7xQCeM58n jN/V4SPAvQw8zcM6qCTjyAw=
=4Vn9
-----END PGP SIGNATURE-----

Martin Jansa

2015-01-28 08:19 UTC #15 lore raw