[PATCH 0/3] 3 fixes

[PATCH 0/3] 3 fixes

[Robert Yang]

The following changes since commit 7ffe10df73cc20d10fcd41b121074445273bd60e:

  license_class: license_create_manifest improvment (2015-05-09 22:26:02 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/3fixes
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/3fixes

Robert Yang (3):
  socat: fix for parallel build
  xserver-xorg: disable xwayland
  strace: add PACKAGECONFIG for bluez

 .../socat/Makefile.in-fix-for-parallel-build.patch |   35 ++++++++++++++++++++
 meta/recipes-connectivity/socat/socat_1.7.3.0.bb   |    1 +
 meta/recipes-devtools/strace/strace_4.10.bb        |    8 +++--
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    1 +
 4 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch

-- 
1.7.9.5

[PATCH 1/3] socat: fix for parallel build

[Robert Yang]

Fixed:
vsnprintf_r.o: file not recognized: File truncated
collect2: error: ld returned 3 exit status
Makefile:122: recipe for target 'filan' failed

Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../socat/Makefile.in-fix-for-parallel-build.patch |   35 ++++++++++++++++++++
 meta/recipes-connectivity/socat/socat_1.7.3.0.bb   |    1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch

diff --git a/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch b/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
new file mode 100644
index 0000000..aa4db65
--- /dev/null
+++ b/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
@@ -0,0 +1,35 @@
+From c6f0080b55679b6e8b5d332d6e05fdcbda1e4064 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Mon, 4 May 2015 00:58:47 -0700
+Subject: [PATCH] Makefile.in: fix for parallel build
+
+Fixed:
+vsnprintf_r.o: file not recognized: File truncated
+collect2: error: ld returned 3 exit status
+Makefile:122: recipe for target 'filan' failed
+
+Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f2a6edb..88b784b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -118,7 +118,7 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut
+ procan: $(PROCAN_OBJS)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS)
+ 
+-filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
++filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS)
+ 
+ libxio.a: $(XIOOBJS) $(UTLOBJS)
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.0.bb b/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
index 8923f41..b58e0a7 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.3.0.bb
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 
 
 SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
+           file://Makefile.in-fix-for-parallel-build.patch \
 "
 
 SRC_URI[md5sum] = "b607edb65bc6c57f4a43f06247504274"
-- 
1.7.9.5

[PATCH 2/3] xserver-xorg: disable xwayland

[Robert Yang]

The default is auto, we can disable it rather than depend on wayland or
add a PACKAGECONFIG since they are two display servers.

Fixed do_compile error:
hw/xwayland/xwayland.h:36:28: fatal error: wayland-client.h: No such file or directory
 #include <wayland-client.h>
                            ^
compilation terminated.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 30299c2..512266c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -104,6 +104,7 @@ EXTRA_OECONF += "--with-fop=no \
                  --disable-record \
                  --disable-dmx \
                  --disable-xnest \
+                 --disable-xwayland \
                  --enable-xvfb \
                  --enable-composite \
                  --without-dtrace \
-- 
1.7.9.5

Re: [PATCH 2/3] xserver-xorg: disable xwayland

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 496 bytes --]

On 11 May 2015 at 09:32, Robert Yang <liezhi.yang@windriver.com> wrote:

> The default is auto, we can disable it rather than depend on wayland or
> add a PACKAGECONFIG since they are two display servers.
>
> Fixed do_compile error:
> hw/xwayland/xwayland.h:36:28: fatal error: wayland-client.h: No such file
> or directory
>  #include <wayland-client.h>
>

And XWayland is the migration path from a pure X world to a pure Wayland
world.  Please add this as a PACKAGECONFIG.

Ross

[-- Attachment #2: Type: text/html, Size: 891 bytes --]

Re: [PATCH 2/3] xserver-xorg: disable xwayland

[Robert Yang]

On 05/11/2015 07:22 PM, Burton, Ross wrote:
>
> On 11 May 2015 at 09:32, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>     The default is auto, we can disable it rather than depend on wayland or
>     add a PACKAGECONFIG since they are two display servers.
>
>     Fixed do_compile error:
>     hw/xwayland/xwayland.h:36:28: fatal error: wayland-client.h: No such file or
>     directory
>       #include <wayland-client.h>
>
>
> And XWayland is the migration path from a pure X world to a pure Wayland world.
> Please add this as a PACKAGECONFIG.

Thanks, updated it in the repo:

   git://git.openembedded.org/openembedded-core-contrib rbt/3fixes

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 30299c2..f3b2453 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -115,7 +115,9 @@ EXTRA_OECONF += "--with-fop=no \
                   ac_cv_file__usr_share_sgml_X11_defs_ent=no \
  "

-PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri 
dri2 glx', '', d)}"
+PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri 
dri2 glx', '', d)} \
+                   ${@bb.utils.contains("DISTRO_FEATURES", "wayland", 
"xwayland", "", d)} \
+"

  PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
  PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa 
xf86driproto"
@@ -128,6 +130,7 @@ PACKAGECONFIG[xshmfence] = 
"--enable-xshmfence,--disable-xshmfence,libxshmfence"
  PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native 
docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
  PACKAGECONFIG[systemd-logind] = 
"--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
  PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto"
+PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland"

  do_install_append () {
         # Its assumed base-files creates this for us

// Robert

>
> Ross

Re: [PATCH 2/3] xserver-xorg: disable xwayland

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

On 12 May 2015 at 03:42, Robert Yang <liezhi.yang@windriver.com> wrote:

> Thanks, updated it in the repo:
>

Please check with a clean sysroot:

| checking for XWAYLANDMODULES... no
| checking whether to build Xwayland DDX... yes
| configure: error: Xwayland build explicitly requested, but required
modules not found.

Ross

[-- Attachment #2: Type: text/html, Size: 959 bytes --]

Re: [PATCH 2/3] xserver-xorg: disable xwayland

[Robert Yang]

On 05/12/2015 10:21 PM, Burton, Ross wrote:
>
> On 12 May 2015 at 03:42, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>     Thanks, updated it in the repo:
>
>
> Please check with a clean sysroot:
>
> | checking for XWAYLANDMODULES... no
> | checking whether to build Xwayland DDX... yes
> | configure: error: Xwayland build explicitly requested, but required modules
> not found.

Sorry, libepoxy is also required:

configure:32059: checking for XWAYLANDMODULES
configure:32066: $PKG_CONFIG --exists --print-errors "wayland-client >= 1.3.0 
libdrm epoxy"
Package epoxy was not found in the pkg-config search path.
Perhaps you should add the directory containing `epoxy.pc'
to the PKG_CONFIG_PATH environment variable
No package 'epoxy' found


I've updated it in the repo:

   git://git.openembedded.org/openembedded-core-contrib rbt/3fixes

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 30299c2..3d16d3a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -115,7 +115,9 @@ EXTRA_OECONF += "--with-fop=no \
                   ac_cv_file__usr_share_sgml_X11_defs_ent=no \
  "

-PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri 
dri2 glx', '', d)}"
+PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri 
dri2 glx', '', d)} \
+                   ${@bb.utils.contains("DISTRO_FEATURES", "wayland", 
"xwayland", "", d)} \
+"

  PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
  PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa 
xf86driproto"
@@ -128,6 +130,7 @@ PACKAGECONFIG[xshmfence] = 
"--enable-xshmfence,--disable-xshmfence,libxshmfence"
  PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native 
docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
  PACKAGECONFIG[systemd-logind] = 
"--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
  PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto"
+PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy"

  do_install_append () {
         # Its assumed base-files creates this for us

// Robert

>
> Ross

Re: [PATCH 2/3] xserver-xorg: disable xwayland

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

On 13 May 2015 at 02:31, Robert Yang <liezhi.yang@windriver.com> wrote:

> I've updated it in the repo:
>
>   git://git.openembedded.org/openembedded-core-contrib rbt/3fixes
>

Actually looked at the build output this time...  we should have each
xserver in a separate package really, so can the xwayland binary go into an
xwayland package?  We don't really want to force the xwayland binary (and
extra dependencies) on everyone's X11-based images just because wayland is
a default distro feature.

Ross

[-- Attachment #2: Type: text/html, Size: 1051 bytes --]

Re: [PATCH 2/3] xserver-xorg: disable xwayland

[Robert Yang]

On 05/14/2015 07:38 AM, Burton, Ross wrote:
>
> On 13 May 2015 at 02:31, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>     I've updated it in the repo:
>
>        git://git.openembedded.org/openembedded-core-contrib
>     <http://git.openembedded.org/openembedded-core-contrib> rbt/3fixes
>
>
> Actually looked at the build output this time...  we should have each xserver in
> a separate package really, so can the xwayland binary go into an xwayland
> package?  We don't really want to force the xwayland binary (and extra
> dependencies) on everyone's X11-based images just because wayland is a default
> distro feature.

Sounds good, updated in the repo:

   git://git.openembedded.org/openembedded-core-contrib rbt/3fixes



commit 913aba210698327a099fd2c43af63fba3545d868
Author: Robert Yang <liezhi.yang@windriver.com>
Date:   Mon May 11 00:12:01 2015 -0700

     xserver-xorg: add PACKAGECONFIG for wayland and add xserver-xorg-xwayland

     Fixed do_compile error:
     hw/xwayland/xwayland.h:36:28: fatal error: wayland-client.h: No such file 
or directory
      #include <wayland-client.h>
                                 ^
     compilation terminated.

     Conditionally add xserver-xorg-xwayland pkg which contains
     /usr/bin/Xwayland.

     Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 30299c2..ee5041f 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -62,7 +62,9 @@ PACKAGES =+ "${PN}-security-policy \
               ${PN}-module-exa \
               ${PN}-module-xaa \
               ${PN}-module-libxf1bpp \
-             ${PN}-module-libxf4bpp"
+             ${PN}-module-libxf4bpp \
+             ${@bb.utils.contains("DISTRO_FEATURES", "wayland", 
"${PN}-xwayland", "", d)} \
+"

  RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb 
xserver-xf86-config xkbcomp"
  RDEPENDS_${PN}-xvfb += "xkeyboard-config"
@@ -97,6 +99,7 @@ FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so"
  FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
  FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
  FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
+FILES_${PN}-xwayland = "${bindir}/Xwayland"

  EXTRA_OECONF += "--with-fop=no \
                   --with-pic \
@@ -115,7 +118,9 @@ EXTRA_OECONF += "--with-fop=no \
                   ac_cv_file__usr_share_sgml_X11_defs_ent=no \
  "

-PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri 
dri2 glx', '', d)}"
+PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri 
dri2 glx', '', d)} \
+                   ${@bb.utils.contains("DISTRO_FEATURES", "wayland", 
"xwayland", "", d)} \
+"

  PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
  PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa 
xf86driproto"
@@ -128,6 +133,7 @@ PACKAGECONFIG[xshmfence] = 
"--enable-xshmfence,--disable-xshmfence,libxshmfence"
  PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native 
docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
  PACKAGECONFIG[systemd-logind] = 
"--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
  PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto"
+PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy"

  do_install_append () {
         # Its assumed base-files creates this for us

// Robert

>
> Ross

Re: [PATCH 2/3] xserver-xorg: disable xwayland

[Andreas Oberritter]

Hi Robert,

On 14.05.2015 09:02, Robert Yang wrote:
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -62,7 +62,9 @@ PACKAGES =+ "${PN}-security-policy \
>               ${PN}-module-exa \
>               ${PN}-module-xaa \
>               ${PN}-module-libxf1bpp \
> -             ${PN}-module-libxf4bpp"
> +             ${PN}-module-libxf4bpp \
> +             ${@bb.utils.contains("DISTRO_FEATURES", "wayland",
> "${PN}-xwayland", "", d)} \
> +"

You don't need a conditional here, because empty packages get ignored.

Regards,
Andreas

Re: [PATCH 2/3] xserver-xorg: disable xwayland

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

On 15 May 2015 at 11:16, Andreas Oberritter <obi@opendreambox.org> wrote:

> You don't need a conditional here, because empty packages get ignored.
>

I should have said that I fixed that when merging it into MUT, so there's
no need to re-send Robert.

Ross

[-- Attachment #2: Type: text/html, Size: 680 bytes --]

[PATCH 3/3] strace: add PACKAGECONFIG for bluez

[Robert Yang]

Fixed:
net.c:65:34: fatal error: bluetooth/bluetooth.h: No such file or directory
 # include <bluetooth/bluetooth.h>
                                  ^
compilation terminated.

And use "??=" rather than "?=" for PACKAGECONFIG.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/strace/strace_4.10.bb |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/strace/strace_4.10.bb b/meta/recipes-devtools/strace/strace_4.10.bb
index 07a1076..20b7e3d 100644
--- a/meta/recipes-devtools/strace/strace_4.10.bb
+++ b/meta/recipes-devtools/strace/strace_4.10.bb
@@ -17,14 +17,18 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
 SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912"
 SRC_URI[sha256sum] = "e6180d866ef9e76586b96e2ece2bfeeb3aa23f5cc88153f76e9caedd65e40ee2"
 
-inherit autotools ptest
+inherit autotools ptest bluetooth
 RDEPENDS_${PN}-ptest += "make coreutils grep gawk"
 
-PACKAGECONFIG_class-target ?= "libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
+PACKAGECONFIG_class-target ??= "\
+    libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
+"
 
 PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio"
 PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
 PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind"
+PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}"
 
 TESTDIR = "tests"
 
-- 
1.7.9.5