poky: subtree update:03d4d9d68f..52a625582e

Alejandro Enedino Hernandez Samaniego (2):
      documentation: Update multiconfig syntax and explanation on BBMULTICONFIG
      bitbake: bitbake-user-manual: Update multiconfig syntax and explanation of BBMULTICONFIG

Alexander Kanavin (27):
      ethtool, libcap: fix upstream version check
      socat: turn hard readline dependency into an option
      perl: make gdbm optional
      python3: make gdbm optional
      python3: un-break disabling the readline PACKAGECONFIG
      libcheck: split /usr/bin/checkmk into its own package
      iproute2: make elfutils support optional
      bind: do not RDEPEND on bash
      elfutils: do not depend on target libtool
      license.bbclass: split incompatible license check into a helper function
      license_image.bbclass: check and reject packages which have incompatible licenses
      runqemu: unset another environment variable for 'egl-headless'
      gobject-introspection: update to 1.62.0
      glib-2.0: upgrade to 2.62.1
      glib-networking: update to 2.62.1
      epiphany: upgrade 3.32.4 -> 3.34.1
      webkitgtk: update 2.24.4 -> 2.26.1
      gtk-doc: upgrade 1.31 -> 1.32
      libdazzle: upgrade 3.32.3 -> 3.34.1
      libsecret: upgrade 0.19.0 -> 0.19.1
      mpg123: upgrade 1.25.11 -> 1.25.12
      p11-kit: upgrade 0.23.16.1 -> 0.23.18.1
      vala: upgrade 0.44.7 -> 0.46.3
      meson: update to 0.52.0
      libmodulemd-v1: introduce the recipe
      libmodulemd: remove the recipe
      createrepo-c: upgrade to 0.15.1

Alistair Francis (1):
      gdb: Bump from 8.3 to 8.3.1

Bruce Ashfield (2):
      linux-yocto-rt/5.2: update to -rt9
      linux-yocto/5.2: fix strace/ptrace long runtime issues

Changqing Li (1):
      llvm: remove -mlongcall from CXXFLAGS for powerpc

Chen Qi (2):
      python: CVE-2019-16056
      python3: CVE-2019-16056

Christophe PRIOUZEAU (23):
      ovmf: Clarify BSD license variant
      wpa-supplicant: Clarify BSD license variant
      cmake: Clarify BSD license variant
      flex: Clarify BSD license variant
      file: Clarify BSD license variant
      python-async: Clarify BSD license variant
      python-smmap: Clarify BSD license variant
      libtirpc: Clarify BSD license variant
      libarchive: Clarify BSD license variant
      pbzip2: Clarify BSD license variant
      lighttpd: Clarify BSD license variant
      rpcbind: Clarify BSD license variant
      tcp-wrappers: Clarify BSD license variant
      libxpm: Clarify BSD license variant
      libogg: Clarify BSD license variant
      libvorbis: Clarify BSD license variant
      libtheora: Clarify BSD license variant
      speex: Clarify BSD license variant
      speexdsp: Clarify BSD license variant
      libwebp: Clarify BSD license variant
      libpcre: Clarify BSD license variant
      p11-kit: Clarify BSD license variant
      libpcap: Clarify BSD license variant

David Reyna (1):
      bitbake: toaster: Enable Zeus branch in place of Thud

Jaewon Lee (1):
      devtool/standard.py: Not filtering devtool workspace for devtool finish

Joerg Vehlow (1):
      runqemu: Remove disabling of high resolution timer

Kai Kang (1):
      dnf.py: check busybox for case test_dnf_installroot

Khem Raj (7):
      musl: Update to latest
      qemu: Add ppc64 to QEMU_TARGETS
      ghostscript: Disable libpaper
      perl: Handle PACKAGES_DYNAMIC for perl-native
      gnu-efi: Do not use gcc-only options when building with clang
      llvm: Update to 9.0.0
      glib-2.0: Fix build with clang compiler

Martin Jansa (1):
      kernel-devicetree.bbclass: add missing backslash

Maxime Roussin-Bélanger (4):
      meta: add missing some description in devtools
      meta: simplify over descriptive descriptions in devtools
      shadow: update homepage and bugtracker
      meta: add missing description in recipes-extended

Michael Cooper (1):
      wic/direct: Partition numbering is broken for MBR primary partition #4

Michael Halstead (1):
      uninative: Update to 2.7 release

Peiran Hong (1):
      dbus: Change path of system_bus_socket from /var/run/dbus/ to /run/dbus/

Philip Balister (1):
      oe.svg: Copy artwork from openembedded-classic.

Richard Purdie (8):
      layer.conf: Update for zeus series
      layer.conf: Update for zeus series
      bitbake: bitbake: Update to version 1.44.0
      poky.conf: Bump version for 3.0 zeus release
      build-appliance-image: Update to master head revision
      scripts/gen-lockedsig-cache: Don't list paths which don't exist
      readline-native: Fix builds on tumbleweed
      build-appliance-image: Update to master head revision

Ross Burton (15):
      meson: fix RDEPENDS
      meson: update patch status
      meson: fix cross detection
      systemd: don't install udev.pc manually
      systemd: don't install systemd-hwdb-update.service
      insane: add check for perllocal.pod
      ref-system-requirements: update support distribution list
      toolchain-scripts: export READELF
      harfbuzz: add PACKAGECONFIGs for all the optional dependencies
      oeqa/sdk: improve Meson test
      pango: remove obsolete libtool FILES
      bluez5: add needed character encoding for ptests
      oeqa/selftest/imagefeatures: improve test_hypervisor_fmts
      poky: add Ubuntu 19.04 as a supported distribution
      kernel-dev: don't use _append +=

Trevor Gamblin (3):
      watchdog: fix PIDFile path in existing patch
      lib/oe/terminal.py: fix gnome-terminal start behavior
      systemd.bbclass: add RMINITDIR for nativesdk builds

Zang Ruochen (8):
      libpcap:upgrade 1.9.0 -> 1.9.1
      sqlite3:upgrade 3.29 -> 3.30
      expat:upgrade 2.2.8 -> 2.2.9
      librepo:upgrade 1.10.5 -> 1.10.6
      msmtp:upgrade 1.8.5 -> 1.8.6
      libxfont2:upgrade 2.0.3 -> 2.0.4
      fribidi:upgrade 1.0.5 -> 1.0.7
      iso-codes:upgrade 4.3 -> 4.4

Change-Id: I15802c5814d0dbfd90f16d392dbd975f917a8032
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

5 files changed, 46 insertions, 4 deletions

diff --git a/poky/meta/lib/oe/terminal.py b/poky/meta/lib/oe/terminal.py
index 9bda3efdc..a1daa2bed 100644
--- a/poky/meta/lib/oe/terminal.py
+++ b/poky/meta/lib/oe/terminal.py
@@ -55,7 +55,7 @@ class XTerminal(Terminal):
             raise UnsupportedTerminal(self.name)
 
 class Gnome(XTerminal):
-    command = 'gnome-terminal -t "{title}" -x {command}'
+    command = 'gnome-terminal -t "{title}" -- {command}'
     priority = 2
 
     def __init__(self, sh_cmd, title=None, env=None, d=None):
diff --git a/poky/meta/lib/oeqa/runtime/cases/dnf.py b/poky/meta/lib/oeqa/runtime/cases/dnf.py
index 80cc86a4f..de3759995 100644
--- a/poky/meta/lib/oeqa/runtime/cases/dnf.py
+++ b/poky/meta/lib/oeqa/runtime/cases/dnf.py
@@ -117,6 +117,7 @@ class DnfRepoTest(DnfTest):
 
     @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache'])
     @skipIfInDataVar('DISTRO_FEATURES', 'usrmerge', 'Test run when not enable usrmerge')
+    @OEHasPackage('busybox')
     def test_dnf_installroot(self):
         rootpath = '/home/root/chroot/test'
         #Copy necessary files to avoid errors with not yet installed tools on
@@ -143,6 +144,7 @@ class DnfRepoTest(DnfTest):
 
     @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache'])
     @skipIfNotInDataVar('DISTRO_FEATURES', 'usrmerge', 'Test run when enable usrmege')
+    @OEHasPackage('busybox')
     def test_dnf_installroot_usrmerge(self):
         rootpath = '/home/root/chroot/test'
         #Copy necessary files to avoid errors with not yet installed tools on
diff --git a/poky/meta/lib/oeqa/sdk/cases/buildepoxy.py b/poky/meta/lib/oeqa/sdk/cases/buildepoxy.py
index f3d207c6d..4211955f8 100644
--- a/poky/meta/lib/oeqa/sdk/cases/buildepoxy.py
+++ b/poky/meta/lib/oeqa/sdk/cases/buildepoxy.py
@@ -32,7 +32,9 @@ class EpoxyTest(OESDKTestCase):
             self.assertTrue(os.path.isdir(dirs["source"]))
             os.makedirs(dirs["build"])
 
-            self._run("meson -Degl=no -Dglx=no -Dx11=false {build} {source}".format(**dirs))
+            log = self._run("meson -Degl=no -Dglx=no -Dx11=false {build} {source}".format(**dirs))
+            # Check that Meson thinks we're doing a cross build and not a native
+            self.assertIn("Build type: cross build", log)
             self._run("ninja -C {build} -v".format(**dirs))
             self._run("DESTDIR={install} ninja -C {build} -v install".format(**dirs))
 
diff --git a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 8213d63e3..cf2a42aab 100644
--- a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -161,8 +161,12 @@ class ImageFeatures(OESelftestTestCase):
             sysroot = get_bb_var('STAGING_DIR_NATIVE', 'core-image-minimal')
             result = runCmd('qemu-img info --output json %s' % image_path,
                             native_sysroot=sysroot)
-            self.assertTrue(json.loads(result.output).get('format') == itype,
-                            msg="Could not parse '%s'" % result.output)
+            try:
+                data = json.loads(result.output)
+                self.assertEqual(data.get('format'), itype,
+                                 msg="Unexpected format in '%s'" % (result.output))
+            except json.decoder.JSONDecodeError:
+                self.fail("Could not parse '%ss'" % result.output)
 
     def test_long_chain_conversion(self):
         """
diff --git a/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py
index 8fb93af8a..424a9e69c 100644
--- a/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py
+++ b/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py
@@ -39,3 +39,37 @@ class IncompatibleLicenseTests(OESelftestTestCase):
     # INCOMPATIBLE_LICENSE contains this license
     def test_incompatible_nonspdx_license(self):
         self.lic_test('incompatible-nonspdx-license', 'FooLicense', 'FooLicense')
+
+class IncompatibleLicensePerImageTests(OESelftestTestCase):
+    def default_config(self):
+        return """
+IMAGE_INSTALL_append = "bash"
+INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
+"""
+
+    def test_bash_default(self):
+        self.write_config(self.default_config())
+        error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash has an incompatible license GPLv3+ and cannot be installed into the image."
+
+        result = bitbake('core-image-minimal', ignore_status=True)
+        if error_msg not in result.output:
+            raise AssertionError(result.output)
+
+    def test_bash_and_license(self):
+        self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " & SomeLicense"')
+        error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash has an incompatible license GPLv3+ & SomeLicense and cannot be installed into the image."
+
+        result = bitbake('core-image-minimal', ignore_status=True)
+        if error_msg not in result.output:
+            raise AssertionError(result.output)
+
+    def test_bash_or_license(self):
+        self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " | SomeLicense"')
+
+        bitbake('core-image-minimal')
+
+    def test_bash_whitelist(self):
+        self.write_config(self.default_config() + '\nWHITELIST_GPL-3.0_pn-core-image-minimal = "bash"')
+
+        bitbake('core-image-minimal')
+