Skip to contentSkip to conversation

meson: update to 0.50.1

PATCH In review Alexander Kanavin 2 participants 8 messages May 8, 2019 – May 13, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 meson: update to 0.50.1

None of the backported patches actually made it into this release.

---
 meta/recipes-devtools/meson/meson.inc                |  4 ++--
 .../meson/0001-Make-CPU-family-warnings-fatal.patch  |  2 +-
 ...d-environment.py-do-not-determine-whether-a.patch | 12 +++++-------
 ...0002-Support-building-allarch-recipes-again.patch |  2 +-
 .../meson/{meson_0.50.0.bb => meson_0.50.1.bb}       |  0
 ...sdk-meson_0.50.0.bb => nativesdk-meson_0.50.1.bb} |  0
 6 files changed, 9 insertions(+), 11 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.50.0.bb => meson_0.50.1.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.50.0.bb => nativesdk-meson_0.50.1.bb} (100%)
meta/recipes-devtools/meson/meson.inc +2 -2
index 21d34da6adf..6a723683cc0 100644
@@ -18,8 +18,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
            "
-SRC_URI[sha256sum] = "2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f"
-SRC_URI[md5sum] = "433483107fda4616eaf33de7e7083a84"
+SRC_URI[sha256sum] = "f68f56d60c80a77df8fc08fa1016bc5831605d4717b622c96212573271e14ecc"
+SRC_URI[md5sum] = "24a6527796115828d2ebc75880e18d62"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +1 -1
index 9e90b72f313..adde1e271f1 100644
@@ -1,4 +1,4 @@
-From 1ec44c955f45f3787aaf92edd70dec5bcf03f665 Mon Sep 17 00:00:00 2001
+From 4b4b3d4932d928f05dbd74d730a3c8a5ac371e1d Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
 Subject: [PATCH] Make CPU family warnings fatal
meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch +5 -7
index e64e13b8360..83347145417 100644
@@ -1,4 +1,4 @@
-From c040f0dbace3259c80f3710bc019433b9c817940 Mon Sep 17 00:00:00 2001
+From d9da5e7a16a9397e22a8900fac4b60b40d7f00de Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 25 Mar 2019 18:18:33 +0100
 Subject: [PATCH] mesonbuild/environment.py: do not determine whether a build
@@ -8,23 +8,21 @@ This can, and does, go wrong when our host architecture is same as the target on
 
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
  mesonbuild/environment.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 4c1c5ac..6e5d689 100644
+index d4f0630..c584fa4 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -478,7 +478,7 @@ class Environment:
+@@ -483,7 +483,7 @@ class Environment:
          self.first_invocation = True
  
      def is_cross_build(self):
--        return not self.machines.matches_build_machine(MachineChoice.HOST)
+-        return self.coredata.cross_file is not None
 +        return self.need_exe_wrapper()
  
      def dump_coredata(self):
          return coredata.save(self.coredata, self.get_build_dir())
--- 
-2.17.1
-
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
index 323e21d8f6e..e47e555324f 100644
@@ -1,4 +1,4 @@
-From a4bce582c1f13f48b329526aa81710405c4c691e Mon Sep 17 00:00:00 2001
+From 2164655328ec4e47335fc9033813274365491ad8 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
meta/recipes-devtools/meson/meson_0.50.1.bb renamed from meta/recipes-devtools/meson/meson_0.50.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.50.0.bb
rename to meta/recipes-devtools/meson/meson_0.50.1.bb
meta/recipes-devtools/meson/nativesdk-meson_0.50.1.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.50.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.50.0.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.50.1.bb
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/3 perl: update to 5.28.2

---
 .../perl-sanity/{perl_5.28.1.bb => perl_5.28.2.bb}     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-devtools/perl-sanity/{perl_5.28.1.bb => perl_5.28.2.bb} (97%)
meta/recipes-devtools/perl-sanity/perl_5.28.2.bb renamed from meta/recipes-devtools/perl-sanity/perl_5.28.1.bb +5 -5
similarity index 97%
rename from meta/recipes-devtools/perl-sanity/perl_5.28.1.bb
rename to meta/recipes-devtools/perl-sanity/perl_5.28.2.bb
index f3948a5f8d4..12b220a4d80 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
 
 
 SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
-           https://github.com/arsv/perl-cross/releases/download/1.2.2/perl-cross-1.2.2.tar.gz;name=perl-cross \
+           https://github.com/arsv/perl-cross/releases/download/1.2.3/perl-cross-1.2.3.tar.gz;name=perl-cross \
            file://perl-rdepends.txt \
            file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
            file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
@@ -23,10 +23,10 @@ SRC_URI_append_class-native = " \
            file://perl-configpm-switch.patch \
 "
 
-SRC_URI[perl.md5sum] = "838198c43d4f39d7af797e2f59c2bee5"
-SRC_URI[perl.sha256sum] = "3ebf85fe65df2ee165b22596540b7d5d42f84d4b72d84834f74e2e0b8956c347"
-SRC_URI[perl-cross.md5sum] = "9a6c05497bdde9a3106e3be9246f4da1"
-SRC_URI[perl-cross.sha256sum] = "e6987838f27d8cd3368ea68fc56a68cc52371505950927b8b7c5cb76e3a94caa"
+SRC_URI[perl.md5sum] = "1323e7581fbedf3791d2843f4ccaec4b"
+SRC_URI[perl.sha256sum] = "aa95456dddb3eb1cc5475fed4e08f91876bea71fb636fba6399054dfbabed6c7"
+SRC_URI[perl-cross.md5sum] = "03d9eafd71161eb5d1f80434e8b49dbc"
+SRC_URI[perl-cross.sha256sum] = "84583a1bb5f3a2c64d13d031386c114382e5c62955c6f84a27cec8318536627c"
 
 PR = "r1"
 
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/3 webkitgtk: update to 2.24.1

In reply to Alexander Kanavin

Add a patch to address a missing format string error.

Disable the recipe on 32 bit x86, as SSE2 is now required unconditionally.

---
 ...streamer-add-a-missing-format-string.patch | 24 +++++++++++++++++++
 ...ebkitgtk_2.24.0.bb => webkitgtk_2.24.1.bb} |  9 +++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
 rename meta/recipes-sato/webkit/{webkitgtk_2.24.0.bb => webkitgtk_2.24.1.bb} (95%)
meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch new file +24 -0
new file mode 100644
index 00000000000..bd4ac1e3538
@@ -0,0 +1,24 @@
+From 2d9687840b97186b80053dd262209e39455ac876 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 8 May 2019 15:31:23 +0200
+Subject: [PATCH] gstreamer: add a missing format string
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ .../platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+index e1e497ee..483fd65c 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+@@ -738,7 +738,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(element);
+ 
+ #if GST_CHECK_VERSION(1, 14, 0)
+-    GST_DEBUG_OBJECT(src, gst_state_change_get_name(transition));
++    GST_DEBUG_OBJECT(src, "%s", gst_state_change_get_name(transition));
+ #endif
+     switch (transition) {
+     case GST_STATE_CHANGE_READY_TO_NULL:
meta/recipes-sato/webkit/webkitgtk_2.24.1.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.24.0.bb +7 -2
similarity index 95%
rename from meta/recipes-sato/webkit/webkitgtk_2.24.0.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.24.1.bb
index 808c92a378e..771a893a6be 100644
@@ -23,10 +23,11 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://include_array.patch \
            file://narrowing.patch \
            file://snprintf.patch \
+           file://0001-gstreamer-add-a-missing-format-string.patch \
            "
 
-SRC_URI[md5sum] = "576d69c598b3e36c73441052d02466de"
-SRC_URI[sha256sum] = "2e4ad1503fe482ceb5a83cf70ac9cd42f37eb718555a4d6844fe4c59a9214407"
+SRC_URI[md5sum] = "ed70e2bf2476a58b17df3d051f42ce6a"
+SRC_URI[sha256sum] = "53cb8eaad2ca4caaae663d68331b83fd27d5bd5f6c5388d6ea3c455e338f396d"
 
 inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
 
@@ -137,3 +138,7 @@ GI_DATA_ENABLED_armv7ve = "False"
 
 # Can't be built with ccache
 CCACHE_DISABLE = "1"
+
+# Requires SSE2 on x86 platforms as of 2.24.1
+COMPATIBLE_HOST_i586 = 'null'
+COMPATIBLE_HOST_i686 = 'null'
Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH 3/3] webkitgtk: update to 2.24.1

Quoted 4 lines · Alexander Kanavin

Add a patch to address a missing format string error.

Disable the recipe on 32 bit x86, as SSE2 is now required unconditionally.

Unfortunately this isn't quite that simple since just disabling it triggers:

https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/445

(errors in world builds)

It might be time to optimise qemux86 slightly more which would help avoid this?

Cheers,

Richard

#4 lore raw

Re: [PATCH 3/3] webkitgtk: update to 2.24.1

Quoted 10 lines · Richard Purdie
Quoted 4 lines · Alexander Kanavin

Add a patch to address a missing format string error.

Disable the recipe on 32 bit x86, as SSE2 is now required unconditionally.

Unfortunately this isn't quite that simple since just disabling it triggers:

Quoted 6 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/445

(errors in world builds)

It might be time to optimise qemux86 slightly more which would help avoid this?

Yes, we should certainly move qemux86 to something less vintage than the original Pentium CPU. I'll make a patch.

Another issue is 'packagegroup-self-hosted' including epiphany, and build-appliance-image pulling that packagegroup in. Tracing back the history, it seems that epiphany is there because long time ago Hob UI made use of a 'web browser' for some tasks. With Hob long gone, and its replacement Toaster accessible across the network (or from outside the VM), I think there is not any more a use case for including a web browser into the image?

Alex

#5 lore raw

Re: [PATCH 3/3] webkitgtk: update to 2.24.1

Quoted 13 lines · Alexander Kanavin
Quoted 11 lines · Richard Purdie
Quoted 4 lines · Alexander Kanavin

Add a patch to address a missing format string error.

Disable the recipe on 32 bit x86, as SSE2 is now required unconditionally.

Unfortunately this isn't quite that simple since just disabling it triggers:

https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/445

Quoted 7 lines
Quoted 4 lines

(errors in world builds)

It might be time to optimise qemux86 slightly more which would help avoid this?

Yes, we should certainly move qemux86 to something less vintage than the original Pentium CPU. I'll make a patch.

Sounds good thanks.

Quoted 7 lines

Another issue is 'packagegroup-self-hosted' including epiphany, and build-appliance-image pulling that packagegroup in. Tracing back the history, it seems that epiphany is there because long time ago Hob UI made use of a 'web browser' for some tasks. With Hob long gone, and its replacement Toaster accessible across the network (or from outside the VM), I think there is not any more a use case for including a web browser into the image?

I agree it shouldn't be in self hosted which should be more minimal. I think we do need a webbrowser image which we test *somewhere* and this ties into the discussion we had in the bug triage meeting regarding bug 12991.

Basically "build-appliance" was designed to test whether toaster/hob could rebuild the build-appliance image (and hence be self hosting). I'd like to see this split up so that the self hosting is commandline and we have a web browser test somewhere else.

An added complication is that the test also tests VMWare :/. Tesing multiple things with one operation has its drawbacks...

Cheers,

Richard

#6 lore raw

Re: [PATCH 3/3] webkitgtk: update to 2.24.1

Quoted 4 lines · On Mon, 13 May 2019 at 15:46, <[email protected]> wrote:

I agree it shouldn't be in self hosted which should be more minimal. I think we do need a webbrowser image which we test *somewhere* and this ties into the discussion we had in the bug triage meeting regarding bug 12991.

The problem with the web browser is that webkitgtk is one of the heaviest things in oe-core to build (in time, RAM and disk space). Otherwise I would just stick it into core-image-sato, and write something reasonable for testimage to try doing at runtime. Tips?

Alex

#7 lore raw

Re: [PATCH 3/3] webkitgtk: update to 2.24.1

Quoted 10 lines · Alexander Kanavin
Quoted 7 lines · On Mon, 13 May 2019 at 15:46, <[email protected]> wrote:

I agree it shouldn't be in self hosted which should be more minimal. I
think we do need a webbrowser image which we test *somewhere* and this
ties into the discussion we had in the bug triage meeting regarding bug
12991.

Quoted 4 lines

The problem with the web browser is that webkitgtk is one of the heaviest things in oe-core to build (in time, RAM and disk space). Otherwise I would just stick it into core-image-sato, and write something reasonable for testimage to try doing at runtime. Tips?

We create a core-image-sato-webkiosk image and only test it on x86/arm?

Cheers,

Richard