poky: subtree update:b5763b2f48..f468a73523

Adrian Bunk (13):
      iproute2: Remove -fcommon
      libxcrypt2: Remove -fcommon
      xorg-xserver: Remove -fcommon
      mesa: Remove -fcommon
      at-spi2-atk: Remove -fcommon
      menu-cache: Replace -fcommon with fix
      matchbox-wm: Replace -fcommon with fix
      llvm: Remove -fcommon
      vte: Remove workaround for gcc 4.8
      python-numpy: Remove workaround for host gcc < 5
      libtasn1: Remove workaround for host gcc < 5
      nettle: Remove workaround for gcc < 5
      wireless-regdb: Upgrade 2019.06.03 -> 2020.04.29

Alejandro Hernandez (1):
      connman: Include vpn-script in FILES

Alexander Kanavin (30):
      libinput: add ptest
      libinput: update 1.15.2 -> 1.15.5
      avahi: merge avahi-ui into the main recipe
      avahi: update to 0.8
      testsdkext/devtool: initialize the test component's git repo
      git: update to 2.26.2
      libcap: update to 2.33
      libhandy: add a recipe from meta-oe
      libdazzle: update to 3.36.0
      epiphany: update to 3.36.1
      patchelf: switch to git
      powertop: switch to Arjan's git
      meson: fix upstream version check
      rpcsvc-proto: update to 1.4.1
      vulkan-headers: upgrade 1.1.126.0 -> 1.2.135.0
      vulkan-loader: upgrade 1.1.126.0 -> 1.2.135.0
      vulkan-tools: upgrade 1.1.126.0 -> 1.2.135.0
      vulkan-demos: upgrade to latest revision
      e2fsprogs: update to 1.45.6
      build-compare: update to latest revision
      ovmf: update to 202002
      cdrtools-native: fix upstream version check
      re2c: correct upstream location
      vte: add icu dependency
      mesa: enable x11 for native/nativesdk
      runqemu: set host DRI driver path for all instances of virgl usage
      libepoxy: do not strip RUNPATH from native/nativesdk
      virgl: skip test on Debian 9
      runqemu: force software x11 renderer for SDL when GL is not in use
      gcr: correct a build race between vapi files

Andrej Valek (1):
      icu: upgrade 66.1 -> 67.1

Anton Eliasson (1):
      meson.bbclass: Close the log file after reading

Bartosz Golaszewski (1):
      busybox: disable i2ctransfer

Changqing Li (2):
      rpm: fix file conflicts for MIPS64 N32
      lib/oe/package_manager: update default rpm config %_prefer_color

Jacob Kroon (1):
      pseudo: Fix enum typedef

Joe Slater (1):
      wget: improve reproducible build

Joshua Watt (3):
      libnewt: Backport patch to fix reproducibility
      bitbake.conf: Prevent git from detecting parent repo in recipe
      classes/kernel: Generate reproducible kernel module tarball

Kai Kang (1):
      python3-git: 3.0.5 -> 3.1.2

Khem Raj (9):
      avahi: Cover gtk packageconfig with x11/wayland distro features
      tunes: Add new tune files for cortexa55 and cortexa73-cortexa53
      gcc-runtime: Avoid march conflicts with newer cortex-a55 CPUs
      gcc10: Update to GCC 10.1 Release
      glibc: Update to latest on 2.31 branch
      gcc10: Default back to -fcommon
      gcc10: Revert using __getauxval in libgcc
      glib-2.0: Fix stpcpy detection for mingw
      wayland: fix condition for strndup detection

Konrad Weihmann (2):
      pypi.bbclass: mind package suffix on version check
      file: add PACKAGECONFIG for auto options

Mingli Yu (1):
      python3-setuptools: add the missing rdepends

Peter Kjellerstedt (2):
      sstate.bbclass: Do not fail if files cannot be touched
      file: Remove unneccessary override of PACKAGECONFIG for native

Pierre-Jean Texier (1):
      sysklogd: upgrade 2.1.1 -> 2.1.2

Richard Leitner (6):
      gdbm: add patch to fix link failure against gcc 10
      dtc: update to 1.6.0
      libtirpc: remove extra "-fcommon" from CFLAGS
      libcomps: update to 0.1.15
      binutils: add patch to fix issues with gcc 10
      cpio: add patch to fix issues with gcc 10

Richard Purdie (4):
      recipes: Remove remaining INC_PR variables
      insane: Promote warnings into errors
      poky: We now match OE-Core's error/warning config so simplify
      poky.conf: Post release version bump

Robert P. J. Day (1):
      documentation.conf: Add variables supported by features_check.bbclass

Tim Orling (1):
      pypi.bbclass: use new pypi UPSTREAM_CHECK_URI

Wang Mingyu (1):
      nettle: upgrade 3.5.1 -> 3.6

Yeoh Ee Peng (1):
      selftest/imagefeatures: Enable sanity test for IMAGE_GEN_DEBUGFS

Yi Zhao (1):
      opkg-keyrings: check if opkg-key exists before run postinst

Zoltan Boszormenyi (4):
      libva: Factor out base parts into an include file
      libva-initial: New bootstrap recipe
      mesa: Add PACKAGECONFIG knob to enable VAAPI
      mesa: Add PACKAGECONFIG knob to enable VDPAU state tracker and drivers

jan (1):
      scripts/tiny/ksize: Fix for more recent kernels

wenlin.kang@windriver.com (1):
      populate_sdk_base.bbclass: fix warning: name not matched

Change-Id: Icd73153270a6cb7ab63257211350aa564867c2db
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

1 files changed, 25 insertions, 15 deletions

diff --git a/poky/scripts/runqemu b/poky/scripts/runqemu
index 310d79fdc..21680b49d 100755
--- a/poky/scripts/runqemu
+++ b/poky/scripts/runqemu
@@ -420,6 +420,23 @@ class BaseConfig(object):
             logger.error("%s not a directory valid DEPLOY_DIR_IMAGE" % deploy_dir_image)
             self.set("MACHINE", arg)
 
+    def set_dri_path(self):
+        # As runqemu can be run within bitbake (when using testimage, for example),
+        # we need to ensure that we run host pkg-config, and that it does not
+        # get mis-directed to native build paths set by bitbake.
+        try:
+            del os.environ['PKG_CONFIG_PATH']
+            del os.environ['PKG_CONFIG_DIR']
+            del os.environ['PKG_CONFIG_LIBDIR']
+            del os.environ['PKG_CONFIG_SYSROOT_DIR']
+        except KeyError:
+            pass
+        try:
+            dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True)
+        except subprocess.CalledProcessError as e:
+            raise RunQemuError("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.")
+        os.environ['LIBGL_DRIVERS_PATH'] = dripath.decode('utf-8').strip()
+
     def check_args(self):
         for debug in ("-d", "--debug"):
             if debug in sys.argv:
@@ -431,6 +448,9 @@ class BaseConfig(object):
                 logger.setLevel(logging.ERROR)
                 sys.argv.remove(quiet)
 
+        if 'gl' not in sys.argv[1:] and 'gl-es' not in sys.argv[1:]:
+            os.environ['SDL_RENDER_DRIVER'] = 'software'
+
         unknown_arg = ""
         for arg in sys.argv[1:]:
             if arg in self.fstypes + self.vmtypes + self.wictypes:
@@ -440,15 +460,19 @@ class BaseConfig(object):
                 self.kernel_cmdline_script += ' console=ttyS0'
             elif arg == 'sdl':
                 if 'gl' in sys.argv[1:]:
+                    self.set_dri_path()
                     self.qemu_opt_script += ' -vga virtio -display sdl,gl=on'
                 elif 'gl-es' in sys.argv[1:]:
+                    self.set_dri_path()
                     self.qemu_opt_script += ' -vga virtio -display sdl,gl=es'
                 else:
                     self.qemu_opt_script += ' -display sdl'
             elif arg == 'gtk':
                 if 'gl' in sys.argv[1:]:
+                    self.set_dri_path()
                     self.qemu_opt_script += ' -vga virtio -display gtk,gl=on'
                 elif 'gl-es' in sys.argv[1:]:
+                    self.set_dri_path()
                     self.qemu_opt_script += ' -vga virtio -display gtk,gl=es'
                 else:
                     self.qemu_opt_script += ' -display gtk'
@@ -456,22 +480,8 @@ class BaseConfig(object):
                 # These args are handled inside sdl or gtk blocks above
                 pass
             elif arg == 'egl-headless':
+                self.set_dri_path()
                 self.qemu_opt_script += ' -vga virtio -display egl-headless'
-                # As runqemu can be run within bitbake (when using testimage, for example),
-                # we need to ensure that we run host pkg-config, and that it does not
-                # get mis-directed to native build paths set by bitbake.
-                try:
-                    del os.environ['PKG_CONFIG_PATH']
-                    del os.environ['PKG_CONFIG_DIR']
-                    del os.environ['PKG_CONFIG_LIBDIR']
-                    del os.environ['PKG_CONFIG_SYSROOT_DIR']
-                except KeyError:
-                    pass
-                try:
-                    dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True)
-                except subprocess.CalledProcessError as e:
-                    raise RunQemuError("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.")
-                os.environ['LIBGL_DRIVERS_PATH'] = dripath.decode('utf-8').strip()
             elif arg == 'serial':
                 self.kernel_cmdline_script += ' console=ttyS0'
                 self.serialconsole = True