[PATCH 01/14] gobject-introspection: update to 1.56.1

[PATCH 01/14] gobject-introspection: update to 1.56.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../0001-giscanner-add-a-lib-dirs-envvar-option.patch             | 8 ++++----
 ...ct-introspection_1.56.0.bb => gobject-introspection_1.56.1.bb} | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.56.0.bb => gobject-introspection_1.56.1.bb} (98%)

diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
index 232480f3f56..4aa2e3cb2b8 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
@@ -1,4 +1,4 @@
-From 06ebdaa5c8f9721acf93cc3e75a877a3c963867f Mon Sep 17 00:00:00 2001
+From 3875175563df28813c22b1de6bda260285f65cb0 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 3 Jan 2018 17:02:01 +0200
 Subject: [PATCH] giscanner: add a --lib-dirs-envvar option
@@ -19,7 +19,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  3 files changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index a8bd5b1..6cf25d5 100644
+index d10327c..47f57c6 100644
 --- a/giscanner/ccompiler.py
 +++ b/giscanner/ccompiler.py
 @@ -109,7 +109,7 @@ class CCompiler(object):
@@ -35,8 +35,8 @@ index a8bd5b1..6cf25d5 100644
          if os.name == 'nt':
              runtime_path_envvar = ['LIB', 'PATH']
          else:
--            runtime_path_envvar = ['LD_LIBRARY_PATH']
-+            runtime_path_envvar = ['LD_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar]
+-            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH']
++            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar]
              # Search the current directory first
              # (This flag is not supported nor needed for Visual C++)
              args.append('-L.')
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.1.bb
similarity index 98%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.1.bb
index 8f84f832b03..8d055669497 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.1.bb
@@ -17,8 +17,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
            file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \
            file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \
            "
-SRC_URI[md5sum] = "8064b5cd8fa02feeab850a0f6ef72b0f"
-SRC_URI[sha256sum] = "0d7059fad7aa5ec50d9678aea4ea139acab23737e9cf9ca0d86c615cecbaa0f8"
+SRC_URI[md5sum] = "62e5f5685b8d9752fdeaf17c057d53d1"
+SRC_URI[sha256sum] = "5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b"
 
 inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even
 BBCLASSEXTEND = "native"
-- 
2.16.1

[PATCH 02/14] ffmpeg: update to 4.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-multimedia/ffmpeg/{ffmpeg_3.4.2.bb => ffmpeg_4.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.4.2.bb => ffmpeg_4.0.bb} (97%)

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb
similarity index 97%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.2.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb
index 879cf7ffb94..feafce25803 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb
@@ -26,8 +26,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
            file://mips64_cpu_detection.patch \
            "
-SRC_URI[md5sum] = "cbf4ead227fcedddf54c86013705a988"
-SRC_URI[sha256sum] = "2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740"
+SRC_URI[md5sum] = "1cc9e8cb027b9fd4c54f598f51002c19"
+SRC_URI[sha256sum] = "ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f"
 
 # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
 ARM_INSTRUCTION_SET = "arm"
-- 
2.16.1

[PATCH 03/14] vala: update to 0.40.4

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/vala/{vala_0.40.2.bb => vala_0.40.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/vala/{vala_0.40.2.bb => vala_0.40.4.bb} (64%)

diff --git a/meta/recipes-devtools/vala/vala_0.40.2.bb b/meta/recipes-devtools/vala/vala_0.40.4.bb
similarity index 64%
rename from meta/recipes-devtools/vala/vala_0.40.2.bb
rename to meta/recipes-devtools/vala/vala_0.40.4.bb
index 3176a9127e1..759781379f5 100644
--- a/meta/recipes-devtools/vala/vala_0.40.2.bb
+++ b/meta/recipes-devtools/vala/vala_0.40.4.bb
@@ -6,5 +6,5 @@ SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pa
 	     file://0001-Disable-valadoc.patch \
 "
 
-SRC_URI[md5sum] = "e7d05683bcac0306fc8d7c875eb3fef1"
-SRC_URI[sha256sum] = "75a3dc2de36873d8ceab168b2fde1b2c378a1f7104a3b3391ba3acf579c674b3"
+SRC_URI[md5sum] = "a690209e202be7aa6234aaa4e48fe3fb"
+SRC_URI[sha256sum] = "379354a2a2f7ee5c4d6e0f5e88b0e32620dcd5f51972baf6d90d9f18eb689198"
-- 
2.16.1

[PATCH 04/14] libfm: update to 1.3.0.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...libfm-extra_1.2.5.bb => libfm-extra_1.3.0.2.bb} |  4 +-
 ...-library-path-to-avoid-host-contamination.patch | 23 +++++++
 ...Enclose-text-in-programlisting-into-CDATA.patch | 76 ----------------------
 .../libfm/{libfm_1.2.5.bb => libfm_1.3.0.2.bb}     |  6 +-
 4 files changed, 28 insertions(+), 81 deletions(-)
 rename meta/recipes-support/libfm/{libfm-extra_1.2.5.bb => libfm-extra_1.3.0.2.bb} (80%)
 create mode 100644 meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch
 delete mode 100644 meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch
 rename meta/recipes-support/libfm/{libfm_1.2.5.bb => libfm_1.3.0.2.bb} (89%)

diff --git a/meta/recipes-support/libfm/libfm-extra_1.2.5.bb b/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb
similarity index 80%
rename from meta/recipes-support/libfm/libfm-extra_1.2.5.bb
rename to meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb
index c0fd83ef344..734d010d319 100644
--- a/meta/recipes-support/libfm/libfm-extra_1.2.5.bb
+++ b/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb
@@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \
            file://0001-nls.m4-Take-it-from-gettext-0.15.patch \
           "
 
-SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807"
-SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a"
+SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b"
+SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72"
 
 S = "${WORKDIR}/libfm-${PV}"
 
diff --git a/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch b/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch
new file mode 100644
index 00000000000..f4c89127fc1
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch
@@ -0,0 +1,23 @@
+From 07260295e031e845e38ba874fa6ab500790c4aaf Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 2 May 2018 16:48:47 +0300
+Subject: [PATCH] Do not add library path to avoid host contamination
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ src/modules/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
+index e61f4e0..01c15bd 100644
+--- a/src/modules/Makefile.am
++++ b/src/modules/Makefile.am
+@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
+ # tell libtool we compile module not library
+ AM_LDFLAGS = \
+ 	-no-undefined -module -avoid-version -shared -export-dynamic \
+-	-L$(libdir) \
+ 	$(GIO_LIBS)
+ 
+ # the module should be linked only with libfm, not libfm-gtk or whatever
diff --git a/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch b/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch
deleted file mode 100644
index 40e53291e1c..00000000000
--- a/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From ed4ca8c0b17ff5d3c768b92409c1787e3f3f1841 Mon Sep 17 00:00:00 2001
-From: Andriy Grytsenko <andrej@rep.kiev.ua>
-Date: Sun, 26 Nov 2017 22:30:15 +0200
-Subject: [PATCH 2/2] Enclose text in <programlisting> into <![CDATA[
-
-New gtk-doc fails on tag-like data in it.
-See https://bugs.freedesktop.org/show_bug.cgi?id=101585
-That is definitely bug of gtk-doc but let workaround it.
-
-Upstream-Status: Backport [https://git.lxde.org/gitweb/?p=lxde/libfm.git;a=commit;h=b072ee0400432d72fdf86ba9fed74a7e0ec11ec1]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- src/base/fm-module.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/base/fm-module.c b/src/base/fm-module.c
-index d364b2d..2e8c978 100644
---- a/src/base/fm-module.c
-+++ b/src/base/fm-module.c
-@@ -44,7 +44,7 @@
-  * of that type should include:
-  * <example id="example-fm-dummy-h">
-  * <title>Sample of fm-dummy.h</title>
-- * <programlisting>
-+ * <programlisting><![CDATA[
-  * #include <libfm/fm.h>
-  *
-  * #define FM_MODULE_dummy_VERSION 1
-@@ -54,7 +54,7 @@
-  * } FmDummyInit;
-  *
-  * extern FmDummyInit fm_module_init_dummy;
-- * </programlisting>
-+ * ]]></programlisting>
-  * </example>
-  * The FM_MODULE_dummy_VERSION is a number which should be increased each
-  * time something in FmDummyInit structure is changed. The FmDummyInit
-@@ -65,7 +65,7 @@
-  * module handling in your code:
-  * <example id="example-fm-dummy-widget-c">
-  * <title>Sample of fm-dummy-widget.c</title>
-- * <programlisting>
-+ * <programlisting><![CDATA[
-  * #include "fm-dummy.h"
-  *
-  * FM_MODULE_DEFINE_TYPE(dummy, FmDummyInit, 1)
-@@ -87,7 +87,7 @@
-  *         result = module->get_new("test sample");
-  *     return result;
-  * }
-- * </programlisting>
-+ * ]]></programlisting>
-  * </example>
-  *
-  * Third thing application should do is to register module type on the
-@@ -108,7 +108,7 @@
-  * interface (see the fm-dummy.h header example above):
-  * <example id="example-fm-dummy-test-c">
-  * <title>Sample of module dummy/test</title>
-- * <programlisting>
-+ * <programlisting><![CDATA[
-  * #include "fm-dummy.h"
-  *
-  * FM_DEFINE_MODULE(dummy, test)
-@@ -121,7 +121,7 @@
-  * FmDummyInit fm_module_init_dummy = {
-  *     fm_dummy_test_get_new;
-  * };
-- * </programlisting>
-+ * ]]></programlisting>
-  * </example>
-  * The fm_module_init_dummy should be exactly the same structure that is
-  * defined in the header file above.
--- 
-2.15.1
-
diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.3.0.2.bb
similarity index 89%
rename from meta/recipes-support/libfm/libfm_1.2.5.bb
rename to meta/recipes-support/libfm/libfm_1.3.0.2.bb
index 596408353fa..62d6a51e871 100644
--- a/meta/recipes-support/libfm/libfm_1.2.5.bb
+++ b/meta/recipes-support/libfm/libfm_1.3.0.2.bb
@@ -13,11 +13,11 @@ DEPENDS = "glib-2.0 glib-2.0-native pango gtk+3 menu-cache intltool-native libex
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \
            file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch \
-           file://0001-Enclose-text-in-programlisting-into-CDATA.patch \
+           file://0001-Do-not-add-library-path-to-avoid-host-contamination.patch \
            "
 
-SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807"
-SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a"
+SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b"
+SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72"
 
 inherit autotools pkgconfig gtk-doc gettext distro_features_check
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-- 
2.16.1

[PATCH 05/14] pcmanfm: update to 1.3.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-sato/pcmanfm/{pcmanfm_1.2.5.bb => pcmanfm_1.3.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-sato/pcmanfm/{pcmanfm_1.2.5.bb => pcmanfm_1.3.0.bb} (90%)

diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.0.bb
similarity index 90%
rename from meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb
rename to meta/recipes-sato/pcmanfm/pcmanfm_1.3.0.bb
index 4127a070460..356da02d235 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.0.bb
@@ -16,8 +16,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.xz \
 	   file://emblem-symbolic-link.png \
 	   file://no-desktop.patch"
 
-SRC_URI[md5sum] = "b4d1f8ce08d87e4f27805a246fc51ac2"
-SRC_URI[sha256sum] = "0c86cac028b705ff314c7464d814c2cf7ff604c17491c20aa204b1ef1a80ad67"
+SRC_URI[md5sum] = "827838f7f6b17dc97e1690c07da8fdb3"
+SRC_URI[sha256sum] = "5a693e9bf3f3294f0ee7264c1c1a600a88ee27d1572e7dd5c4b0e84aa7778ffb"
 
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/"
 
-- 
2.16.1

[PATCH 06/14] epiphany: update to 3.28.1.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../epiphany/{epiphany_3.28.0.1.bb => epiphany_3.28.1.1.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.28.0.1.bb => epiphany_3.28.1.1.bb} (84%)

diff --git a/meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.28.1.1.bb
similarity index 84%
rename from meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.28.1.1.bb
index c878ee3229a..490d0f6a9c8 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.28.1.1.bb
@@ -13,8 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            "
-SRC_URI[archive.md5sum] = "3e127d843d3f255f426ab34804f29163"
-SRC_URI[archive.sha256sum] = "7154b06837655771f2240bf378fb8ba2315ae07dbc6f45d160ca29cd6d377808"
+SRC_URI[archive.md5sum] = "9f4c0bf831789638818c23cd555b29d9"
+SRC_URI[archive.sha256sum] = "99426aa0e386742e924d84b59ec16bf394195fb9fce85d07f72d2cde486ea495"
 
 EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}"
 
-- 
2.16.1

[PATCH 07/14] ca-certificates: update to 20180409

[Alexander Kanavin]

License-Update: URI fix
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../{ca-certificates_20170717.bb => ca-certificates_20180409.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/ca-certificates/{ca-certificates_20170717.bb => ca-certificates_20180409.bb} (95%)

diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb b/meta/recipes-support/ca-certificates/ca-certificates_20180409.bb
similarity index 95%
rename from meta/recipes-support/ca-certificates/ca-certificates_20170717.bb
rename to meta/recipes-support/ca-certificates/ca-certificates_20180409.bb
index 350294858be..ccf8129cecc 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb
+++ b/meta/recipes-support/ca-certificates/ca-certificates_20180409.bb
@@ -5,7 +5,7 @@ This derived from Debian's CA Certificates."
 HOMEPAGE = "http://packages.debian.org/sid/ca-certificates"
 SECTION = "misc"
 LICENSE = "GPL-2.0+ & MPL-2.0"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7358b9541ccf3029e9705ed8de57968"
+LIC_FILES_CHKSUM = "file://debian/copyright;md5=aeb420429b1659507e0a5a1b123e8308"
 
 # This is needed to ensure we can run the postinst at image creation time
 DEPENDS = ""
@@ -14,7 +14,7 @@ DEPENDS_class-nativesdk = "openssl-native"
 # Need c_rehash from openssl and run-parts from debianutils
 PACKAGE_WRITE_DEPS += "openssl-native debianutils-native"
 
-SRCREV = "34b8e19e541b8af4076616b2e170c7a70cdaded0"
+SRCREV = "dbbd11e56af93bb79f21d0ee6059a901f83f70a5"
 
 SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \
            file://0002-update-ca-certificates-use-SYSROOT.patch \
-- 
2.16.1

Re: [PATCH 07/14] ca-certificates: update to 20180409

[Richard Purdie]

On Fri, 2018-05-04 at 15:32 +0300, Alexander Kanavin wrote:
> License-Update: URI fix
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  .../{ca-certificates_20170717.bb => ca-
> certificates_20180409.bb}      | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-support/ca-certificates/{ca-
> certificates_20170717.bb => ca-certificates_20180409.bb} (95%)

Something in this series, I think likely this patch causes rootfs
generation to fail with:

ERROR: core-image-sato-1.0-r0 do_rootfs: [log_check] core-image-sato: found 1 error message in the logfile:
[log_check] openssl:Error: 'rehash' is an invalid command.

ERROR: core-image-sato-1.0-r0 do_rootfs: Function failed: do_rootfs
ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-arm/build/build/tmp/work/qemuarm-poky-linux-gnueabi/core-image-sato/1.0-r0/temp/log.do_rootfs.23183

https://autobuilder.yocto.io/builders/nightly-arm/builds/1053/steps/BuildImages/logs/stdio

Cheers,

Richard

Re: [PATCH 07/14] ca-certificates: update to 20180409

[Alexander Kanavin]

On 05/08/2018 10:47 AM, richard.purdie@linuxfoundation.org wrote:
> Something in this series, I think likely this patch causes rootfs
> generation to fail with:
> 
> ERROR: core-image-sato-1.0-r0 do_rootfs: [log_check] core-image-sato: found 1 error message in the logfile:
> [log_check] openssl:Error: 'rehash' is an invalid command.
> 
> ERROR: core-image-sato-1.0-r0 do_rootfs: Function failed: do_rootfs
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-arm/build/build/tmp/work/qemuarm-poky-linux-gnueabi/core-image-sato/1.0-r0/temp/log.do_rootfs.23183
> 
> https://autobuilder.yocto.io/builders/nightly-arm/builds/1053/steps/BuildImages/logs/stdio

The new version of ca-certificates is using 'openssl rehash' instead of 
'c_rehash', the former is new in openssl 1.1. I moved the ca-certs 
update to openssl-1.1 branch, which is all green on the AB, and only 
needs final openssl 1.1.1 release and an upstream commitment to its LTS.


Alex

[PATCH 08/14] gnome-desktop3: update to 3.28.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../{gnome-desktop3_3.28.0.bb => gnome-desktop3_3.28.1.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.28.0.bb => gnome-desktop3_3.28.1.bb} (86%)

diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.0.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb
similarity index 86%
rename from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.0.bb
rename to meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb
index e23c0305775..39b3491fdb1 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.0.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 BPN = "gnome-desktop"
 
 inherit gnome pkgconfig upstream-version-is-even gobject-introspection
-SRC_URI[archive.md5sum] = "3e7b67578307220a21688f28307b6789"
-SRC_URI[archive.sha256sum] = "f1df71c39e32147f6d58f53a9c05b964b00b7c98fbca090419355437c72fd59d"
+SRC_URI[archive.md5sum] = "bcbf906d94eb08060c60a7364384d678"
+SRC_URI[archive.sha256sum] = "78a397a2be47586e6dc075d6a7fc5659aae3d10713d76994ce1b46086e7ecb9a"
 
 SRC_URI += " \
            file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
-- 
2.16.1

[PATCH 09/14] libwebp: update to 1.0.0

[Alexander Kanavin]

--disable-experimental has been removed upstream.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-multimedia/webp/{libwebp_0.6.1.bb => libwebp_1.0.0.bb} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-multimedia/webp/{libwebp_0.6.1.bb => libwebp_1.0.0.bb} (92%)

diff --git a/meta/recipes-multimedia/webp/libwebp_0.6.1.bb b/meta/recipes-multimedia/webp/libwebp_1.0.0.bb
similarity index 92%
rename from meta/recipes-multimedia/webp/libwebp_0.6.1.bb
rename to meta/recipes-multimedia/webp/libwebp_1.0.0.bb
index e9d4d783041..1a9679f9dc8 100644
--- a/meta/recipes-multimedia/webp/libwebp_0.6.1.bb
+++ b/meta/recipes-multimedia/webp/libwebp_1.0.0.bb
@@ -14,13 +14,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \
                     file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7"
 
 SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz"
-SRC_URI[md5sum] = "b49ce9c3e3e9acae4d91bca44bb85a72"
-SRC_URI[sha256sum] = "06503c782d9f151baa325591c3579c68ed700ffc62d4f5a32feead0ff017d8ab"
+SRC_URI[md5sum] = "967b8f087cb392e6cc94d5e116a120c0"
+SRC_URI[sha256sum] = "84259c4388f18637af3c5a6361536d754a5394492f91be1abc2e981d4983225b"
 
 UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html"
 
 EXTRA_OECONF = " \
-    --disable-experimental \
     --disable-wic \
     --enable-libwebpmux \
     --enable-libwebpdemux \
-- 
2.16.1

[PATCH 10/14] procps: update to 3.3.14

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../procps/0001-Fix-out-of-tree-builds.patch       | 24 ++++++++++++++++++++++
 .../procps/{procps_3.3.12.bb => procps_3.3.14.bb}  |  7 ++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch
 rename meta/recipes-extended/procps/{procps_3.3.12.bb => procps_3.3.14.bb} (92%)

diff --git a/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch b/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch
new file mode 100644
index 00000000000..e548194362c
--- /dev/null
+++ b/meta/recipes-extended/procps/procps/0001-Fix-out-of-tree-builds.patch
@@ -0,0 +1,24 @@
+From 0825db94fc91fa2150c0e649e92cc8dcc44f4b38 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 4 Apr 2018 14:09:45 +0300
+Subject: [PATCH] Fix out of tree builds
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ include/nls.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/nls.h b/include/nls.h
+index 1166b7b..f5abe05 100644
+--- a/include/nls.h
++++ b/include/nls.h
+@@ -6,7 +6,7 @@
+ #define PROCPS_NG_NLS_H
+ 
+ /* programs issuing textdomain() need PACKAGE string */
+-#include "../config.h"
++#include "config.h"
+ 
+ /* programs issuing bindtextdomain() also need LOCALEDIR string */
+ #ifndef LOCALEDIR
diff --git a/meta/recipes-extended/procps/procps_3.3.12.bb b/meta/recipes-extended/procps/procps_3.3.14.bb
similarity index 92%
rename from meta/recipes-extended/procps/procps_3.3.12.bb
rename to meta/recipes-extended/procps/procps_3.3.14.bb
index ecf215fecf5..1aba5116123 100644
--- a/meta/recipes-extended/procps/procps_3.3.12.bb
+++ b/meta/recipes-extended/procps/procps_3.3.14.bb
@@ -14,10 +14,11 @@ inherit autotools gettext pkgconfig update-alternatives
 
 SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \
            file://sysctl.conf \
-          "
+           file://0001-Fix-out-of-tree-builds.patch \
+           "
 
-SRC_URI[md5sum] = "957e42e8b193490b2111252e4a2b443c"
-SRC_URI[sha256sum] = "6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4"
+SRC_URI[md5sum] = "fce371ccc1c15a67af9d85e4057e559d"
+SRC_URI[sha256sum] = "5eda0253999b7d786e690edfa73301b3113c7a67058478866e98e9ff6736726c"
 
 S = "${WORKDIR}/procps-ng-${PV}"
 
-- 
2.16.1

[PATCH 11/14] webkitgtk: update to 2.20.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-sato/webkit/{webkitgtk_2.20.0.bb => webkitgtk_2.20.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.20.0.bb => webkitgtk_2.20.1.bb} (97%)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb
similarity index 97%
rename from meta/recipes-sato/webkit/webkitgtk_2.20.0.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.20.1.bb
index 50e26665782..1e5def090c0 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.20.0.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb
@@ -22,8 +22,8 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://0001-Fix-build-with-musl.patch \
            "
 
-SRC_URI[md5sum] = "51cc47345c3ec53802718cd6fc9b746f"
-SRC_URI[sha256sum] = "57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c"
+SRC_URI[md5sum] = "0cd9b9ae1f48c04de5314f77806eceb4"
+SRC_URI[sha256sum] = "43e43285fa4e393080cc4fbd5ad8644749a75b1e0b811b230b63ae56806c8959"
 
 inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
 
-- 
2.16.1

[PATCH 12/14] meson: update to 0.46.0

[Alexander Kanavin]

Rebase a couple of patches

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...rospection-determine-g-ir-scanner-and-g-i.patch | 17 +++----
 .../meson/meson/0003-native_bindir.patch           | 57 ++++++++++++----------
 .../meson/{meson_0.45.1.bb => meson_0.46.0.bb}     |  4 +-
 3 files changed, 41 insertions(+), 37 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.45.1.bb => meson_0.46.0.bb} (83%)

diff --git a/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch b/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
index ded42d14f7f..f32267d0c41 100644
--- a/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
+++ b/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
@@ -1,7 +1,7 @@
-From 972667e0d789a6969a5d79249404f3539f891810 Mon Sep 17 00:00:00 2001
+From 0b860cb8a22ae876b6088939dbabca216bc29431 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 4 Aug 2017 16:18:47 +0300
-Subject: [PATCH 1/2] gobject-introspection: determine g-ir-scanner and
+Subject: [PATCH] gobject-introspection: determine g-ir-scanner and
  g-ir-compiler paths from pkgconfig
 
 Do not hardcode the name of those binaries; gobject-introspection
@@ -16,19 +16,19 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 4f7fe30..9610cf6 100644
+index b29bab9..dc4c401 100644
 --- a/mesonbuild/modules/gnome.py
 +++ b/mesonbuild/modules/gnome.py
-@@ -390,8 +390,6 @@ class GnomeModule(ExtensionModule):
+@@ -393,8 +393,6 @@ class GnomeModule(ExtensionModule):
              raise MesonException('Gir takes one argument')
          if kwargs.get('install_dir'):
              raise MesonException('install_dir is not supported with generate_gir(), see "install_dir_gir" and "install_dir_typelib"')
--        giscanner = find_program('g-ir-scanner', 'Gir')
--        gicompiler = find_program('g-ir-compiler', 'Gir')
+-        giscanner = self.interpreter.find_program_impl('g-ir-scanner')
+-        gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
          girtarget = args[0]
          while hasattr(girtarget, 'held_object'):
              girtarget = girtarget.held_object
-@@ -402,6 +400,8 @@ class GnomeModule(ExtensionModule):
+@@ -405,6 +403,8 @@ class GnomeModule(ExtensionModule):
                  self.gir_dep = PkgConfigDependency('gobject-introspection-1.0',
                                                     state.environment,
                                                     {'native': True})
@@ -37,6 +37,3 @@ index 4f7fe30..9610cf6 100644
              pkgargs = self.gir_dep.get_compile_args()
          except Exception:
              raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.')
--- 
-2.15.0
-
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index af5e6a190bf..f00327714b6 100644
--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
@@ -1,7 +1,7 @@
-From ffa72eac56558aa4171dd70ac1e9c27a07338fa2 Mon Sep 17 00:00:00 2001
+From 0eec9428376450917098c68539a6c9dd60b85d93 Mon Sep 17 00:00:00 2001
 From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
 Date: Wed, 15 Nov 2017 15:05:01 +0100
-Subject: [PATCH 4/4] native_bindir
+Subject: [PATCH] native_bindir
 
 Some libraries, like QT, have pre-processors that convert their input
 files into something that the cross-compiler can process. We find the
@@ -17,15 +17,15 @@ Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
 
 ---
- mesonbuild/dependencies/base.py | 16 ++++++++++------
+ mesonbuild/dependencies/base.py | 19 +++++++++++--------
  mesonbuild/dependencies/ui.py   |  6 +++---
- 2 files changed, 13 insertions(+), 9 deletions(-)
+ 2 files changed, 14 insertions(+), 11 deletions(-)
 
 diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index bf79bc5..c9fd08c 100644
+index 0114a14..f4f19c5 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
-@@ -131,7 +131,7 @@ class Dependency:
+@@ -141,7 +141,7 @@ class Dependency:
      def need_threads(self):
          return False
  
@@ -34,7 +34,7 @@ index bf79bc5..c9fd08c 100644
          raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
  
      def get_configtool_variable(self, variable_name):
-@@ -150,7 +150,7 @@ class InternalDependency(Dependency):
+@@ -178,7 +178,7 @@ class InternalDependency(Dependency):
          self.sources = sources
          self.ext_deps = ext_deps
  
@@ -43,24 +43,34 @@ index bf79bc5..c9fd08c 100644
          raise DependencyException('Method "get_pkgconfig_variable()" is '
                                    'invalid for an internal dependency')
  
-@@ -425,10 +425,14 @@ class PkgConfigDependency(ExternalDependency):
+@@ -517,11 +517,14 @@ class PkgConfigDependency(ExternalDependency):
          return s.format(self.__class__.__name__, self.name, self.is_found,
                          self.version_reqs)
  
--    def _call_pkgbin(self, args, env=None):
-+    def _call_pkgbin(self, args, env=None, use_native=False):
-         if not env:
-             env = os.environ
--        p, out = Popen_safe([self.pkgbin] + args, env=env)[0:2]
+-    def _call_pkgbin_real(self, args, env):
+-        p, out = Popen_safe(self.pkgbin.get_command() + args, env=env)[0:2]
++    def _call_pkgbin_real(self, args, env, use_native=False):
 +        if use_native:
-+            pkgbin = [self.pkgbin + "-native"]
++            p, out = Popen_safe(self.pkgbin.get_command() + "-native" + args, env=env)[0:2]
 +        else:
-+            pkgbin = [self.pkgbin]
-+        p, out = Popen_safe(pkgbin + args, env=env)[0:2]
++            p, out = Popen_safe(self.pkgbin.get_command() + args, env=env)[0:2]
          return p.returncode, out.strip()
  
+-    def _call_pkgbin(self, args, env=None):
++    def _call_pkgbin(self, args, env=None, use_native=False):
+         if env is None:
+             fenv = env
+             env = os.environ
+@@ -530,7 +533,7 @@ class PkgConfigDependency(ExternalDependency):
+         targs = tuple(args)
+         cache = PkgConfigDependency.pkgbin_cache
+         if (self.pkgbin, targs, fenv) not in cache:
+-            cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env)
++            cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
+         return cache[(self.pkgbin, targs, fenv)]
+ 
      def _convert_mingw_paths(self, args):
-@@ -522,7 +526,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -630,7 +633,7 @@ class PkgConfigDependency(ExternalDependency):
              # linkers such as MSVC, so prepend them.
              self.link_args = ['-L' + lp for lp in libpaths] + self.link_args
  
@@ -69,7 +79,7 @@ index bf79bc5..c9fd08c 100644
          options = ['--variable=' + variable_name, self.name]
  
          if 'define_variable' in kwargs:
-@@ -535,7 +539,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -643,7 +646,7 @@ class PkgConfigDependency(ExternalDependency):
  
              options = ['--define-variable=' + '='.join(definition)] + options
  
@@ -79,10 +89,10 @@ index bf79bc5..c9fd08c 100644
          if ret != 0:
              if self.required:
 diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
-index 1db518c..4ed1d04 100644
+index 2f31196..916f648 100644
 --- a/mesonbuild/dependencies/ui.py
 +++ b/mesonbuild/dependencies/ui.py
-@@ -239,7 +239,7 @@ class QtBaseDependency(ExternalDependency):
+@@ -240,7 +240,7 @@ class QtBaseDependency(ExternalDependency):
          self.bindir = self.get_pkgconfig_host_bins(core)
          if not self.bindir:
              # If exec_prefix is not defined, the pkg-config file is broken
@@ -91,7 +101,7 @@ index 1db518c..4ed1d04 100644
              if prefix:
                  self.bindir = os.path.join(prefix, 'bin')
  
-@@ -359,7 +359,7 @@ class Qt4Dependency(QtBaseDependency):
+@@ -374,7 +374,7 @@ class Qt4Dependency(QtBaseDependency):
          applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
          for application in applications:
              try:
@@ -100,7 +110,7 @@ index 1db518c..4ed1d04 100644
              except MesonException:
                  pass
  
-@@ -369,7 +369,7 @@ class Qt5Dependency(QtBaseDependency):
+@@ -384,7 +384,7 @@ class Qt5Dependency(QtBaseDependency):
          QtBaseDependency.__init__(self, 'qt5', env, kwargs)
  
      def get_pkgconfig_host_bins(self, core):
@@ -109,6 +119,3 @@ index 1db518c..4ed1d04 100644
  
  
  # There are three different ways of depending on SDL2:
--- 
-2.15.1
-
diff --git a/meta/recipes-devtools/meson/meson_0.45.1.bb b/meta/recipes-devtools/meson/meson_0.46.0.bb
similarity index 83%
rename from meta/recipes-devtools/meson/meson_0.45.1.bb
rename to meta/recipes-devtools/meson/meson_0.46.0.bb
index 9decdd0c24c..7334045e05f 100644
--- a/meta/recipes-devtools/meson/meson_0.45.1.bb
+++ b/meta/recipes-devtools/meson/meson_0.46.0.bb
@@ -10,8 +10,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/${BP}.tar
            file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \
            file://0003-native_bindir.patch \
            "
-SRC_URI[md5sum] = "4d9c7b3a7365b7b472f00af14e034949"
-SRC_URI[sha256sum] = "4d0bb0dbb1bb556cb7a4092fdfea3d6e76606bd739a4bc97481c2d7bc6200afb"
+SRC_URI[md5sum] = "e3301606017e364a0d7e1c3b755e7a28"
+SRC_URI[sha256sum] = "b7df91b01a358a8facdbfa33596a47cda38a760435ab55e1985c0bff06a9cbf0"
 UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
 
 inherit setuptools3
-- 
2.16.1

Re: [PATCH 12/14] meson: update to 0.46.0

[Nirbheek Chauhan]

Would be nice if OE could test 0.46.0 soon and report any regressions to
Meson. There will be a bugfix 0.46.1 release soon with known regressions
fixed:

https://github.com/mesonbuild/meson/milestone/26?closed=1
On Fri, May 4, 2018 at 6:10 PM Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> Rebase a couple of patches

> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>   ...rospection-determine-g-ir-scanner-and-g-i.patch | 17 +++----
>   .../meson/meson/0003-native_bindir.patch           | 57
++++++++++++----------
>   .../meson/{meson_0.45.1.bb => meson_0.46.0.bb}     |  4 +-
>   3 files changed, 41 insertions(+), 37 deletions(-)
>   rename meta/recipes-devtools/meson/{meson_0.45.1.bb => meson_0.46.0.bb}
(83%)

> diff --git
a/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
b/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
> index ded42d14f7f..f32267d0c41 100644
> ---
a/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
> +++
b/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
> @@ -1,7 +1,7 @@
> -From 972667e0d789a6969a5d79249404f3539f891810 Mon Sep 17 00:00:00 2001
> +From 0b860cb8a22ae876b6088939dbabca216bc29431 Mon Sep 17 00:00:00 2001
>   From: Alexander Kanavin <alex.kanavin@gmail.com>
>   Date: Fri, 4 Aug 2017 16:18:47 +0300
> -Subject: [PATCH 1/2] gobject-introspection: determine g-ir-scanner and
> +Subject: [PATCH] gobject-introspection: determine g-ir-scanner and
>    g-ir-compiler paths from pkgconfig

>   Do not hardcode the name of those binaries; gobject-introspection
> @@ -16,19 +16,19 @@ Signed-off-by: Alexander Kanavin <
alex.kanavin@gmail.com>
>    1 file changed, 2 insertions(+), 2 deletions(-)

>   diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
> -index 4f7fe30..9610cf6 100644
> +index b29bab9..dc4c401 100644
>   --- a/mesonbuild/modules/gnome.py
>   +++ b/mesonbuild/modules/gnome.py
> -@@ -390,8 +390,6 @@ class GnomeModule(ExtensionModule):
> +@@ -393,8 +393,6 @@ class GnomeModule(ExtensionModule):
>                raise MesonException('Gir takes one argument')
>            if kwargs.get('install_dir'):
>                raise MesonException('install_dir is not supported with
generate_gir(), see "install_dir_gir" and "install_dir_typelib"')
> --        giscanner = find_program('g-ir-scanner', 'Gir')
> --        gicompiler = find_program('g-ir-compiler', 'Gir')
> +-        giscanner = self.interpreter.find_program_impl('g-ir-scanner')
> +-        gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
>            girtarget = args[0]
>            while hasattr(girtarget, 'held_object'):
>                girtarget = girtarget.held_object
> -@@ -402,6 +400,8 @@ class GnomeModule(ExtensionModule):
> +@@ -405,6 +403,8 @@ class GnomeModule(ExtensionModule):
>                    self.gir_dep =
PkgConfigDependency('gobject-introspection-1.0',
>                                                       state.environment,
>                                                       {'native': True})
> @@ -37,6 +37,3 @@ index 4f7fe30..9610cf6 100644
>                pkgargs = self.gir_dep.get_compile_args()
>            except Exception:
>                raise MesonException('gobject-introspection dependency was
not found, gir cannot be generated.')
> ---
> -2.15.0
> -
> diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> index af5e6a190bf..f00327714b6 100644
> --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> @@ -1,7 +1,7 @@
> -From ffa72eac56558aa4171dd70ac1e9c27a07338fa2 Mon Sep 17 00:00:00 2001
> +From 0eec9428376450917098c68539a6c9dd60b85d93 Mon Sep 17 00:00:00 2001
>   From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>   Date: Wed, 15 Nov 2017 15:05:01 +0100
> -Subject: [PATCH 4/4] native_bindir
> +Subject: [PATCH] native_bindir

>   Some libraries, like QT, have pre-processors that convert their input
>   files into something that the cross-compiler can process. We find the
> @@ -17,15 +17,15 @@ Upstream-Status: Inappropriate [OE specific]
>   Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>

>   ---
> - mesonbuild/dependencies/base.py | 16 ++++++++++------
> + mesonbuild/dependencies/base.py | 19 +++++++++++--------
>    mesonbuild/dependencies/ui.py   |  6 +++---
> - 2 files changed, 13 insertions(+), 9 deletions(-)
> + 2 files changed, 14 insertions(+), 11 deletions(-)

>   diff --git a/mesonbuild/dependencies/base.py
b/mesonbuild/dependencies/base.py
> -index bf79bc5..c9fd08c 100644
> +index 0114a14..f4f19c5 100644
>   --- a/mesonbuild/dependencies/base.py
>   +++ b/mesonbuild/dependencies/base.py
> -@@ -131,7 +131,7 @@ class Dependency:
> +@@ -141,7 +141,7 @@ class Dependency:
>        def need_threads(self):
>            return False

> @@ -34,7 +34,7 @@ index bf79bc5..c9fd08c 100644
>            raise DependencyException('{!r} is not a pkgconfig
dependency'.format(self.name))

>        def get_configtool_variable(self, variable_name):
> -@@ -150,7 +150,7 @@ class InternalDependency(Dependency):
> +@@ -178,7 +178,7 @@ class InternalDependency(Dependency):
>            self.sources = sources
>            self.ext_deps = ext_deps

> @@ -43,24 +43,34 @@ index bf79bc5..c9fd08c 100644
>            raise DependencyException('Method "get_pkgconfig_variable()" is
'
>                                      'invalid for an internal dependency')

> -@@ -425,10 +425,14 @@ class PkgConfigDependency(ExternalDependency):
> +@@ -517,11 +517,14 @@ class PkgConfigDependency(ExternalDependency):
>            return s.format(self.__class__.__name__, self.name,
self.is_found,
>                            self.version_reqs)

> --    def _call_pkgbin(self, args, env=None):
> -+    def _call_pkgbin(self, args, env=None, use_native=False):
> -         if not env:
> -             env = os.environ
> --        p, out = Popen_safe([self.pkgbin] + args, env=env)[0:2]
> +-    def _call_pkgbin_real(self, args, env):
> +-        p, out = Popen_safe(self.pkgbin.get_command() + args,
env=env)[0:2]
> ++    def _call_pkgbin_real(self, args, env, use_native=False):
>   +        if use_native:
> -+            pkgbin = [self.pkgbin + "-native"]
> ++            p, out = Popen_safe(self.pkgbin.get_command() + "-native" +
args, env=env)[0:2]
>   +        else:
> -+            pkgbin = [self.pkgbin]
> -+        p, out = Popen_safe(pkgbin + args, env=env)[0:2]
> ++            p, out = Popen_safe(self.pkgbin.get_command() + args,
env=env)[0:2]
>            return p.returncode, out.strip()

> +-    def _call_pkgbin(self, args, env=None):
> ++    def _call_pkgbin(self, args, env=None, use_native=False):
> +         if env is None:
> +             fenv = env
> +             env = os.environ
> +@@ -530,7 +533,7 @@ class PkgConfigDependency(ExternalDependency):
> +         targs = tuple(args)
> +         cache = PkgConfigDependency.pkgbin_cache
> +         if (self.pkgbin, targs, fenv) not in cache:
> +-            cache[(self.pkgbin, targs, fenv)] =
self._call_pkgbin_real(args, env)
> ++            cache[(self.pkgbin, targs, fenv)] =
self._call_pkgbin_real(args, env, use_native)
> +         return cache[(self.pkgbin, targs, fenv)]
> +
>        def _convert_mingw_paths(self, args):
> -@@ -522,7 +526,7 @@ class PkgConfigDependency(ExternalDependency):
> +@@ -630,7 +633,7 @@ class PkgConfigDependency(ExternalDependency):
>                # linkers such as MSVC, so prepend them.
>                self.link_args = ['-L' + lp for lp in libpaths] +
self.link_args

> @@ -69,7 +79,7 @@ index bf79bc5..c9fd08c 100644
>            options = ['--variable=' + variable_name, self.name]

>            if 'define_variable' in kwargs:
> -@@ -535,7 +539,7 @@ class PkgConfigDependency(ExternalDependency):
> +@@ -643,7 +646,7 @@ class PkgConfigDependency(ExternalDependency):

>                options = ['--define-variable=' + '='.join(definition)] +
options

> @@ -79,10 +89,10 @@ index bf79bc5..c9fd08c 100644
>            if ret != 0:
>                if self.required:
>   diff --git a/mesonbuild/dependencies/ui.py
b/mesonbuild/dependencies/ui.py
> -index 1db518c..4ed1d04 100644
> +index 2f31196..916f648 100644
>   --- a/mesonbuild/dependencies/ui.py
>   +++ b/mesonbuild/dependencies/ui.py
> -@@ -239,7 +239,7 @@ class QtBaseDependency(ExternalDependency):
> +@@ -240,7 +240,7 @@ class QtBaseDependency(ExternalDependency):
>            self.bindir = self.get_pkgconfig_host_bins(core)
>            if not self.bindir:
>                # If exec_prefix is not defined, the pkg-config file is
broken
> @@ -91,7 +101,7 @@ index 1db518c..4ed1d04 100644
>                if prefix:
>                    self.bindir = os.path.join(prefix, 'bin')

> -@@ -359,7 +359,7 @@ class Qt4Dependency(QtBaseDependency):
> +@@ -374,7 +374,7 @@ class Qt4Dependency(QtBaseDependency):
>            applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
>            for application in applications:
>                try:
> @@ -100,7 +110,7 @@ index 1db518c..4ed1d04 100644
>                except MesonException:
>                    pass

> -@@ -369,7 +369,7 @@ class Qt5Dependency(QtBaseDependency):
> +@@ -384,7 +384,7 @@ class Qt5Dependency(QtBaseDependency):
>            QtBaseDependency.__init__(self, 'qt5', env, kwargs)

>        def get_pkgconfig_host_bins(self, core):
> @@ -109,6 +119,3 @@ index 1db518c..4ed1d04 100644


>    # There are three different ways of depending on SDL2:
> ---
> -2.15.1
> -
> diff --git a/meta/recipes-devtools/meson/meson_0.45.1.bb
b/meta/recipes-devtools/meson/meson_0.46.0.bb
> similarity index 83%
> rename from meta/recipes-devtools/meson/meson_0.45.1.bb
> rename to meta/recipes-devtools/meson/meson_0.46.0.bb
> index 9decdd0c24c..7334045e05f 100644
> --- a/meta/recipes-devtools/meson/meson_0.45.1.bb
> +++ b/meta/recipes-devtools/meson/meson_0.46.0.bb
> @@ -10,8 +10,8 @@ SRC_URI = "
https://github.com/mesonbuild/meson/releases/download/${PV}/${BP}.tar

file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \
>              file://0003-native_bindir.patch \
>              "
> -SRC_URI[md5sum] = "4d9c7b3a7365b7b472f00af14e034949"
> -SRC_URI[sha256sum] =
"4d0bb0dbb1bb556cb7a4092fdfea3d6e76606bd739a4bc97481c2d7bc6200afb"
> +SRC_URI[md5sum] = "e3301606017e364a0d7e1c3b755e7a28"
> +SRC_URI[sha256sum] =
"b7df91b01a358a8facdbfa33596a47cda38a760435ab55e1985c0bff06a9cbf0"
>   UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"

>   inherit setuptools3
> --
> 2.16.1

> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Randy MacLeod]

On 05/04/2018 08:32 AM, Alexander Kanavin wrote:
> Rebase a couple of patches


It seems that this meson update broke systemd on qemuppc.
I'll look into it a more tomorrow but below is what I know so far.
It looks like the libsystemd-shared.so size increased by 18% despite
the build flags being the same!

Despite my IRC handle, I'm a meson newbie so any tips will
be appreciated. I'll work on getting meson/ninja to be more
verbose tomorrow to track down what really changed.


I recently started testing qemuppc by booting
core-image-minimal with systemd as init. It fails with:

    /sbin/init: error while loading shared libraries:
       /lib/systemd/libsystemd-shared-237.so: R_PPC_REL24 relocation at 
0x0054574c for symbol `strlen' out of range

or in some cases:

   systemd[1]: \
      unhandled signal 11 at b804b784 nip 0070d184 lr 008ee1ac code 1
   Kernel panic - not syncing: \
      Attempted to kill init! exitcode=0x0000000b
when running:
     runqemu slirp nographic qemuppc ext4

The error only appears when using the distro poky-lsb
or a security template in the WR builds.

Adding:
meta/conf/distro/include/security_flags.inc
+SECURITY_CFLAGS_pn-systemd_powerpc = "${SECURITY_NO_PIE_CFLAGS}"

the systemd configure flags changed from:
        -no-pie -fno-PIE
to:
        -Wformat -Wformat-security -Werror=format-security
and the problem went away.

Being a sucker for punishment and having a nice builder on hand,
I decided to bisect the error anyway, assuming that I'd end up
at a systemd or toolchain uprev. Instead, I ended up at this
meson update being the culprit.


Here are the poky commits with the final stages of a
git bisect status appended:

53dfa673d7 musl: Upgrade to latest - bad
...
several bad results
...
96d783fa39 ifupdown: correct the repository location - bad
a6b62ef9ae meson: update to 0.46.0 - BAD
26fba81701 webkitgtk: update to 2.20.1 - good
4c52e22689 procps: update to 3.3.14 - untested
23320a2c9a libwebp: update to 1.0.0 - good
...
some good or unbuildable results
...


Looking at:
$ buildhistory-diff 10cdd2f bbbbd64
Changes to images/qemuppc/glibc/core-image-minimal (files-in-image.txt):
   /etc/udev/hwdb.bin was removed
   /etc/rpm-postinsts/100-udev-hwdb was added
   /etc/rpm-postinsts was added
images/qemuppc/glibc/core-image-minimal:
   IMAGESIZE changed from 48828 to 43144 (-12%)
packages/ppc7400-poky-linux/systemd/libnss-myhostname:
   PKGSIZE changed from 198364 to 132584 (-33%)
packages/ppc7400-poky-linux/systemd/libnss-mymachines:
   PKGSIZE changed from 461724 to 394872 (-14%)
packages/ppc7400-poky-linux/systemd/libudev:
   PKGSIZE changed from 264200 to 198180 (-25%)
packages/ppc7400-poky-linux/systemd/systemd-analyze:
   PKGSIZE changed from 1445140 to 1902168 (+32%)
packages/ppc7400-poky-linux/systemd/systemd-container:
   PKGSIZE changed from 528737 to 725017 (+37%)
packages/ppc7400-poky-linux/systemd/systemd:
   PKGSIZE changed from 9540698 to 11236850 (+18%)

The systemd package sizes have change quite a bit
and the main pkg increased by 18% likely putting the
shared library over a PPC relative jump limit of 8MB iirc.

The configure files changed but only due to a typo fix
and a warning about a feature that will become an error in
the next release. None of the flags that get tested and used changed!
The PIE/pie flags [1] don't change.

The meson compile logs don't help immediately because they
hide the 'Compiling/Linking' flags but massaging the logs,
shows that all the same files are compiled and linked.

Any suggestions?

More tomorrow...

-- 
# Randy MacLeod
# Wind River Linux


[1]

$ grep -i pie /tmp/log.do_configure.93182  /tmp/log.do_configure.57702
/tmp/log.do_configure.93182:Cross C compiler: \
   powerpc-poky-linux-gcc -m32 -mhard-float -mcpu=7400 -mno-spe \
     -fstack-protector-strong -D_FORTIFY_SOURCE=2 \
     -no-pie -fno-PIE \
 
--sysroot=/.../tmp/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot 
(gcc 7.3.0)
/tmp/log.do_configure.93182:Compiler for C supports argument -fPIE: YES
/tmp/log.do_configure.93182:Message: Linking with -pie supported: yes

/tmp/log.do_configure.57702:Cross C compiler: \
   powerpc-poky-linux-gcc -m32 -mhard-float -mcpu=7400 -mno-spe \
     -fstack-protector-strong -D_FORTIFY_SOURCE=2 \
     -no-pie -fno-PIE \
 
--sysroot=/.../tmp/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot 
(gcc 7.3.0)
/tmp/log.do_configure.57702:Compiler for C supports arguments -fPIE: YES
/tmp/log.do_configure.57702:Message: Linking with -pie supported: yes

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Nirbheek Chauhan]

On Tue, Jun 19, 2018 at 10:34 AM Randy MacLeod
<randy.macleod@windriver.com> wrote:
> It seems that this meson update broke systemd on qemuppc.
> I'll look into it a more tomorrow but below is what I know so far.
> It looks like the libsystemd-shared.so size increased by 18% despite
> the build flags being the same!
>
> Despite my IRC handle, I'm a meson newbie so any tips will
> be appreciated. I'll work on getting meson/ninja to be more
> verbose tomorrow to track down what really changed.
>

Just FYI, Meson 0.47 will be released next week so if there are any
important regressions, this might be a good time to bring them up. We
will be working on the stable release for 2 weeks after that, so
that's another window.

If you need help with Meson, #mesonbuild on FreeNode is a good place to ask.

Cheers,
Nirbheek

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Burton, Ross]

On 19 June 2018 at 06:03, Randy MacLeod <randy.macleod@windriver.com> wrote:
> It seems that this meson update broke systemd on qemuppc.
> I'll look into it a more tomorrow but below is what I know so far.
> It looks like the libsystemd-shared.so size increased by 18% despite
> the build flags being the same!
>
> Despite my IRC handle, I'm a meson newbie so any tips will
> be appreciated. I'll work on getting meson/ninja to be more
> verbose tomorrow to track down what really changed.
>
>
> I recently started testing qemuppc by booting
> core-image-minimal with systemd as init. It fails with:
>
>    /sbin/init: error while loading shared libraries:
>       /lib/systemd/libsystemd-shared-237.so: R_PPC_REL24 relocation at
> 0x0054574c for symbol `strlen' out of range
>
> or in some cases:
>
>   systemd[1]: \
>      unhandled signal 11 at b804b784 nip 0070d184 lr 008ee1ac code 1
>   Kernel panic - not syncing: \
>      Attempted to kill init! exitcode=0x0000000b
> when running:
>     runqemu slirp nographic qemuppc ext4
>
> The error only appears when using the distro poky-lsb
> or a security template in the WR builds.

Khem suggests that this is due to the new gcc and PIE on PPC being
bust, but even after passing no-pie this is still happening for me.

Ross

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Alexander Kanavin]

The order of arguments to compiler and linker matters. I remember that
when converting recipes from autotools to meson, I had to fix the
order to be exactly same, or some weird, arch-specific issues arose.
Can you check the precise command line in both working and broken
case, and what has changed there?

Alex

2018-06-19 12:59 GMT+03:00 Burton, Ross <ross.burton@intel.com>:
> On 19 June 2018 at 06:03, Randy MacLeod <randy.macleod@windriver.com> wrote:
>> It seems that this meson update broke systemd on qemuppc.
>> I'll look into it a more tomorrow but below is what I know so far.
>> It looks like the libsystemd-shared.so size increased by 18% despite
>> the build flags being the same!
>>
>> Despite my IRC handle, I'm a meson newbie so any tips will
>> be appreciated. I'll work on getting meson/ninja to be more
>> verbose tomorrow to track down what really changed.
>>
>>
>> I recently started testing qemuppc by booting
>> core-image-minimal with systemd as init. It fails with:
>>
>>    /sbin/init: error while loading shared libraries:
>>       /lib/systemd/libsystemd-shared-237.so: R_PPC_REL24 relocation at
>> 0x0054574c for symbol `strlen' out of range
>>
>> or in some cases:
>>
>>   systemd[1]: \
>>      unhandled signal 11 at b804b784 nip 0070d184 lr 008ee1ac code 1
>>   Kernel panic - not syncing: \
>>      Attempted to kill init! exitcode=0x0000000b
>> when running:
>>     runqemu slirp nographic qemuppc ext4
>>
>> The error only appears when using the distro poky-lsb
>> or a security template in the WR builds.
>
> Khem suggests that this is due to the new gcc and PIE on PPC being
> bust, but even after passing no-pie this is still happening for me.
>
> Ross

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Khem Raj]

On 6/19/18 2:59 AM, Burton, Ross wrote:
> On 19 June 2018 at 06:03, Randy MacLeod <randy.macleod@windriver.com> wrote:
>> It seems that this meson update broke systemd on qemuppc.
>> I'll look into it a more tomorrow but below is what I know so far.
>> It looks like the libsystemd-shared.so size increased by 18% despite
>> the build flags being the same!
>>
>> Despite my IRC handle, I'm a meson newbie so any tips will
>> be appreciated. I'll work on getting meson/ninja to be more
>> verbose tomorrow to track down what really changed.
>>
>>
>> I recently started testing qemuppc by booting
>> core-image-minimal with systemd as init. It fails with:
>>
>>     /sbin/init: error while loading shared libraries:
>>        /lib/systemd/libsystemd-shared-237.so: R_PPC_REL24 relocation at
>> 0x0054574c for symbol `strlen' out of range

This would also indicate that libsystemd is probably missing -fPIC 
during compile, can you check the compiler cmdline passed when building 
on of .o files that gets includes in libsystemd.

>>
>> or in some cases:
>>
>>    systemd[1]: \
>>       unhandled signal 11 at b804b784 nip 0070d184 lr 008ee1ac code 1
>>    Kernel panic - not syncing: \
>>       Attempted to kill init! exitcode=0x0000000b
>> when running:
>>      runqemu slirp nographic qemuppc ext4
>>
>> The error only appears when using the distro poky-lsb
>> or a security template in the WR builds.
> 
> Khem suggests that this is due to the new gcc and PIE on PPC being
> bust, but even after passing no-pie this is still happening for me.
> 
> Ross
> 

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Burton, Ross]

On 19 June 2018 at 17:00, Khem Raj <raj.khem@gmail.com> wrote:
>>> I recently started testing qemuppc by booting
>>> core-image-minimal with systemd as init. It fails with:
>>>
>>>     /sbin/init: error while loading shared libraries:
>>>        /lib/systemd/libsystemd-shared-237.so: R_PPC_REL24 relocation at
>>> 0x0054574c for symbol `strlen' out of range
>
>
> This would also indicate that libsystemd is probably missing -fPIC during
> compile, can you check the compiler cmdline passed when building on of .o
> files that gets includes in libsystemd.

[1/1423] powerpc-poky-linux-gcc -m32 -mhard-float -mcpu=7400 -mno-spe
-fstack-protector-strong -D_FORTIFY_SOURCE=2 -no-pie -fno-PIE
--sysroot=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot
-Isrc/libsystemd/src@libsystemd@@systemd@sta -Isrc/libsystemd
-I../git/src/libsystemd -Isrc/basic -I../git/src/basic -Isrc/shared
-I../git/src/shared -Isrc/systemd -I../git/src/systemd -Isrc/journal
-I../git/src/journal -Isrc/resolve -I../git/src/resolve -Isrc/timesync
-I../git/src/timesync -Isrc/login -I../git/src/login -Isrc/udev
-I../git/src/udev -Isrc/libudev -I../git/src/libudev -Isrc/core
-I../git/src/core -I../git/src/libsystemd/sd-bus
-I../git/src/libsystemd/sd-device -I../git/src/libsystemd/sd-hwdb
-I../git/src/libsystemd/sd-id128 -I../git/src/libsystemd/sd-netlink
-I../git/src/libsystemd/sd-network -Isrc/libsystemd-network
-I../git/src/libsystemd-network -I. -I../git/
-fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu99
-Wextra -Werror=undef -Wlogical-op -Wmissing-include-dirs
-Wold-style-definition -Wpointer-arith -Winit-self
-Wdeclaration-after-statement -Wfloat-equal
-Wsuggest-attribute=noreturn -Werror=missing-prototypes
-Werror=implicit-function-declaration -Werror=missing-declarations
-Werror=return-type -Werror=incompatible-pointer-types
-Werror=format=2 -Wstrict-prototypes -Wredundant-decls
-Wmissing-noreturn -Wimplicit-fallthrough=5 -Wshadow -Wendif-labels
-Wstrict-aliasing=2 -Wwrite-strings -Werror=overflow -Wdate-time
-Wnested-externs -ffast-math -fno-common -fdiagnostics-show-option
-fno-strict-aliasing -fvisibility=hidden -fstack-protector
-fstack-protector-strong --param=ssp-buffer-size=4 -fPIE
-Wno-unused-parameter -Wno-missing-field-initializers
-Wno-unused-result -Wno-format-signedness -Wno-error=nonnull
-Werror=shadow -ffunction-sections -fdata-sections -include config.h
-fPIC -pthread -fvisibility=default -m32 -mhard-float -mcpu=7400
-mno-spe -fstack-protector-strong -D_FORTIFY_SOURCE=2 -no-pie -fno-PIE
--sysroot=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot
-O2 -pipe -g -feliminate-unused-debug-types
-fdebug-prefix-map=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0=/usr/src/debug/systemd/1_237-r0
-fdebug-prefix-map=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot=
-fdebug-prefix-map=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot-native=
-MD -MQ 'src/libsystemd/src@libsystemd@@systemd@sta/sd-utf8_sd-utf8.c.o'
-MF 'src/libsystemd/src@libsystemd@@systemd@sta/sd-utf8_sd-utf8.c.o.d'
-o 'src/libsystemd/src@libsystemd@@systemd@sta/sd-utf8_sd-utf8.c.o' -c
../git/src/libsystemd/sd-utf8/sd-utf8.c

You're right, no -fPIC.  The no-PIE flags are coming from
SECURITY_NOPIE_CFLAGS.  I'm guessing security_flags is interacting
badly with ppc again?

Ross

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Randy MacLeod]

On 06/19/2018 03:49 PM, Burton, Ross wrote:
> On 19 June 2018 at 17:00, Khem Raj <raj.khem@gmail.com> wrote:
>>>> I recently started testing qemuppc by booting
>>>> core-image-minimal with systemd as init. It fails with:
>>>>
>>>>      /sbin/init: error while loading shared libraries:
>>>>         /lib/systemd/libsystemd-shared-237.so: R_PPC_REL24 relocation at
>>>> 0x0054574c for symbol `strlen' out of range
>>
>>
>> This would also indicate that libsystemd is probably missing -fPIC during
>> compile, can you check the compiler cmdline passed when building on of .o
>> files that gets includes in libsystemd.
> 
> [1/1423] powerpc-poky-linux-gcc -m32 -mhard-float -mcpu=7400 -mno-spe
> -fstack-protector-strong -D_FORTIFY_SOURCE=2 -no-pie -fno-PIE
> --sysroot=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot
> -Isrc/libsystemd/src@libsystemd@@systemd@sta -Isrc/libsystemd
> -I../git/src/libsystemd -Isrc/basic -I../git/src/basic -Isrc/shared
> -I../git/src/shared -Isrc/systemd -I../git/src/systemd -Isrc/journal
> -I../git/src/journal -Isrc/resolve -I../git/src/resolve -Isrc/timesync
> -I../git/src/timesync -Isrc/login -I../git/src/login -Isrc/udev
> -I../git/src/udev -Isrc/libudev -I../git/src/libudev -Isrc/core
> -I../git/src/core -I../git/src/libsystemd/sd-bus
> -I../git/src/libsystemd/sd-device -I../git/src/libsystemd/sd-hwdb
> -I../git/src/libsystemd/sd-id128 -I../git/src/libsystemd/sd-netlink
> -I../git/src/libsystemd/sd-network -Isrc/libsystemd-network
> -I../git/src/libsystemd-network -I. -I../git/
> -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu99
> -Wextra -Werror=undef -Wlogical-op -Wmissing-include-dirs
> -Wold-style-definition -Wpointer-arith -Winit-self
> -Wdeclaration-after-statement -Wfloat-equal
> -Wsuggest-attribute=noreturn -Werror=missing-prototypes
> -Werror=implicit-function-declaration -Werror=missing-declarations
> -Werror=return-type -Werror=incompatible-pointer-types
> -Werror=format=2 -Wstrict-prototypes -Wredundant-decls
> -Wmissing-noreturn -Wimplicit-fallthrough=5 -Wshadow -Wendif-labels
> -Wstrict-aliasing=2 -Wwrite-strings -Werror=overflow -Wdate-time
> -Wnested-externs -ffast-math -fno-common -fdiagnostics-show-option
> -fno-strict-aliasing -fvisibility=hidden -fstack-protector
> -fstack-protector-strong --param=ssp-buffer-size=4 -fPIE
> -Wno-unused-parameter -Wno-missing-field-initializers
> -Wno-unused-result -Wno-format-signedness -Wno-error=nonnull
> -Werror=shadow -ffunction-sections -fdata-sections -include config.h

> -fPIC
Hey Ross ^^^

> -pthread -fvisibility=default -m32 -mhard-float -mcpu=7400
> -mno-spe -fstack-protector-strong -D_FORTIFY_SOURCE=2 -no-pie -fno-PIE
> --sysroot=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot
> -O2 -pipe -g -feliminate-unused-debug-types
> -fdebug-prefix-map=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0=/usr/src/debug/systemd/1_237-r0
> -fdebug-prefix-map=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot=
> -fdebug-prefix-map=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot-native=
> -MD -MQ 'src/libsystemd/src@libsystemd@@systemd@sta/sd-utf8_sd-utf8.c.o'
> -MF 'src/libsystemd/src@libsystemd@@systemd@sta/sd-utf8_sd-utf8.c.o.d'
> -o 'src/libsystemd/src@libsystemd@@systemd@sta/sd-utf8_sd-utf8.c.o' -c
> ../git/src/libsystemd/sd-utf8/sd-utf8.c
> 
> You're right, no -fPIC.  

fPIC is there, look again!
I just send my reply as your email arrived.

> The no-PIE flags are coming from
> SECURITY_NOPIE_CFLAGS.  I'm guessing security_flags is interacting
> badly with ppc again?

Right and I could just add:
    SECURITY_CFLAGS_pn-systemd_powerpc = "${SECURITY_NO_PIE_CFLAGS}"
in meta/conf/distro/include/security_flags.inc but
I wanted to be sure that I understood why such a change is needed.
The meson update shouldn't break things...

../Randy

> 
> Ross
> 


-- 
# Randy MacLeod
# Wind River Linux

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Burton, Ross]

On 19 June 2018 at 21:06, Randy MacLeod <randy.macleod@windriver.com> wrote:
>> -fPIC
>
> Hey Ross ^^^

> fPIC is there, look again!
> I just send my reply as your email arrived.

I'm clearly going compiler flag blind...

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Randy MacLeod]

Alex wrote:
> The order of arguments to compiler and linker matters. I remember that
> when converting recipes from autotools to meson, I had to fix the
> order to be exactly same, or some weird, arch-specific issues arose.
> Can you check the precise command line in both working and broken
> case, and what has changed there?
> 
> Alex

I did two builds with a local change to compile using
ninja -v to get the actual compiler/linker lines.

after:  a6b62ef9ae meson: update to 0.46.0 - BAD
before: 26fba81701 webkitgtk: update to 2.20.1 - good

The list of compiler arguments (when building boot-timestamps.c)
is identical aside from an odd path change but the order
changes across the meson 0.46.0 update:

The odd path change is:

before:
    'src/shared/            systemd-shared-237@sta/acpi-fpdt.c.o'
after:
    'src/shared/src@shared@@systemd-shared-237@sta/acpi-fpdt.c.o'
This looks odd to me but I'm ignoring it since the files are
clearly found by the build.

The compiler flag order difference is too large for a civilized
email so it's here:
diff -Naur: https://pastebin.com/pWSzDm5W
sdiff -t  : https://pastebin.com/5BX8QvNs


When linking libsystemd-shared-237.so the location of the:
    -Wl,--end-group
option changes:

before:

-lrt
-L/.../qppc-sd/tmp/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr//lib
-lcap
-lacl
-llzma
-lblkid
-Wl,--end-group <-----
-lrt

after:

-lrt
-Wl,--end-group <-----
-L/.../qppc-sd/tmp/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr//lib
-lcap
-lacl
-llzma
-lblkid
-lrt


and some _apparently_ redundant libraries and lib paths were dropped:

both:
-L/.../qppc-sd/tmp/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr//lib
-lcap
-lblkid
-lrt

only before:
-L/.../qppc-sd/tmp/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr//lib
-lcap
-lblkid


On 06/19/2018 12:00 PM, Khem Raj wrote:
> 
> 
> On 6/19/18 2:59 AM, Burton, Ross wrote:
>> On 19 June 2018 at 06:03, Randy MacLeod <randy.macleod@windriver.com> 
>> wrote:
>>> It seems that this meson update broke systemd on qemuppc.
>>> I'll look into it a more tomorrow but below is what I know so far.
>>> It looks like the libsystemd-shared.so size increased by 18% despite
>>> the build flags being the same!
>>>
>>> Despite my IRC handle, I'm a meson newbie so any tips will
>>> be appreciated. I'll work on getting meson/ninja to be more
>>> verbose tomorrow to track down what really changed.
>>>
>>>
>>> I recently started testing qemuppc by booting
>>> core-image-minimal with systemd as init. It fails with:
>>>
>>>     /sbin/init: error while loading shared libraries:
>>>        /lib/systemd/libsystemd-shared-237.so: R_PPC_REL24 relocation at
>>> 0x0054574c for symbol `strlen' out of range
> 
> This would also indicate that libsystemd is probably missing -fPIC 
> during compile, can you check the compiler cmdline passed when building 
> on of .o files that gets includes in libsystemd.

fPIC is used in both cases:

$ grep fPIC temp-good/log.do_compile.boot-timestamp \
             temp-bad/log.do_compile.boot-timestamp
temp-good/log.do_compile.boot-timestamp:-fPIC
temp-bad/log.do_compile.boot-timestamp:-fPIC


I don't have any more time for this today so I'm sending this
update. My next step is to examine the libsystemd-shared-237.so
file itself using readelf and/or objdump to see why the file size
increased ... unless someone has a better idea.

../Randy

> 
>>>
>>> or in some cases:
>>>
>>>    systemd[1]: \
>>>       unhandled signal 11 at b804b784 nip 0070d184 lr 008ee1ac code 1
>>>    Kernel panic - not syncing: \
>>>       Attempted to kill init! exitcode=0x0000000b
>>> when running:
>>>      runqemu slirp nographic qemuppc ext4
>>>
>>> The error only appears when using the distro poky-lsb
>>> or a security template in the WR builds.
>>
>> Khem suggests that this is due to the new gcc and PIE on PPC being
>> bust, but even after passing no-pie this is still happening for me.
>>
>> Ross
>>


-- 
# Randy MacLeod
# Wind River Linux

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Alexander Kanavin]

2018-06-19 22:01 GMT+02:00 Randy MacLeod <randy.macleod@windriver.com>:
> The compiler flag order difference is too large for a civilized
> email so it's here:
> diff -Naur: https://pastebin.com/pWSzDm5W
> sdiff -t  : https://pastebin.com/5BX8QvNs
>
>
> When linking libsystemd-shared-237.so the location of the:
>    -Wl,--end-group
> option changes:
>
> before:
>
> -lrt
> -L/.../qppc-sd/tmp/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr//lib
> -lcap
> -lacl
> -llzma
> -lblkid
> -Wl,--end-group <-----
> -lrt
>
> after:
>
> -lrt
> -Wl,--end-group <-----
> -L/.../qppc-sd/tmp/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr//lib
> -lcap
> -lacl
> -llzma
> -lblkid
> -lrt

FWIW, I did fix a similar (or maybe even same) issue with this patch:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch

It's possible that more rearranging needs to be done, or this patch no
longer has the desired effect.

Alex

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Nirbheek Chauhan]

On Wed, Jun 20, 2018 at 1:39 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
> FWIW, I did fix a similar (or maybe even same) issue with this patch:
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
>
> It's possible that more rearranging needs to be done, or this patch no
> longer has the desired effect.
>

So far in this thread, I don't see any changes that would cause this
issue, and that patch shouldn't change things either. The bisection is
probably significant, but I am not sure what's going.

Also, in general please try to talk to us first before doing a change
like that (switching the order of cross_args) so we can investigate
and figure out what we should fix. The cross_args are at the end so
they can override existing arguments, such as -D flags or -W flags.

Another thing to try would be current git, which has significant
changes in how we do library resolution, de-duplication, and so on.
Specifically, instead of `-lfoo`, we now prefer full paths to the
library to use instead since this allows greater flexibility in
selecting whether to use shared or static libraries.

Cheers,
Nirbheek

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Burton, Ross]

On 19 June 2018 at 21:24, Nirbheek Chauhan <nirbheek.chauhan@gmail.com> wrote:
> On Wed, Jun 20, 2018 at 1:39 AM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
>> FWIW, I did fix a similar (or maybe even same) issue with this patch:
>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
>>
>> It's possible that more rearranging needs to be done, or this patch no
>> longer has the desired effect.
>>
>
> So far in this thread, I don't see any changes that would cause this
> issue, and that patch shouldn't change things either. The bisection is
> probably significant, but I am not sure what's going.
>
> Also, in general please try to talk to us first before doing a change
> like that (switching the order of cross_args) so we can investigate
> and figure out what we should fix. The cross_args are at the end so
> they can override existing arguments, such as -D flags or -W flags.
>
> Another thing to try would be current git, which has significant
> changes in how we do library resolution, de-duplication, and so on.
> Specifically, instead of `-lfoo`, we now prefer full paths to the
> library to use instead since this allows greater flexibility in
> selecting whether to use shared or static libraries.

So I just generated a snapshot of current git and am building systemd
with it.  Interestingly, the flag order change is resulting in what
were warnings now being fatal and systemd fails to build.  One was
easily fixed with a patch from master, the other will have to wait
until tomorrow morning, but I will get back to this.

Ross

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Burton, Ross]

Okay, odd.  Hacked in a few compile fixes and now systemd v237 fails
to build with Meson git master:

| FAILED: libsystemd.so.0.21.0
| powerpc-poky-linux-gcc -m32 -mhard-float -mcpu=7400 -mno-spe
-fstack-protector-strong -D_FORTIFY_SOURCE=2 -no-pie -fno-PIE
--sysroot=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot
 -o libsystemd.so.0.21.0  -Wl,--no-undefined -Wl,--as-needed -shared
-fPIC -Wl,--start-group -Wl,-soname,libsystemd.so.0
-Wl,--whole-archive src/libsystemd/libsystemd.a
src/journal/libjournal-client.a -Wl,--no-whole-archive -Wl,-z,relro
-Wl,-z,now -pie -Wl,--gc-sections src/basic/libbasic.a
src/basic/libbasic-gcrypt.a -pthread -shared
-Wl,--version-script=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/git/src/libsystemd/libsystemd.sym
-lrt -Wl,--end-group
/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr/lib/liblzma.so
/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/lib/libcap.so
/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr/lib/libblkid.so
-lrt -m32 -mhard-float -mcpu=7400 -mno-spe -fstack-protector-strong
-D_FORTIFY_SOURCE=2 -no-pie -fno-PIE
--sysroot=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot
-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fstack-protector-strong
-Wl,-z,relro,-z,now
| /data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr/lib/../lib/crt1.o:(.rodata+0x4):
undefined reference to `main'

I'm guessing the compile option re-ordering is going wrong with our
compiler flags?

Ross

On 20 June 2018 at 00:02, Burton, Ross <ross.burton@intel.com> wrote:
> On 19 June 2018 at 21:24, Nirbheek Chauhan <nirbheek.chauhan@gmail.com> wrote:
>> On Wed, Jun 20, 2018 at 1:39 AM Alexander Kanavin
>> <alex.kanavin@gmail.com> wrote:
>>> FWIW, I did fix a similar (or maybe even same) issue with this patch:
>>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
>>>
>>> It's possible that more rearranging needs to be done, or this patch no
>>> longer has the desired effect.
>>>
>>
>> So far in this thread, I don't see any changes that would cause this
>> issue, and that patch shouldn't change things either. The bisection is
>> probably significant, but I am not sure what's going.
>>
>> Also, in general please try to talk to us first before doing a change
>> like that (switching the order of cross_args) so we can investigate
>> and figure out what we should fix. The cross_args are at the end so
>> they can override existing arguments, such as -D flags or -W flags.
>>
>> Another thing to try would be current git, which has significant
>> changes in how we do library resolution, de-duplication, and so on.
>> Specifically, instead of `-lfoo`, we now prefer full paths to the
>> library to use instead since this allows greater flexibility in
>> selecting whether to use shared or static libraries.
>
> So I just generated a snapshot of current git and am building systemd
> with it.  Interestingly, the flag order change is resulting in what
> were warnings now being fatal and systemd fails to build.  One was
> easily fixed with a patch from master, the other will have to wait
> until tomorrow morning, but I will get back to this.
>
> Ross

Re: [PATCH 12/14] meson: update to 0.46.0 -- broke systemd on qemuppc

[Khem Raj]

On Tue, Jun 19, 2018 at 4:13 PM Burton, Ross <ross.burton@intel.com> wrote:
>
> Okay, odd.  Hacked in a few compile fixes and now systemd v237 fails
> to build with Meson git master:
>
> | FAILED: libsystemd.so.0.21.0
> | powerpc-poky-linux-gcc -m32 -mhard-float -mcpu=7400 -mno-spe
> -fstack-protector-strong -D_FORTIFY_SOURCE=2 -no-pie -fno-PIE
> --sysroot=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot
>  -o libsystemd.so.0.21.0  -Wl,--no-undefined -Wl,--as-needed -shared
> -fPIC -Wl,--start-group -Wl,-soname,libsystemd.so.0
> -Wl,--whole-archive src/libsystemd/libsystemd.a
> src/journal/libjournal-client.a -Wl,--no-whole-archive -Wl,-z,relro
> -Wl,-z,now -pie -Wl,--gc-sections src/basic/libbasic.a
> src/basic/libbasic-gcrypt.a -pthread -shared
> -Wl,--version-script=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/git/src/libsystemd/libsystemd.sym
> -lrt -Wl,--end-group
> /data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr/lib/liblzma.so
> /data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/lib/libcap.so
> /data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr/lib/libblkid.so
> -lrt -m32 -mhard-float -mcpu=7400 -mno-spe -fstack-protector-strong
> -D_FORTIFY_SOURCE=2 -no-pie -fno-PIE
> --sysroot=/data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot
> -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fstack-protector-strong
> -Wl,-z,relro,-z,now
> | /data/poky-tmp/master/work/ppc7400-poky-linux/systemd/1_237-r0/recipe-sysroot/usr/lib/../lib/crt1.o:(.rodata+0x4):
> undefined reference to `main'
>
> I'm guessing the compile option re-ordering is going wrong with our
> compiler flags?
>

When building a .so we need to remove pie flags regardless for linker
and compiler and replace with -fPIC like libtool does
pie flags are only relevant when building executable.
Can we try with v238  and see if that helps ?


> Ross
>
> On 20 June 2018 at 00:02, Burton, Ross <ross.burton@intel.com> wrote:
> > On 19 June 2018 at 21:24, Nirbheek Chauhan <nirbheek.chauhan@gmail.com> wrote:
> >> On Wed, Jun 20, 2018 at 1:39 AM Alexander Kanavin
> >> <alex.kanavin@gmail.com> wrote:
> >>> FWIW, I did fix a similar (or maybe even same) issue with this patch:
> >>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
> >>>
> >>> It's possible that more rearranging needs to be done, or this patch no
> >>> longer has the desired effect.
> >>>
> >>
> >> So far in this thread, I don't see any changes that would cause this
> >> issue, and that patch shouldn't change things either. The bisection is
> >> probably significant, but I am not sure what's going.
> >>
> >> Also, in general please try to talk to us first before doing a change
> >> like that (switching the order of cross_args) so we can investigate
> >> and figure out what we should fix. The cross_args are at the end so
> >> they can override existing arguments, such as -D flags or -W flags.
> >>
> >> Another thing to try would be current git, which has significant
> >> changes in how we do library resolution, de-duplication, and so on.
> >> Specifically, instead of `-lfoo`, we now prefer full paths to the
> >> library to use instead since this allows greater flexibility in
> >> selecting whether to use shared or static libraries.
> >
> > So I just generated a snapshot of current git and am building systemd
> > with it.  Interestingly, the flag order change is resulting in what
> > were warnings now being fatal and systemd fails to build.  One was
> > easily fixed with a patch from master, the other will have to wait
> > until tomorrow morning, but I will get back to this.
> >
> > Ross
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

[PATCH 13/14] ifupdown: correct the repository location

[Alexander Kanavin]

The old repo is gone.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-core/ifupdown/ifupdown_0.8.16.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb
index 5654528ae87..e9f3a2aee9b 100644
--- a/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb
+++ b/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb
@@ -6,7 +6,7 @@ the file /etc/network/interfaces."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-SRC_URI = "git://anonscm.debian.org/git/collab-maint/ifupdown.git \
+SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \
 	   file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
 	   file://inet-6-.defn-fix-inverted-checks-for-loopback.patch \
 	   file://99_network \
-- 
2.16.1

[PATCH 14/14] babeltrace: switch over to git

[Alexander Kanavin]

Tarball directory is gone.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-kernel/lttng/babeltrace_1.5.5.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
index 92d86b92e8b..5d7a7efd2f5 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
@@ -10,10 +10,10 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
 
 inherit autotools pkgconfig
 
-SRC_URI = "http://www.efficios.com/files/babeltrace/babeltrace-${PV}.tar.bz2 \
+SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \
 "
 
 EXTRA_OECONF = "--disable-debug-info"
 
-SRC_URI[md5sum] = "7decafd46093e4e47c14e7307d498986"
-SRC_URI[sha256sum] = "409146789b4a6b81f6a275fcad932a030743d444f6de5bd4a34aaf17aa72e8ac"
+S = "${WORKDIR}/git"
+SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e"
-- 
2.16.1

Re: [PATCH 14/14] babeltrace: switch over to git

[Paulo Neves]

Hello Alexander

I always wondered, what is the rationale for not always using the git
repositories? If there is one why did we change for this specific
recipe?

I ask this because I am in the process of creating a massive layer,
whose only purpose is to have the software come from the git
repository and not from the tarballs of the original poky recipes.

On Fri, May 4, 2018 at 2:32 PM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> Tarball directory is gone.
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-kernel/lttng/babeltrace_1.5.5.bb | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
> index 92d86b92e8b..5d7a7efd2f5 100644
> --- a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
> +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
> @@ -10,10 +10,10 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
>
>  inherit autotools pkgconfig
>
> -SRC_URI = "http://www.efficios.com/files/babeltrace/babeltrace-${PV}.tar.bz2 \
> +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-1.5 \
>  "
>
>  EXTRA_OECONF = "--disable-debug-info"
>
> -SRC_URI[md5sum] = "7decafd46093e4e47c14e7307d498986"
> -SRC_URI[sha256sum] = "409146789b4a6b81f6a275fcad932a030743d444f6de5bd4a34aaf17aa72e8ac"
> +S = "${WORKDIR}/git"
> +SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e"
> --
> 2.16.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 14/14] babeltrace: switch over to git

[Alexander Kanavin]

On 05/04/2018 03:46 PM, Paulo Neves wrote:
> I always wondered, what is the rationale for not always using the git
> repositories? If there is one why did we change for this specific
> recipe?
> 
> I ask this because I am in the process of creating a massive layer,
> whose only purpose is to have the software come from the git
> repository and not from the tarballs of the original poky recipes.

Git repositories can be much slower to clone, than it would be to 
download an equivalent tarball. Otherwise, I have no particular preference.

Alex

Re: [PATCH 14/14] babeltrace: switch over to git

[Burton, Ross]

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

On 4 May 2018 at 13:46, Paulo Neves <ptsneves@gmail.com> wrote:

> I always wondered, what is the rationale for not always using the git
> repositories? If there is one why did we change for this specific
> recipe?
>

Tarballs are easier to mirror, smaller, have checksums to verify the
download at both fetch and unpack time, and often contain generated files
which otherwise require yet more tools to regenerate (for example, man
pages may require a documentation toolchain to build from git but will be
included in a tarball).


> I ask this because I am in the process of creating a massive layer,
> whose only purpose is to have the software come from the git
> repository and not from the tarballs of the original poky recipes.


I certainly hope this is using devupstream.bbclass or similar and isn't a
giant copy/paste!

Ross

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

Re: [PATCH 14/14] babeltrace: switch over to git

[Paulo Neves]

On Fri, May 4, 2018 at 2:55 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 4 May 2018 at 13:46, Paulo Neves <ptsneves@gmail.com> wrote:
>>
>> I always wondered, what is the rationale for not always using the git
>> repositories? If there is one why did we change for this specific
>> recipe?
>
>
> Tarballs are easier to mirror, smaller, have checksums to verify the
> download at both fetch and unpack time, and often contain generated files
> which otherwise require yet more tools to regenerate (for example, man pages
> may require a documentation toolchain to build from git but will be included
> in a tarball).
In my case we have a requirement of using the git repositories because
of the easiness with which we can make code bissections, as well as
back porting.

>>
>> I ask this because I am in the process of creating a massive layer,
>> whose only purpose is to have the software come from the git
>> repository and not from the tarballs of the original poky recipes.
>
>
> I certainly hope this is using devupstream.bbclass or similar and isn't a
> giant copy/paste!
Wow never heard/saw of this bbclass even, and looking at the mega
manual there is not any reference to this class. Also from the look of
the classcode I am not seeing how this can help us accomplish the
goal. Can you point me to some docs or examples?

> Ross

The way we are doing the layer is, by bbappend, so there is not much
copy paste, but tarbal/git replacement.
There would be no problem if there would not be differences between
released tarballs and git repositories, but specially in autotools
projects, the bbappend requires much more trickery as you mentioned

Paulo Neves

Re: [PATCH 14/14] babeltrace: switch over to git

[Scott Rifenbark]

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

Obviously that class (devupstream.bbclass) is not in the YP reference
manual.  I will open a bug to document it.

Scott

On Fri, May 4, 2018 at 6:12 AM, Paulo Neves <ptsneves@gmail.com> wrote:

> On Fri, May 4, 2018 at 2:55 PM, Burton, Ross <ross.burton@intel.com>
> wrote:
> > On 4 May 2018 at 13:46, Paulo Neves <ptsneves@gmail.com> wrote:
> >>
> >> I always wondered, what is the rationale for not always using the git
> >> repositories? If there is one why did we change for this specific
> >> recipe?
> >
> >
> > Tarballs are easier to mirror, smaller, have checksums to verify the
> > download at both fetch and unpack time, and often contain generated files
> > which otherwise require yet more tools to regenerate (for example, man
> pages
> > may require a documentation toolchain to build from git but will be
> included
> > in a tarball).
> In my case we have a requirement of using the git repositories because
> of the easiness with which we can make code bissections, as well as
> back porting.
>
> >>
> >> I ask this because I am in the process of creating a massive layer,
> >> whose only purpose is to have the software come from the git
> >> repository and not from the tarballs of the original poky recipes.
> >
> >
> > I certainly hope this is using devupstream.bbclass or similar and isn't a
> > giant copy/paste!
> Wow never heard/saw of this bbclass even, and looking at the mega
> manual there is not any reference to this class. Also from the look of
> the classcode I am not seeing how this can help us accomplish the
> goal. Can you point me to some docs or examples?
>
> > Ross
>
> The way we are doing the layer is, by bbappend, so there is not much
> copy paste, but tarbal/git replacement.
> There would be no problem if there would not be differences between
> released tarballs and git repositories, but specially in autotools
> projects, the bbappend requires much more trickery as you mentioned
>
> Paulo Neves
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

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

Re: [PATCH 14/14] babeltrace: switch over to git

[Martin Jansa]

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

Similar change is needed in stable branches as well, I've just noticed it
failing with 1.4.0 version used in morty.

There is quite a few fetch issues in morty as of today.
oe-core/meta/recipes-support/libmpc/libmpc_1.0.3.bb:do_fetch
Resolving www.multiprecision.org (www.multiprecision.org)... 185.233.100.48
Connecting to www.multiprecision.org
(www.multiprecision.org)|185.233.100.48|:80...
connected.
HTTP request sent, awaiting response... 500 Internal Server Error
2018-05-04 16:46:19 ERROR 500: Internal Server Error.

oe-core/meta/recipes-support/libpcre/libpcre_8.39.bb:do_fetch
ERROR: libpcre-native-8.39-r0 do_fetch: Fetcher failure for URL: '
http://downloads.sourceforge.net/projects/pcre/files/prce/8.39/pcre-8.39.tar.bz2'.
Checksum mismatch!
sourceforge is returning some HTML instead of this tarball.

meta-oe/meta-oe/recipes-extended/libconfig/libconfig_1.5.bb:do_fetch
--2018-05-04 16:52:52--
http://www.hyperrealm.com/libconfig/libconfig-1.5.tar.gz
Resolving www.hyperrealm.com (www.hyperrealm.com)... 50.87.249.191
Connecting to www.hyperrealm.com (www.hyperrealm.com)|50.87.249.191|:80...
connected.
HTTP request sent, awaiting response... 301 Moved Permanently
Location: http://hyperrealm.com/libconfig/libconfig-1.5.tar.gz [following]
--2018-05-04 16:52:52--
http://hyperrealm.com/libconfig/libconfig-1.5.tar.gz
Resolving hyperrealm.com (hyperrealm.com)... 50.87.249.191
Reusing existing connection to www.hyperrealm.com:80.
HTTP request sent, awaiting response... 404 Not Found
2018-05-04 16:52:53 ERROR 404: Not Found.

meta-oe/meta-filesystems/recipes-support/fuse/fuse_2.9.4.bb:do_fetch
--2018-05-04 16:53:32--
http://downloads.sourceforge.net/fuse/fuse-2.9.4.tar.gz
Resolving downloads.sourceforge.net (downloads.sourceforge.net)...
216.105.38.13
Connecting to downloads.sourceforge.net
(downloads.sourceforge.net)|216.105.38.13|:80...
connected.
HTTP request sent, awaiting response... 404 Not Found
2018-05-04 16:53:32 ERROR 404: Not Found.

meta-oe/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb:do_fetch
--2018-05-04 16:54:20--
http://downloads.sourceforge.net/project/mikmod/libmikmod/3.3.6/libmikmod-3.3.6.tar.gz
Resolving downloads.sourceforge.net (downloads.sourceforge.net)...
216.105.38.13
Connecting to downloads.sourceforge.net
(downloads.sourceforge.net)|216.105.38.13|:80...
connected.
HTTP request sent, awaiting response... 404 Not Found
2018-05-04 16:54:20 ERROR 404: Not Found.

Luckily all of these issues (except the babeltrace) are covered by default
download mirrors.

Can you please upload the tarball (I assume you still have it from the time
you were testing the upgrade to 1.5.5) to:
http://downloads.yoctoproject.org/mirror/sources/babeltrace-1.5.5.tar.bz2
or
http://sources.openembedded.org/babeltrace-1.5.5.tar.bz2
so that it's covered with default mirrors.bbclass as well?

Thanks

On Fri, May 4, 2018 at 2:32 PM, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> Tarball directory is gone.
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-kernel/lttng/babeltrace_1.5.5.bb | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
> b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
> index 92d86b92e8b..5d7a7efd2f5 100644
> --- a/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
> +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.5.bb
> @@ -10,10 +10,10 @@ DEPENDS = "glib-2.0 util-linux popt bison-native
> flex-native"
>
>  inherit autotools pkgconfig
>
> -SRC_URI = "http://www.efficios.com/files/babeltrace/babeltrace-${
> PV}.tar.bz2 \
> +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;
> branch=stable-1.5 \
>  "
>
>  EXTRA_OECONF = "--disable-debug-info"
>
> -SRC_URI[md5sum] = "7decafd46093e4e47c14e7307d498986"
> -SRC_URI[sha256sum] = "409146789b4a6b81f6a275fcad932a
> 030743d444f6de5bd4a34aaf17aa72e8ac"
> +S = "${WORKDIR}/git"
> +SRCREV = "d68a4daf85c73ab7d7070de0c98d0c170af4758e"
> --
> 2.16.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

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

Re: [PATCH 14/14] babeltrace: switch over to git

[Alexander Kanavin]

On 05/04/2018 10:51 PM, Martin Jansa wrote:
> Can you please upload the tarball (I assume you still have it from the 
> time you were testing the upgrade to 1.5.5) to:
> http://downloads.yoctoproject.org/mirror/sources/babeltrace-1.5.5.tar.bz2
> or
> http://sources.openembedded.org/babeltrace-1.5.5.tar.bz2
> so that it's covered with default mirrors.bbclass as well?

I don't have upload rights to that.

Alex

Re: [PATCH 14/14] babeltrace: switch over to git

[Burton, Ross]

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

CCing Halstead who does.  Hopefully the autobuilder.yocto.io cache has
a babeltrace-1.5.5.tar.bz2 tarball we can add to the mirror?

Ross

On 7 May 2018 at 11:17, Alexander Kanavin <alexander.kanavin@linux.intel.com
> wrote:

> On 05/04/2018 10:51 PM, Martin Jansa wrote:
>
>> Can you please upload the tarball (I assume you still have it from the
>> time you were testing the upgrade to 1.5.5) to:
>> http://downloads.yoctoproject.org/mirror/sources/babeltrace-1.5.5.tar.bz2
>> or
>> http://sources.openembedded.org/babeltrace-1.5.5.tar.bz2
>> so that it's covered with default mirrors.bbclass as well?
>>
>
> I don't have upload rights to that.
>
> Alex
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

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

Re: [PATCH 14/14] babeltrace: switch over to git

[Michael Halstead]

[-- Attachment #1.1.1: Type: text/plain, Size: 1587 bytes --]

That file is now available from the yoctoproject.org link you provided.
It probably appeared a few days later. Is there any issue now?


On 05/08/2018 02:25 AM, Burton, Ross wrote:
> CCing Halstead who does.  Hopefully the autobuilder.yocto.io
> <http://autobuilder.yocto.io> cache has
> a babeltrace-1.5.5.tar.bz2 tarball we can add to the mirror?
>
> Ross
>
> On 7 May 2018 at 11:17, Alexander Kanavin
> <alexander.kanavin@linux.intel.com
> <mailto:alexander.kanavin@linux.intel.com>> wrote:
>
>     On 05/04/2018 10:51 PM, Martin Jansa wrote:
>
>         Can you please upload the tarball (I assume you still have it
>         from the time you were testing the upgrade to 1.5.5) to:
>         http://downloads.yoctoproject.org/mirror/sources/babeltrace-1.5.5.tar.bz2
>         <http://downloads.yoctoproject.org/mirror/sources/babeltrace-1.5.5.tar.bz2>
>         or
>         http://sources.openembedded.org/babeltrace-1.5.5.tar.bz2
>         <http://sources.openembedded.org/babeltrace-1.5.5.tar.bz2>
>         so that it's covered with default mirrors.bbclass as well?
>
>
>     I don't have upload rights to that.
>
>     Alex
>
>     -- 
>     _______________________________________________
>     Openembedded-core mailing list
>     Openembedded-core@lists.openembedded.org
>     <mailto:Openembedded-core@lists.openembedded.org>
>     http://lists.openembedded.org/mailman/listinfo/openembedded-core
>     <http://lists.openembedded.org/mailman/listinfo/openembedded-core>
>
>

-- 
Michael Halstead
Linux Foundation / SysAdmin


[-- Attachment #1.1.2: Type: text/html, Size: 3520 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 849 bytes --]