[PATCH 1/7] glibc-locale: Fix host-user-contaminated QA errors

[PATCH 1/7] glibc-locale: Fix host-user-contaminated QA errors

[Khem Raj]

Fixes

ERROR: glibc-locale-2.27-r0 do_package_qa: QA Issue: glibc-locale: /glibc-binary-localedata-hy-am/usr/lib/locale/hy_AM/LC_MEASUREMENT.tmp is owned by uid 3004, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/glibc/glibc-locale.inc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc
index b3cb10b87a..e50e5cf5e3 100644
--- a/meta/recipes-core/glibc/glibc-locale.inc
+++ b/meta/recipes-core/glibc/glibc-locale.inc
@@ -74,23 +74,22 @@ LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale"
 do_install () {
 	mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
 	if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then
-		cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
+		cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
 	fi
 	if [ -n "$(ls ${LOCALETREESRC}/${localedir})" ]; then
 		mkdir -p ${D}${localedir}
-		cp -fpPR ${LOCALETREESRC}/${localedir}/* ${D}${localedir}
+		cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${localedir}/* ${D}${localedir}
 	fi
 	if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then
-		cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}
+		cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}
 	fi
 	if [ -e ${LOCALETREESRC}/${datadir}/i18n ]; then
-		cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir}
+		cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir}
 	fi
 	if [ -e ${LOCALETREESRC}/${datadir}/locale ]; then
-		cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir}
+		cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${datadir}/locale ${D}${datadir}
 	fi
-	chown root:root -R ${D}
-	cp -fpPR ${LOCALETREESRC}/SUPPORTED ${WORKDIR}
+	cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/SUPPORTED ${WORKDIR}
 }
 
 inherit libc-package
-- 
2.18.0

[PATCH 2/7] gtk+3: Fix cross builds with wayland-protocols

[Khem Raj]

Fixes
| make[4]: Entering directory '/home/jenkins/oe/world/oe-build/build/tmpfs/work/armv5te-bec-linux-gnueabi/gtk+3/3.22.30-r0/build/gdk/wayland'
| make[4]: *** No rule to make target 'pointer-gestures-unstable-v1-client-protocol.h', needed by 'all'.  Stop.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 31 +++++++++++++++++++
 meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb      |  5 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch

diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
new file mode 100644
index 0000000000..3948bdd4e2
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
@@ -0,0 +1,31 @@
+From 3bbc4ea83256df8a777e13533e8d2791a70c0ee9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Jul 2018 22:32:37 -0700
+Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
+
+This allows to override the wayland-protocols pkgdatadir with the
+WAYLAND_PROTOCOLS_DATADIR from environment.
+
+pkgconfig would return an absolute path in /usr/share/wayland-protocols
+for the pkgdatadir value, which is not suitable for cross-compiling.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7ca7b99..847fa4b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -470,7 +470,8 @@ fi
+ if test "$enable_wayland_backend" = "yes"; then
+   # For the cairo image backend
+   cairo_backends="$cairo_backends cairo"
+-  AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
++  PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
++  AC_SUBST([WAYLAND_PROTOCOLS_DATADIR])
+   GDK_BACKENDS="$GDK_BACKENDS wayland"
+   GDK_WINDOWING="$GDK_WINDOWING
+ #define GDK_WINDOWING_WAYLAND"
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb b/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb
index 697b518544..d1625478ae 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb
@@ -6,7 +6,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
            file://0001-Hardcoded-libtool.patch \
            file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
            file://0003-Add-disable-opengl-configure-option.patch \
-          "
+           file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
+           "
 SRC_URI[md5sum] = "61e60dc073e0a6893c72043d20579dc0"
 SRC_URI[sha256sum] = "a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567"
 
@@ -16,3 +17,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
                     file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \
                     file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1"
+
+EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols"
-- 
2.18.0

[PATCH 3/7] libsdl2: Find wayland-protocol files in proper location during cross compile

[Khem Raj]

Fixes
| /bin/sh ../SDL2-2.0.8/build-scripts/mkinstalldirs build
| make: *** No rule to make target '//usr/share/wayland/wayland.xml', needed by 'gen/wayland-client-protocol.h'.  Stop.
| make: *** Waiting for unfinished jobs....
| mkdir -p -- build
| ERROR: oe_runmake failed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...R-for-defining-WAYLAND_PROTOCOLS_DIR.patch | 34 +++++++++++++++++++
 .../recipes-graphics/libsdl2/libsdl2_2.0.8.bb |  7 +++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch

diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch
new file mode 100644
index 0000000000..f9a666e755
--- /dev/null
+++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch
@@ -0,0 +1,34 @@
+From 07ef55d0fd9f53a4d94ed8df03ac5ef7d3cbf2d2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Jul 2018 22:51:32 -0700
+Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DIR
+
+This allows to override the wayland-protocols pkgdatadir with the
+WAYLAND_PROTOCOLS_DIR from environment.
+
+pkgconfig would return an absolute path in /usr/share/wayland-protocols
+for the pkgdatadir value, which is not suitable for cross-compiling.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ .../libsdl2/2.0.8-r0/SDL2-2.0.8/configure.in                    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: SDL2-2.0.8/configure.in
+===================================================================
+--- SDL2-2.0.8.orig/configure.in
++++ SDL2-2.0.8/configure.in
+@@ -1395,9 +1395,9 @@ AC_HELP_STRING([--enable-video-wayland-q
+             if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then
+                 WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
+                 WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
+-                WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
+-                WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client`
+-                WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
++                PKG_CHECK_VAR(WAYLAND_SCANNER, wayland-scanner, wayland_scanner)
++                PKG_CHECK_VAR(WAYLAND_CORE_PROTOCOL_DIR, wayland-client, pkgdatadir)
++                PKG_CHECK_VAR(WAYLAND_PROTOCOLS_DIR, wayland-protocols, pkgdatadir)
+                 video_wayland=yes
+             fi
+         fi
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
index accea38aaa..a8d2283fde 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
@@ -14,7 +14,8 @@ PROVIDES = "virtual/libsdl2"
 
 SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
            file://more-gen-depends.patch \
-"
+           file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DIR.patch \
+           "
 
 S = "${WORKDIR}/SDL2-${PV}"
 
@@ -29,6 +30,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
                 --enable-pthreads \
                 --enable-sdl-dlopen \
                 --disable-rpath \
+                --disable-wayland-shared \
                 "
 
 # opengl packageconfig factored out to make it easy for distros
@@ -53,6 +55,9 @@ PACKAGECONFIG[x11]        = "--enable-video-x11,--disable-video-x11,virtual/libx
 
 EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
 
+export WAYLAND_PROTOCOLS_DIR="${STAGING_DATADIR}/wayland-protocols"
+export WAYLAND_CORE_PROTOCOL_DIR="${STAGING_DATADIR}/wayland"
+
 do_configure_prepend() {
         # Remove old libtool macros.
         MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
-- 
2.18.0

[PATCH 4/7] weston: Find wayland-protocol files in proper location during cross compile

[Khem Raj]

| make: *** No rule to make target 'protocol/xdg-shell-unstable-v6-protocol.c', needed by 'all'.  Stop.
| ERROR: oe_runmake failed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 30 +++++++++++++++++++
 meta/recipes-graphics/wayland/weston_4.0.0.bb |  5 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/wayland/weston/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch

diff --git a/meta/recipes-graphics/wayland/weston/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-graphics/wayland/weston/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
new file mode 100644
index 0000000000..9e0f4083dc
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
@@ -0,0 +1,30 @@
+From 39c5e397ceb7ac4f9c47d04ab9ed26570742cf6a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Jul 2018 23:02:10 -0700
+Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
+
+This allows to override the wayland-protocols pkgdatadir with the
+WAYLAND_PROTOCOLS_DATADIR from environment.
+
+pkgconfig would return an absolute path in /usr/share/wayland-protocols
+for the pkgdatadir value, which is not suitable for cross-compiling.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48cf5cb..5cd2b89 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -221,7 +221,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0])
+ PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
+ 
+ PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.13],
+-		  [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
++		  [PKG_CHECK_VAR([ac_wayland_protocols_pkgdatadir], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)])
+ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
+ 
+ AC_ARG_ENABLE(wayland-compositor, [  --enable-wayland-compositor],,
diff --git a/meta/recipes-graphics/wayland/weston_4.0.0.bb b/meta/recipes-graphics/wayland/weston_4.0.0.bb
index e78b0d9194..c5882d590b 100644
--- a/meta/recipes-graphics/wayland/weston_4.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_4.0.0.bb
@@ -11,7 +11,8 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://0001-make-error-portable.patch \
            file://xwayland.weston-start \
            file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
-"
+           file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
+           "
 SRC_URI[md5sum] = "33709aa4d5916f89643fca0fc0064b39"
 SRC_URI[sha256sum] = "a0fc0ae7ef83dfbed12abfe9b8096a24a7dd00705e86fa0db1e619ded18b4b58"
 
@@ -35,6 +36,8 @@ EXTRA_OECONF_append_qemux86 = "\
 EXTRA_OECONF_append_qemux86-64 = "\
 		WESTON_NATIVE_BACKEND=fbdev-backend.so \
 		"
+EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols"
+
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \
-- 
2.18.0

[PATCH 5/7] gstreamer1.0-plugins-bad: Find wayland-protocol files in proper location during cross compile

[Khem Raj]

Fixes

| make[3]: *** No rule to make target 'viewporter-protocol.c', needed by 'all'.  Stop.
| make[3]: Leaving directory '/home/jenkins/oe/world/oe-build/build/tmpfs/work/armv5e-bec-linux-gnueabi/gstreamer1.0-plugins-bad/1.14.1-r0/build/ext/wayland'
| Makefile:1288: recipe for target 'wayland' failed
| make[2]: *** [wayland] Error 2

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 31 +++++++++++++++++++
 .../gstreamer1.0-plugins-bad_1.14.1.bb        | 20 ++++++------
 2 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
new file mode 100644
index 0000000000..5c14a70cec
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
@@ -0,0 +1,31 @@
+From bfa34a3fa9b426f28163e9ba0539180b021d81f3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Jul 2018 23:24:05 -0700
+Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
+
+This allows to override the wayland-protocols pkgdatadir with the
+WAYLAND_PROTOCOLS_DATADIR from environment.
+
+pkgconfig would return an absolute path in /usr/share/wayland-protocols
+for the pkgdatadir value, which is not suitable for cross-compiling.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 79cfda4..b75c082 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1333,7 +1333,8 @@ AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [
+   PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0 libdrm >= 2.4.55 wayland-protocols >= 1.4, [
+     if test "x$wayland_scanner" != "x"; then
+       HAVE_WAYLAND="yes"
+-      AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
++      PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
++      AC_SUBST(WAYLAND_PROTOCOLS_DATADIR)
+     else
+       AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin])
+       HAVE_WAYLAND="no"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb
index 0e477e5a9c..b4fb672b46 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb
@@ -1,14 +1,14 @@
 require gstreamer1.0-plugins.inc
 
-SRC_URI = " \
-    http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
-    file://configure-allow-to-disable-libssh2.patch \
-    file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \
-    file://avoid-including-sys-poll.h-directly.patch \
-    file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
-    file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
-    file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
-"
+SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
+           file://configure-allow-to-disable-libssh2.patch \
+           file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \
+           file://avoid-including-sys-poll.h-directly.patch \
+           file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
+           file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
+           file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
+           file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
+           "
 SRC_URI[md5sum] = "c2f963501fc6afc084c418894425dcfd"
 SRC_URI[sha256sum] = "2a77c6908032aafdf2cd2e5823fec948f16a25c2d1497a953828d762dc20d61a"
 
@@ -127,6 +127,8 @@ EXTRA_OECONF += " \
 
 export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}"
 
+EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols"
+
 ARM_INSTRUCTION_SET_armv4 = "arm"
 ARM_INSTRUCTION_SET_armv5 = "arm"
 
-- 
2.18.0

[PATCH 6/7] xserver-xorg: Find wayland-protocol files in proper location during cross compile

[Khem Raj]

Fixes
| make[2]: *** No rule to make target '//usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml', needed by 'relative-pointer-unstable-v1-client-protocol.h'.  Stop.
| make[2]: *** Waiting for unfinished jobs....

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 31 +++++++++++++++++++
 .../xorg-xserver/xserver-xorg_1.19.6.bb       |  3 ++
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
new file mode 100644
index 0000000000..caad2781a8
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
@@ -0,0 +1,31 @@
+From 03b856b08a2a9403dbd556c48ab4a94338f7893b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Jul 2018 23:29:35 -0700
+Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
+
+This allows to override the wayland-protocols pkgdatadir with the
+WAYLAND_PROTOCOLS_DATADIR from environment.
+
+pkgconfig would return an absolute path in /usr/share/wayland-protocols
+for the pkgdatadir value, which is not suitable for cross-compiling.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 14dfc2e..3bd18a0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2530,7 +2530,8 @@ if test "x$XWAYLAND" = xyes; then
+ 	AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],,
+ 		     [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH])
+ 
+-	AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
++	PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
++	AC_SUBST([WAYLAND_PROTOCOLS_DATADIR])
+ fi
+ 
+ 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
index c680cf9e89..27d4e75b1e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
@@ -5,10 +5,13 @@ SRC_URI += "file://musl-arm-inb-outb.patch \
             file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \
             file://0003-Remove-check-for-useSIGIO-option.patch \
             file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
+            file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
             "
 SRC_URI[md5sum] = "3e47777ff034a331aed2322b078694a8"
 SRC_URI[sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197"
 
+EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols"
+
 # These extensions are now integrated into the server, so declare the migration
 # path for in-place upgrades.
 
-- 
2.18.0

[PATCH 7/7] no-static-libs.inc: use `?=' to set a default DISABLE_STATIC

[Khem Raj]

From: Hongxu Jia <hongxu.jia@windriver.com>

It could be overrided by basic variable setting `='.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/conf/distro/include/no-static-libs.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/distro/include/no-static-libs.inc b/meta/conf/distro/include/no-static-libs.inc
index 7c165c717f..7fd578b3ce 100644
--- a/meta/conf/distro/include/no-static-libs.inc
+++ b/meta/conf/distro/include/no-static-libs.inc
@@ -1,4 +1,4 @@
-DISABLE_STATIC = " --disable-static"
+DISABLE_STATIC ?= " --disable-static"
 
 # qemu aborts on unrecognised option
 DISABLE_STATIC_pn-qemu = ""
-- 
2.18.0

✗ patchtest: failure for "glibc-locale: Fix host-user-co..." and 6 more

[Patchwork]

== Series Details ==

Series: "glibc-locale: Fix host-user-co..." and 6 more
Revision: 1
URL   : https://patchwork.openembedded.org/series/13141/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Patch            [5/7] gstreamer1.0-plugins-bad: Find wayland-protocol files in proper location during cross compile
 Issue             Commit shortlog is too long [test_shortlog_length] 
  Suggested fix    Edit shortlog so that it is 90 characters or less (currently 93 characters)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH 1/7] glibc-locale: Fix host-user-contaminated QA errors

[Alexander Kanavin]

2018-07-21 18:27 GMT+02:00 Khem Raj <raj.khem@gmail.com>:
> Fixes
>
> ERROR: glibc-locale-2.27-r0 do_package_qa: QA Issue: glibc-locale: /glibc-binary-localedata-hy-am/usr/lib/locale/hy_AM/LC_MEASUREMENT.tmp is owned by uid 3004, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
>

This long-standing yet elusive error has acquired something of a
mythical status. Can you explain what was going on and how the patch
is fixing it?

Alex

Re: [PATCH 1/7] glibc-locale: Fix host-user-contaminated QA errors

[Khem Raj]

On Sat, Jul 21, 2018 at 10:03 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> 2018-07-21 18:27 GMT+02:00 Khem Raj <raj.khem@gmail.com>:
> > Fixes
> >
> > ERROR: glibc-locale-2.27-r0 do_package_qa: QA Issue: glibc-locale: /glibc-binary-localedata-hy-am/usr/lib/locale/hy_AM/LC_MEASUREMENT.tmp is owned by uid 3004, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
> >
>
> This long-standing yet elusive error has acquired something of a
> mythical status. Can you explain what was going on and how the patch
> is fixing it?
>

-p option to cp was preserving original ownership of these files which
is actually same as build user
we were doing chown operation but it was escaping some of these files
especially these .tmp files
aside from this, why these tmp files are left in transition needs more
investigation meanwhile this
fix makes sure that we do not preserve the ownership when installing
into staging sysroot.

> Alex

Re: [PATCH 3/7] libsdl2: Find wayland-protocol files in proper location during cross compile

[Burton, Ross]

On 21 July 2018 at 17:27, Khem Raj <raj.khem@gmail.com> wrote:
> @@ -29,6 +30,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
>                  --enable-pthreads \
>                  --enable-sdl-dlopen \
>                  --disable-rpath \
> +                --disable-wayland-shared \

This isn't explained in the commit log.

Ross

Re: [PATCH 3/7] libsdl2: Find wayland-protocol files in proper location during cross compile

[Khem Raj]

On Mon, Jul 23, 2018 at 3:31 AM Burton, Ross <ross.burton@intel.com> wrote:
>
> On 21 July 2018 at 17:27, Khem Raj <raj.khem@gmail.com> wrote:
> > @@ -29,6 +30,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
> >                  --enable-pthreads \
> >                  --enable-sdl-dlopen \
> >                  --disable-rpath \
> > +                --disable-wayland-shared \
>
> This isn't explained in the commit log.

disable dynamic loading support for Wayland as it seems to not load
the dependencies correctly.

do you want me to send v2 ?



>
> Ross

Re: [PATCH 3/7] libsdl2: Find wayland-protocol files in proper location during cross compile

[Burton, Ross]

On 21 July 2018 at 17:27, Khem Raj <raj.khem@gmail.com> wrote:
> +pkgconfig would return an absolute path in /usr/share/wayland-protocols
> +for the pkgdatadir value, which is not suitable for cross-compiling.

For reference this is due to pkgconf (not pkgconfig) having different
behaviour compared to pkgconfig, which is breaking recipes.
Personally I consider this a bug in pkgconf and there are bugs
upstream (and new releases) which may solve it directly instead of
having to fix every user of Weston (which isn't the only user of this
pattern).

Ross

Re: [PATCH 3/7] libsdl2: Find wayland-protocol files in proper location during cross compile

[Khem Raj]

On Wed, Jul 25, 2018 at 1:08 PM Burton, Ross <ross.burton@intel.com> wrote:
>
> On 21 July 2018 at 17:27, Khem Raj <raj.khem@gmail.com> wrote:
> > +pkgconfig would return an absolute path in /usr/share/wayland-protocols
> > +for the pkgdatadir value, which is not suitable for cross-compiling.
>
> For reference this is due to pkgconf (not pkgconfig) having different
> behaviour compared to pkgconfig, which is breaking recipes.
> Personally I consider this a bug in pkgconf and there are bugs
> upstream (and new releases) which may solve it directly instead of
> having to fix every user of Weston (which isn't the only user of this
> pattern).
>

while I agree its due to a different behavior from pkgconf, the
solution is not relying on pkgconfig features
in itself is an improvement IMO unless you say its regressing builds
when not using pkgconfig
> Ross

Re: [PATCH 3/7] libsdl2: Find wayland-protocol files in proper location during cross compile

[Burton, Ross]

On 25 July 2018 at 21:18, Khem Raj <raj.khem@gmail.com> wrote:
> while I agree its due to a different behavior from pkgconf, the
> solution is not relying on pkgconfig features
> in itself is an improvement IMO unless you say its regressing builds
> when not using pkgconfig

This is a behavioural change between the two and personally I don't
consider this a bug in pkgconfig, so pkgconf should do the same.

Also it turns out that you can override variable lookups with
environment variables in pkgconfig (see
https://git.dereferenced.org/pkgconf/pkgconf/issues/2) so when pkgconf
does this we can override the lookups without needing any patches.

Ross

Re: [PATCH 3/7] libsdl2: Find wayland-protocol files in proper location during cross compile

[Khem Raj]

On Wed, Jul 25, 2018 at 1:23 PM Burton, Ross <ross.burton@intel.com> wrote:
>
> On 25 July 2018 at 21:18, Khem Raj <raj.khem@gmail.com> wrote:
> > while I agree its due to a different behavior from pkgconf, the
> > solution is not relying on pkgconfig features
> > in itself is an improvement IMO unless you say its regressing builds
> > when not using pkgconfig
>
> This is a behavioural change between the two and personally I don't
> consider this a bug in pkgconfig, so pkgconf should do the same.
>
> Also it turns out that you can override variable lookups with
> environment variables in pkgconfig (see
> https://git.dereferenced.org/pkgconf/pkgconf/issues/2) so when pkgconf
> does this we can override the lookups without needing any patches.
>

I would tend to agree. I think it might be ok to defer these fixes for now

> Ross