meta-openembedded: subtree update:459dbf1078..ea8604a0e3

Adrian Bunk (6):
      xfsprogs: Remove obsolete patch
      gpsd: Add a PACKAGECONFIG for disabling usb support
      libqmi: Upgrade 1.24.0 -> 1.24.2
      enchant2: Upgrade 2.2.3 -> 2.2.7
      geany-plugins: Use enchant2 instead of the old enchant
      enchant2: Remove, moved to oe-core

Alex Kiernan (11):
      nftables: Fix documentation generation
      ldns: Add recipe
      ostree: Fix DISTRO_FEATURES with ptest but w/o xattr
      ostree: Drop tests for soup/xattr with ptest
      ostree: Change PACKAGECONFIG to use manpages
      ostree: Add PACKAGECONFIG for builtin-grub2-mkconfig
      ostree: Backport build/test fixes from upstream
      ostree: Upgrade 2019.5 -> 2019.6
      ostree: Add support for gjs tests
      nftables: Expand PACKAGECONFIG, cleanup build
      ostree: Tidy FILES_${PN} using PACKAGE_BEFORE_PN

Alexander Kanavin (1):
      enscript/indent/sharutils: fix build with gettext 0.20.x

Alistair Francis (2):
      mycroft: RDEPENDS on mpg123 to allow singing
      openocd: Enable remote-bitbang build option

Andreas Müller (76):
      gnome-system-monitor: add gsettings to inherit
      tracker-miners: initial add 2.3.1
      nautilus: add tracker-miners to RDPENDS
      libgnomekbd: cleanup DEPENDS inherit gsettings / remove unused config
      nodejs: Add PACKAGECONFIG share to allow other projects to use node as library
      xserver-xorg-cvt-native: initial add 1.20.5
      mutter: initial add 3.34.1
      pinpoint: remove dead project
      gnome-keyring: upgrade 3.28.2 -> 3.34.0
      libgsf: upgrade 1.14.45 -> 1.14.46
      libgnome-keyring: remove
      gvfs: upgrade 1.41.2 -> 1.42.1
      grilo: initial add 0.3.10
      gsound: initial add 1.0.2
      gnome-backgrounds: initial add 3.34.0
      metacity: upgrade 3.32.0 -> 3.34.1
      gjs: initial add 1.58.3
      gdm: re-add 3.34.1
      gnome-shell: initial add 3.34.1
      gnome-shell-extensions: initial add 3.34.1
      accountsservice: initial add 0.6.55
      rest: initial add 0.8.1
      gnome-online-accounts: initial add 3.34.1
      gnome-control-center: re-add 3.34.1
      gnome-session: inital add 3.34.1
      gnome-panel: (re)add 3.34.1
      gnome-flashback: initial add 3.34.1
      Add: packagegroup-gnome-apps / packagegroup-gnome-desktop
      glfw: add features_check to inherit
      stalonetray: Add x11 to required distro feature
      projucer: add x11 to required distro features
      colord-gtk: add polkit to required distro features
      yelp: add x11 to required distro features
      file-roller: remove nautilus from DEPENDS
      libgdata: add x11 to required distro features
      accountsservice: Hack musl build fix
      accountsservice: fix build for systemd not in DISTRO_FEATURES
      gnome-font-viewer: fix copy & paste typo in SUMMARY
      libxfce4ui: give up glade3 (=glade for gtk2) support
      glade3: remove ancient version of glade
      exo: remove pythonnative from inherit
      geany: remove pythonnative from inherit
      gnome-tweaks: initial add 3.34.0
      libhandy: initial add 0.0.12
      fluidsynth: upgrade 2.0.9 -> 2.1.0
      exo: upgrade 0.12.10 -> 0.12.11
      tumbler: upgrade 0.2.7 -> 0.2.8
      catfish: upgrade 1.4.10 -> 1.4.11
      cppunit: upgrade 1.14.0 -> 1.15.1
      xfce4-terminal: upgrade 0.8.8 -> 0.8.9
      gnome-calculator: initial add 3.34.1
      evince: upgrade 3.34.1 -> 3.34.1
      file-roller: upgrade 3.32.2 -> 3.32.3
      evolution-data-server: upgrade 3.34.1 -> 3.34.2
      gedit: upgrade 3.34.0 -> 3.34.1
      gnome-autoar: upgrade 0.2.3 -> 0.2.4
      gnome-control-center: upgrade 3.34.1 -> 3.34.2
      gnome-desktop3: upgrade 3.34.1 -> 3.34.2
      gnome-flashback: upgrade 3.34.1 -> 3.34.2
      gnome-session: 3.34.1 -> 3.34.2
      gnome-settings-daemon: upgrade 3.34.1 -> 3.34.2
      gnome-shell-extensions: upgrade 3.34.1 -> 3.34.2
      gnome-shell: upgrade 3.34.1 -> 3.34.2
      gvfs: upgrade 1.42.1 -> 1.42.2
      libgdata: upgrade 0.17.10 -> 0.17.11
      mutter: upgrade 3.34.1 -> 3.34.2
      nautilus: upgrade 3.34.1 -> 3.34.2
      yelp-xsl: upgrade 3.34.0 -> 3.34.2
      poppler: upgrade 0.82.0 -> 0.84.0
      xfce4-terminal: upgrade 0.8.9 -> 0.8.9.1
      mutter: upgrade 3.34.2 -> 3.34.3
      gnome-shell: upgrade 3.34.2 -> 3.34.3
      evolution-data-server: upgrade 3.34.2 -> 3.34.3
      gjs: upgrade 1.58.3 -> 1.58.4
      gnome-desktop3: upgrade 3.34.2 -> 3.34.3
      libsigc++-3: let meson build

Andrei Gherzan (1):
      kernel-selftest: Include rtc tests

Andrej Valek (1):
      ntp: split ntpdc into separate package

Andrey Zhizhikin (1):
      flatbuffers: add PIC compiler flag required for aarch64

André Draszik (4):
      python3-jsonrpcserver: update to v4.1.0
      python3-jsonrpcserver: allow to use as non-root
      oniguruma: update to v6.9.4
      oniguruma: enable ptest

Armin Kuster (3):
      glfw: missing feature check.
      libvncserver: fix build depends issue
      surf: Add opengl requirement

Bartosz Golaszewski (10):
      librsync: new package
      xdelta3: update to v3.1.0
      xdelta3: add native and nativesdk to BBCLASSEXTEND
      speedtest-cli: new package
      doxygen: upgrade v1.8.16 -> v1.8.17
      libsigrok: upgrade v0.5.1 -> v0.5.2
      libsigrokdecode: upgrade v0.5.2 -> v0.5.3
      libsigrok: add support for bluetooth integration
      cloc: new package
      libsigrok: add support for hidapi integration

Changqing Li (5):
      samba: fix wrong shebang for python3
      gtk-xfce-engine: remove this recipe
      xfce4-kbdleds-plugin: remove this recipe
      xfce-dusk-gtk3: correct invalid SRC_URI
      libhugetlbfs: update patch to make it work for python3

Denys Dmytriyenko (1):
      netperf: add "intervals" and "histogram" PACKAGECONFIGs

Diego Rondini (2):
      cups-filters: add recipe
      qpdf: add recipe

Fabio Berton (1):
      nanopb: Add recipe for version 0.4.0

Gianfranco Costamagna (6):
      boinc: update recipe to version 7.16.3
      vboxguestdrivers: update to version 6.1.0 and unblacklist
      websocketpp: add various upstream accepted and proposed patches to fix various issues, including:
      brotli: rename static libraries avoding the -static suffix.
      cpprest: fix cmake installation directory
      websocketpp: also install examples in a new -examples subpackage

Hongxu Jia (2):
      gvfs: add user polkitd and missing depends
      python3-astor: fix VERSION file not found

Jacopo Dall'Aglio (1):
      netplan: add recipe

Jens Rehsack (6):
      log4cplus: update to 2.0.5
      libstatgrab: add logging/tracing options
      libtest-warnings-perl: add recipe
      libfile-slurper-perl: add recipe
      libconfig-autoconf-perl: add recipe
      libunix-statgrab: add recipe

Kai Kang (12):
      blueman: disable appindicator support
      xfce4-panel-profiles: 1.0.8 -> 1.0.9
      exo: 0.12.9 -> 0.12.10
      thunar: 1.8.9 -> 1.8.10
      fltk: fix build error when enable package config examples
      corosync: fix build error when package config rdma enabled
      rdma-core: 18.1 -> 27.0
      openl2tp: update systemd service file
      bdwgc: make libatomic-ops as dependency
      volume-key: not create python2 bindings
      libbytesize: disable doc build
      adduser: set default shell with /sbin/nologin

Khem Raj (113):
      python-evdev: Fix build for 32bit arches with 64bit time_t
      x11vnc: Fix build for 32bit arches with 64bit time_t
      evtest: Fix build for 32bit arches with 64bit time_t
      lirc: Fix build for 32bit arches with 64bit time_t
      v4l-utils: Update to 1.18.0
      tslib: Fix build for 32bit arches with 64bit time_t
      utouch-evemu,utouch-frame: Fix build for 32bit arches with 64bit time_t
      directfb: Fix build for 32bit arches with 64bit time_t
      kernel-module-emlog: Use compile task from module bbclass
      emlog: Use RRECOMMEND instead of RDEPEND
      projucer: Upgrade to 5.4.5
      packagegroup-meta-oe: Remove nodejs and uim on riscv
      libnih: Fix build with latest gettext
      liblockdev: Loosen the regexp for py3
      sigrok-cli: Update to 0.7.1
      python-pywbem: Update to 0.15.0
      udisks2: Update to 2.8.4
      id3lib: Update to newer debian patchset
      libdc1394: Update to 2.2.6 release
      libsmi: Use right name for tcl license
      hdf5: Upgrade to 1.8.21
      xterm: Fix latent issue found with musl
      mozjs: extend --with-intl-api=build to all mips
      klibc: Apply -no-integrated-as on mips/clang
      grpc: Define libdir and cmakedir in terms of multilib
      ufs-utils: Renames from ufs-tool
      breakpad: Update to latest upstream
      rsyslog: Sync VALGRIND supported arch list
      packagegroup-meta-oe: Remove ppc64 specific incompatible packages
      libpfm4: Moved here from oe-core
      rdma-core: Replace pthread_yield with sched_yield
      fvwm: Upgrade to 2.6.9
      nlohmann-json: Upgrade to 3.7.3
      libqb: Add --enable-nosection-fallback with mips64/clang
      lcdproc: Upgrade to latest top of tree
      tinyalsa: fix installation libdir path to match multilibs
      luajit: Add ppc/ppc64 to unsupported arch list
      rsyslog: Do not assume atomic built-ins on ppc
      hiredis: Upgrade to 0.14.0
      libfann: Define LIB_SUFFIX suitable for OE multilib needs
      libgit2: Upgrade to 0.28.4
      libinih: Fix multilib build
      poco: Define LIB_SUFFIX per OE multilibs
      libcec: Fix multilib build
      dfu-util-native,sjf2410-linux-native: Fix Deploy in multimachine builds
      mpv: Remove luajit dependency for ppc64
      cannelloni: Update to latest and fix multilib builds
      nvme-cli: Use nonarch libdir for dracut config files
      cli11: Fix multilib build
      lockdev: Make baselib configurable
      avro-c: Update to 1.9.1
      nftables: Package python scripts into nonarch libdir
      mercurial: Add python scripts into separate python package
      fluentbit: Fix packaging in multilib env
      dcadec: Define BASELIB as a knob
      dbus-broker: Use nonarch_libdir for systemd catalog files
      websocketapp: Fix multilib build
      ade: Fix install paths in multilib builds
      thrift: Upgrade to 0.13
      gattlib: Update to latest tip
      rygel: Use nonarch_libdir for systemd units
      firewalld: Package firewalld files
      iwd: Package module conf files via nonarch_libdir
      civetweb: Upgrade to latest tip
      ruli: Define OOP_LIB_DIR and INSTALL_LIB_DIR
      liblightmodbus: Fix packaging errors when using multilib
      ostree: Fix packaging errors when using lib64 libdir
      boinc-client: Use nonarch_libdir for systemd_units
      spirv-tools: Fix multilib builds
      pam-plugin-ldapdb: Include <stdexcept> for std::invalid_argument
      dvb-apps: Replace stime with clock_settime
      redis: Upgrade to 5.0.7
      cannelloni: Include stdexcept for runtime_error
      libubox: Update to latest
      upm: Fix 'may be used uninitialized' errors
      memcached: upgrade to 1.5.20
      ltrace: Fix build with gcc10
      mpd: Fix build with gcc10
      wvstreams: Fix build with gcc10
      tvheadend: Fix format-truncation warnings
      open-vm-tools: Ignore -Warray-bounds
      jsoncpp: Upgrade to 1.9.2
      ippool: Fix strncpy -Wformat-truncation warning
      opensc: Fix misaligned indentation
      glm: Upgrade to 0.9.9.6
      rocksdb: Upgrade to 6.5.2
      mariadb: Upgrade to 10.4.11
      ruli: Fix implicit conversion from 'unsigned int' to 'float'
      glfw: Update to latest
      fluentbit: Upgrade to 1.3.5
      renderdoc: Upgrade to 1.5
      spirv-tools: Upgrade to v2019.5
      upm: Disable -Wno-misleading-indentation with clang10+
      libyui: Disable Warnings as errors
      sanlock: Upgrade to 3.8.0+
      udisks2: Updare to latest master beyond 2.8.4
      netcat: Fix build with gettext 0.20.x
      gtkperf: Fix build with latest gettext 0.20.x
      hddtemp: Fix build with latest gettext 0.20.x
      vorbis-tools: Use external gettext
      rwmem: Upgrade to latest
      wireshark: Enable plugins when enabling qt5
      python3-jsonrpcserver: Use PYTHON_BASEVERSION instead of hardcoding py version
      smbnetfs: Update to latest 0.6.2 rev
      makedumpfile: Drop linking with libebl
      cmpi-bindings: append PYTHON_ABI suffix to libpython soname
      websocketpp: Fix clang specific flags in cmake files
      rocksdb: Disable Werror
      spirv-tools: Disable Werror
      libspatialite: Workaround proj_api.h deprecation in proj 6.0.0
      zbar: Switch to github and update to latest
      gstd: Upgrade to 0.8.1
      gst-shark: Upgrade to 0.6.1

Laurent Bonnans (1):
      opensc: fix RDEPENDS in pcsc PACKAGECONFIG

Leon Anavi (1):
      mosquitto: update to 1.6.8

Martin Jansa (2):
      googletest: fix build with newer oe-core without python in HOSTTOOLS
      proj: upgrade to 6.2.0

Max Krummenacher (1):
      libsoc: use python3 for python bindings

Maxime Roussin-Bélanger (1):
      libvncserver: add missing cmake configration option to packageconfig

Mingde (Matthew) Zeng (1):
      poppler/poppler-data: Add HOMEPAGE tags

Nicola Lunghi (1):
      python3-jsonrpcserver: update to 4.1.2

Pau Espin Pedrol (1):
      lksctp-tools: Add RRECOMENDS kernel-module-sctp for pkg lksctp-tools

Peter Kolbus (9):
      python(3)-ujson: extend to native(sdk)
      python-ipaddress: remove unneeded pip dependency
      python3-html2text: add recipe
      python(3)-beautifulsoup4: fix RDEPENDS
      python3-soupsieve: add recipe
      python-soupsieve: add recipe
      python(3)-beautifulsoup4: add soupsieve to RDEPENDS
      python3-booleanpy: add recipe
      python3-license-expression: add recipe

Pierre-Jean Texier (3):
      libssh2: add nativesdk support
      python3-xmltodict: add recipe
      libmxml: upgrade 3.0 -> 3.1

Quanyang Wang (1):
      glog: fix do_fetch error

Randy MacLeod (3):
      imagemagick: update from 7.8.47 to 7.9.16
      tigervnc: update from 1.9.0 to 1.10.1
      rsyslog: update from 8.1910 to 8.1911

Robert Yang (1):
      rocksdb: Fix compile error for DEBUG_BUILD

Ross Burton (11):
      python-jsonpointer: enable native/nativesdk
      python3-pystemd: upgrade to 0.7.0
      python-slip-dbus: don't use relative paths
      python-m2crypto: don't use relative paths
      python-coloredlogs: don't use relative paths
      python-lxml: remove redundant sed (fixed in 4.3.0 onwards)
      python-lxml: remove redundant RDEPENDS_class-native
      opencv: don't download during configure
      opencv: also download face alignment data in do_fetch()
      opencv: PACKAGECONFIG for G-API, use system ADE
      opencv: abort configure if we need to download

Stefan Agner (1):
      Revert "zstd: move recipe to oe-core"

Stefan Lendl (2):
      tinyproxy: Install a default tinyproxy.conf
      tinyproxy: Fix user and group in tinyproxy install

Sumit Garg (1):
      mariadb: fix library LZ4 lookup

Todd Cunningham (2):
      libnftnl: upgrade 1.1.4 -> 1.1.5
      nftables: upgrade 0.9.2 -> 0.9.3

Trevor Gamblin (4):
      python-twisted: add python3-pyserial to RDEPENDS
      python-twisted: add missing RDEPENDS for conch
      samba: disable guest access and anonymous queries
      python3-twisted: fix broken MemoryReactor import

Wang Mingyu (66):
      python-cmd2: upgrade 0.9.19 -> 0.9.21
      python-pluggy: upgrade 0.13.0 -> 0.13.1
      python-pyasn1: upgrade 0.4.7 -> 0.4.8
      python-pyopenssl: upgrade 19.0.0 -> 19.1.0
      python-simplejson: upgrade 3.16.0 -> 3.17.0
      python-thrift: upgrade 0.11.0 -> 0.13.0
      python-alembic: upgrade 1.3.0 -> 1.3.1
      python-dbus: upgrade 1.2.12 -> 1.2.14
      python-pbr: upgrade 5.4.3 -> 5.4.4
      python-paste: 3.2.2 -> 3.2.3
      python-lxml: 4.4.1 -> 4.4.2
      postgresql: 12.0 -> 12.1
      python-jsonschema: 3.1.1 -> 3.2.0
      python-pytest: upgrade 5.2.2 -> 5.3.1
      xterm: upgrade 350 -> 351
      wireshark: upgrade 3.0.6 -> 3.0.7
      python3-xxhash: upgrade 1.4.2 -> 1.4.3
      fuse3: upgrade 3.8.0 -> 3.9.0
      kea: upgrade 1.7.0 -> 1.7.2
      krb5: upgrade 1.17 -> 1.17.1
      hwdata: upgrade 0.329 -> 0.330
      python-pytest: upgrade 5.2.1 -> 5.3.2
      python-waitress: upgrade 1.3.1 -> 1.4.1
      python-cachetools: upgrade 3.1.1 -> 4.0.0
      python-sqlalchemy: upgrade 1.1.17 -> 1.3.12
      strongswan: upgrade 5.8.1 -> 5.8.2
      smartmontools: upgrade 7.0 -> 7.1
      spitools: upgrade 0.8.3 -> 0.8.4
      python-pyyaml: upgrade 5.1.2 -> 5.2
      arno-iptables-firewall: upgrade 2.0.3 -> 2.1.0
      ipvsadm: upgrade 1.30 -> 1.31
      lftp: upgrade 4.8.4 -> 4.9.0
      nghttp2: upgrade 1.39.2 -> 1.40.0
      opensaf: upgrade 5.19.07 -> 5.19.10
      wolfssl: upgrade 4.2.0 -> 4.3.0
      kea: upgrade 1.7.2 -> 1.7.3
      wireshark: upgrade 3.0.7 -> 3.2.0
      botan: upgrade 2.11.0 -> 2.13.0
      cppzmq: upgrade 4.4.1 -> 4.5.0
      iozone3: upgrade 487 -> 488
      libmbim: upgrade 1.20.2 -> 1.20.4
      libnfc: upgrade to 1.7.1
      libsigc++-2.0: upgrade 3.0.0 -> 3.0.2
      libuv: upgrade 1.33.1 -> 1.34.0
      phoronix-test-suite: upgrade 9.0.1 -> 9.2.1
      rabbitmq-c: upgrade 0.9.0 -> 0.10.0
      cscope: upgrade 15.8b -> 15.9
      msgpack-c: upgrade 3.1.1 -> 3.2.1
      gnuplot: upgrade 5.2.2 -> 5.2.8
      gphoto2: upgrade 2.5.14 -> 2.5.23
      gtkwave: upgrade 3.3.102 -> 3.3.103
      haveged: upgrade 1.9.6 -> 1.9.8
      libgphoto2: upgrade 2.5.17 -> 2.5.23
      libplist: upgrade 2.0.0 -> 2.1.0
      ipmiutil: upgrade 3.0.5 -> 3.1.5
      libburn: upgrade 1.5.0 -> 1.5.2
      libdvdread: upgrade 6.0.1 -> 6.0.2
      libsdl2-image: upgrade 2.0.3 -> 2.0.5
      libsdl2-mixer: upgrade 2.0.2 -> 2.0.4
      libsdl2-ttf: upgrade 2.0.14 -> 2.0.15
      yad: upgrade 4.1 -> 5.0
      python3-astor: 0.8 -> 0.8.1
      python3-bandit: 1.5.1 -> 1.6.2
      python-asn1crypto: 1.2.0 -> 1.3.0
      python-bitarray: 1.2.0 -> 1.2.1
      python-pyconnman: 0.1.0 -> 0.2.0

William A. Kennington III via Openembedded-devel (1):
      stunnel: bump to version 5.56

Yi Zhao (4):
      phpmyadmin: upgrade 4.9.1 -> 4.9.2
      tk: upgrade 8.6.9 -> 8.6.10
      ntp: restrict NTP mode 6 queries
      samba: upgrade 4.10.10 -> 4.10.11

Yongxin Liu (1):
      ndctl: Upgrade to v67

Zang Ruochen (17):
      python-alembic: upgrade 1.3.1 -> 1.3.2
      python-beautifulsoup4: upgrade 4.8.1 -> 4.8.2
      python-bitarray: upgrade 1.1.0 -> 1.2.0
      python-certifi: upgrade 2019.9.11 -> 2019.11.28
      python-cmd2: upgrade 0.9.21 -> 0.9.22
      python-engineio: upgrade 3.10.0 -> 3.11.1
      python-parse: upgrade 1.12.1 -> 1.14.0
      python-passlib: upgrade 1.7.1 -> 1.7.2
      python-pexpect: upgrade 4.6.0 -> 4.7.0
      python-psutil: upgrade 5.6.5 -> 5.6.7
      python-py: upgrade 1.8.0 -> 1.8.1
      python-pycryptodome: upgrade 3.9.3 -> 3.9.4
      python-pymisp: upgrade 2.4.117.2 -> 2.4.119.1
      python-pymongo: upgrade 3.9.0 -> 3.10.0
      python-pyparsing: upgrade 2.4.5 -> 2.4.6
      python-pyperf: upgrade 1.6.1 -> 1.7.0
      python-backports-functools-lru-cache: Add python3 version

Zhixiong Chi (1):
      dnsmasq: CVE-2019-14834

hmenn (1):
      add sqlite-orm v1.5

madhavank27 (1):
      Added bb file for libcamera integration

sangelovic (1):
      sdbus-c++: Introduce recipes for sdbus-c++ library and its tools

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

7 files changed, 18 insertions, 305 deletions

diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch
deleted file mode 100644
index d94b3ded9b..0000000000
--- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 114fe5067b58a2434b44855eee48f865186fe0fa Mon Sep 17 00:00:00 2001
-From: Alex Kiernan <alex.kiernan@gmail.com>
-Date: Tue, 5 Nov 2019 22:26:23 +0000
-Subject: [PATCH] build: create tests directory for split builds
-
-When `--disable-dependency-tracking` is in effect with separate build
-directory, the tests directory isn't created as a result of the
-dependency generation, which leads to a build race for the tests
-directory being created and failures:
-
-  Making all in .
-  make[2]: Entering directory 'TOPDIR/build/tmp/work/riscv64-yoe-linux-musl/ostree/2019.5-r0/build'
-  (echo '[Test]' > tests/test-local-pull-depth.sh.test.tmp; \
-  echo 'Type=session' >> tests/test-local-pull-depth.sh.test.tmp; \
-  echo 'Exec=env G_TEST_SRCDIR=/usr/libexec/installed-tests/libostree G_TEST_BUILDDIR=/usr/libexec/installed-tests/libostree /usr/libexec/installed-tests/libostree/test-local-pull-depth.sh' >> tests/test-local-pull-depth.sh.test.tmp; \
-  mv tests/test-local-pull-depth.sh.test.tmp tests/test-local-pull-depth.sh.test)
-  /bin/sh: tests/test-local-pull-depth.sh.test.tmp: No such file or directory
-  /bin/sh: line 1: tests/test-local-pull-depth.sh.test.tmp: No such file or directory
-  /bin/sh: line 2: tests/test-local-pull-depth.sh.test.tmp: No such file or directory
-  mv: cannot stat 'tests/test-local-pull-depth.sh.test.tmp': No such file or directory
-  make[2]: *** [Makefile:9282: tests/test-local-pull-depth.sh.test] Error 1
-
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-Upstream-Status: Pending
----
- buildutil/glib-tap.mk | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/buildutil/glib-tap.mk b/buildutil/glib-tap.mk
-index 34b8f21ea26a..9a944a0acc88 100644
---- a/buildutil/glib-tap.mk
-+++ b/buildutil/glib-tap.mk
-@@ -116,6 +116,7 @@ installed_testcases = $(test_programs) $(installed_test_programs) \
- installed_test_meta_DATA = $(installed_testcases:=.test)
- 
- %.test: %$(EXEEXT) Makefile
-+	@$(MKDIR_P) $(dir $@)
- 	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
- 	echo 'Type=session' >> $@.tmp; \
- 	echo 'Exec=env G_TEST_SRCDIR=$(installed_testdir) G_TEST_BUILDDIR=$(installed_testdir) $(installed_testdir)/$(notdir $<)' >> $@.tmp; \
--- 
-2.17.1
-
diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch
deleted file mode 100644
index d8c044cb92..0000000000
--- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5a4f2ddb0a6c656b425a3caa41f5af766ed5f44b Mon Sep 17 00:00:00 2001
-From: Alex Kiernan <alex.kiernan@gmail.com>
-Date: Mon, 9 Sep 2019 14:19:18 +0100
-Subject: [PATCH] macros: Add TEMP_FAILURE_RETRY for musl
-
-TEMP_FAILURE_RETRY is glibc specific, add a definition for musl.
-
-See https://github.com/ostreedev/ostree/issues/731
-
-Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libglnx/commit/15c06468804014fc49f6f340132930703f919b19]
----
- glnx-macros.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libglnx.glnx-macros.h b/libglnx/glnx-macros.h
-index 6d8aca93f8a3..700fc75ceed0 100644
---- a/libglnx.glnx-macros.h
-+++ b/libglnx/glnx-macros.h
-@@ -31,6 +31,16 @@ G_BEGIN_DECLS
- /* All of these are for C only. */
- #ifndef __GI_SCANNER__
- 
-+/* fixes builds against musl, taken from glibc unistd.h */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Taken from https://github.com/systemd/systemd/src/basic/string-util.h
-  * at revision v228-666-gcf6c8c4
-  */
--- 
-2.17.1
-
diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch
deleted file mode 100644
index fdb733ebe4..0000000000
--- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From fb519f0361565cad0d340095263a1e8866ec4f89 Mon Sep 17 00:00:00 2001
-From: Alex Kiernan <alex.kiernan@gmail.com>
-Date: Thu, 31 Oct 2019 11:30:00 +0000
-Subject: [PATCH 1/3] tests: Handle EPIPE failures when head terminates
-
-When using musl, it appears that the default is line buffered output, so
-when `head -1` reads from a pipe we have to handle the source end of the
-pipe getting EPIPE.
-
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-Upstream-Status: Accepted [v2019.6]
----
- tests/pull-test.sh            | 2 +-
- tests/test-pull-mirrorlist.sh | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/pull-test.sh b/tests/pull-test.sh
-index 0a97a1195582..2cfd8e02f790 100644
---- a/tests/pull-test.sh
-+++ b/tests/pull-test.sh
-@@ -177,7 +177,7 @@ if ! skip_one_without_user_xattrs; then
-     ${CMD_PREFIX} ostree --repo=cacherepo pull-local ostree-srv/gnomerepo main
-     rev=$(ostree --repo=cacherepo rev-parse main)
-     ${CMD_PREFIX} ostree --repo=cacherepo ls -R -C main > ls.txt
--    regfile_hash=$(grep -E -e '^-0' ls.txt | head -1 | awk '{ print $5 }')
-+    regfile_hash=$((grep -E -e '^-0' ls.txt || true) | head -1 | awk '{ print $5 }')
-     ${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false corruptrepo $(cat httpd-address)/ostree/corruptrepo
-     # Make this a loop so in the future we can add more object types like commit etc.
-     for object in ${regfile_hash}.file; do
-diff --git a/tests/test-pull-mirrorlist.sh b/tests/test-pull-mirrorlist.sh
-index 4e44852d3971..85ff66e99f8e 100755
---- a/tests/test-pull-mirrorlist.sh
-+++ b/tests/test-pull-mirrorlist.sh
-@@ -47,12 +47,12 @@ setup_mirror content_mirror3
- 
- # Let's delete a file from 1 so that it falls back on 2
- cd ${test_tmpdir}/content_mirror1/ostree/gnomerepo
--filez=$(find objects/ -name '*.filez' | head -n 1)
-+filez=$((find objects/ -name '*.filez' || true) | head -n 1)
- rm ${filez}
- 
- # Let's delete a file from 1 and 2 so that it falls back on 3
- cd ${test_tmpdir}/content_mirror1/ostree/gnomerepo
--filez=$(find objects/ -name '*.filez' | head -n 1)
-+filez=$((find objects/ -name '*.filez' || true) | head -n 1)
- rm ${filez}
- cd ${test_tmpdir}/content_mirror2/ostree/gnomerepo
- rm ${filez}
--- 
-2.17.1
-
diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch
deleted file mode 100644
index dcafb09957..0000000000
--- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4d17cd917fe4fb67d2f9e4881b6693ac7289f423 Mon Sep 17 00:00:00 2001
-From: Alex Kiernan <alex.kiernan@gmail.com>
-Date: Wed, 30 Oct 2019 07:55:41 +0000
-Subject: [PATCH 1/4] tests/core: Fallback to en_US.UTF-8 locale
-
-A number of tests expect explicit left/right single quotes in their
-messages, which will never happen in the C locale. Change so we pick a
-likely UTF-8 locale, or fail if we can't find one.
-
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-Upstream-Status: Accepted [v2019.6]
----
- tests/libtest-core.sh | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh
-index f6f94288fc61..bc191332c916 100644
---- a/tests/libtest-core.sh
-+++ b/tests/libtest-core.sh
-@@ -35,15 +35,11 @@ assert_not_reached () {
- }
- 
- # Some tests look for specific English strings. Use a UTF-8 version
--# of the C (POSIX) locale if we have one, or fall back to POSIX
-+# of the C (POSIX) locale if we have one, or fall back to en_US.UTF-8
- # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8)
--if locale -a | grep '^C.UTF-8$' >/dev/null; then
--    export LC_ALL=C.UTF-8
--elif locale -a | grep '^C.utf8$' >/dev/null; then
--    export LC_ALL=C.utf8
--else
--    export LC_ALL=C
--fi
-+export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true)
-+if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi
-+
- # A GNU extension, used whenever LC_ALL is not C
- unset LANGUAGE
- 
--- 
-2.17.1
-
diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch
deleted file mode 100644
index 5ab9c8f6d7..0000000000
--- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 3d48021fb0892721fab8359b49470e521aaed493 Mon Sep 17 00:00:00 2001
-From: Alex Kiernan <alex.kiernan@gmail.com>
-Date: Thu, 31 Oct 2019 11:28:07 +0000
-Subject: [PATCH 2/3] tests/core: Assume C.UTF-8 if locale isn't found
-
-When building with musl there's no locale command, also its default
-locale is C.UTF-8, so just get C.UTF-8 if we can't find locale.
-
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-Upstream-Status: Accepted [v2019.6]
----
- tests/libtest-core.sh | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh
-index bc191332c916..46aafab03cc8 100644
---- a/tests/libtest-core.sh
-+++ b/tests/libtest-core.sh
-@@ -37,9 +37,15 @@ assert_not_reached () {
- # Some tests look for specific English strings. Use a UTF-8 version
- # of the C (POSIX) locale if we have one, or fall back to en_US.UTF-8
- # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8)
--export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true)
--if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi
--
-+#
-+# If we can't find the locale command assume we have support for C.UTF-8
-+# (e.g. musl based systems)
-+if type -p locale >/dev/null; then
-+    export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true)
-+    if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi
-+else
-+    export LC_ALL=C.UTF-8
-+fi
- # A GNU extension, used whenever LC_ALL is not C
- unset LANGUAGE
- 
--- 
-2.17.1
-
diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch
deleted file mode 100644
index 834617c12d..0000000000
--- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From abf1a7392b2fa1945286a39a35190d74fe141e52 Mon Sep 17 00:00:00 2001
-From: Alex Kiernan <alex.kiernan@gmail.com>
-Date: Thu, 31 Oct 2019 17:09:36 +0000
-Subject: [PATCH 3/3] tests: Avoid musl failure with `cp -a`
-
-When copying the tree, using musl and GNU coreutils, something gets confused
-when setting the ownership of symlinks and the copy fails with:
-
-  cp: failed to preserve ownership for osdata-devel/bin: Not supported
-
-Rework using tar to avoid the problem.
-
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-Upstream-Status: Accepted [v2019.6]
----
- tests/libtest.sh        | 4 +++-
- tests/test-admin-gpg.sh | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/tests/libtest.sh b/tests/libtest.sh
-index ba00073a10a7..3f5fd931bc1e 100755
---- a/tests/libtest.sh
-+++ b/tests/libtest.sh
-@@ -440,7 +440,9 @@ EOF
-     ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build"
- 
-     cd ${test_tmpdir}
--    cp -a osdata osdata-devel
-+    rm -rf osdata-devel
-+    mkdir osdata-devel
-+    tar -C osdata -cf - . | tar -C osdata-devel -xf -
-     cd osdata-devel
-     mkdir -p usr/include
-     echo "a development header" > usr/include/foo.h
-diff --git a/tests/test-admin-gpg.sh b/tests/test-admin-gpg.sh
-index 1f50c8a9a508..dc776743776c 100755
---- a/tests/test-admin-gpg.sh
-+++ b/tests/test-admin-gpg.sh
-@@ -90,7 +90,9 @@ EOF
-     ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build" --gpg-sign=$keyid --gpg-homedir=${test_tmpdir}/gpghome
- 
-     cd ${test_tmpdir}
--    cp -a osdata osdata-devel
-+    rm -rf osdata-devel
-+    mkdir osdata-devel
-+    tar -C osdata -cf - . | tar -C osdata-devel -xf -
-     cd osdata-devel
-     mkdir -p usr/include
-     echo "a development header" > usr/include/foo.h
--- 
-2.17.1
-
diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.6.bb
index b3b34a15e6..bcf511b902 100644
--- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.6.bb
@@ -24,24 +24,20 @@ PREMIRRORS = ""
 
 SRC_URI = " \
     gitsm://github.com/ostreedev/ostree \
-    file://0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch \
     file://run-ptest \
-    file://0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch \
-    file://0001-tests-Handle-EPIPE-failures-when-head-terminates.patch \
-    file://0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch \
-    file://0003-tests-Avoid-musl-failure-with-cp-a.patch \
-    file://0001-build-create-tests-directory-for-split-builds.patch \
 "
-SRCREV = "980ca07b03b3aa7e0012729dd6c84b0878775d93"
+SRCREV = "43706202f7de2ce0c829a46caab350ae1656f6ad"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)"
 
 S = "${WORKDIR}/git"
 
-inherit autotools bash-completion gobject-introspection gtk-doc pkgconfig ptest-gnome systemd
+inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd
 
 # Package configuration - match ostree defaults, but without rofiles-fuse
 # otherwise we introduce a dependendency on meta-filesystems
+#
+# If running with ptest, both soup (for trivial-httpd) and xattr are required
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \
@@ -52,16 +48,19 @@ PACKAGECONFIG ??= " \
 # soup or curl - https://github.com/ostreedev/ostree/issues/1897
 PACKAGECONFIG_class-native ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
+    builtin-grub2-mkconfig \
     soup \
 "
 
 PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi"
+PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig"
 PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl"
 PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut"
+PACKAGECONFIG[gjs] = "ac_cv_path_GJS=${bindir}/gjs"
 PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls"
 PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive"
 PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux"
-PACKAGECONFIG[man] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native"
+PACKAGECONFIG[manpages] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native"
 PACKAGECONFIG[mkinitcpio] = "--with-mkinitcpio, --without-mkinitcpio"
 PACKAGECONFIG[no-http2] = "--disable-http2, --enable-http2"
 PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl"
@@ -84,7 +83,6 @@ EXTRA_OEMAKE = " \
 "
 
 EXTRA_OECONF_class-native = " \
-    --with-builtin-grub2-mkconfig \
     --enable-wrpseudo-compat \
     --disable-otmpfile \
 "
@@ -106,7 +104,7 @@ do_install_append_class-native() {
     create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator"
 }
 
-PACKAGES += " \
+PACKAGE_BEFORE_PN = " \
     ${PN}-dracut \
     ${PN}-grub \
     ${PN}-mkinitcpio \
@@ -114,20 +112,11 @@ PACKAGES += " \
     ${PN}-trivial-httpd \
 "
 
-FILES_${PN} = " \
-    ${bindir}/ostree \
-    ${bindir}/rofiles-fuse \
-    ${datadir}/${BPN} \
-    ${datadir}/gir-1.0 \
-    ${libdir}/${BPN}/ostree-remount \
-    ${libdir}/girepository-1.0 \
-    ${libdir}/lib*${SOLIBS} \
-    ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \
-    ${sysconfdir}/ostree/remotes.d \
-    ${systemd_unitdir}/system-generators/ostree-system-generator \
-    ${systemd_unitdir}/system/ostree-finalize-staged.path \
-    ${systemd_unitdir}/system/ostree-finalize-staged.service \
-    ${systemd_unitdir}/system/ostree-remount.service \
+FILES_${PN} += " \
+    ${nonarch_libdir}/${BPN} \
+    ${nonarch_libdir}/tmpfiles.d \
+    ${systemd_unitdir}/system \
+    ${systemd_unitdir}/system-generators \
 "
 FILES_${PN}-dracut = " \
     ${sysconfdir}/dracut.conf.d \
@@ -142,7 +131,7 @@ FILES_${PN}-mkinitcpio = " \
     ${libdir}/initcpio \
 "
 FILES_${PN}-switchroot = " \
-    ${libdir}/ostree/ostree-prepare-root \
+    ${nonarch_libdir}/${BPN}/ostree-prepare-root \
     ${systemd_unitdir}/system/ostree-prepare-root.service \
 "
 FILES_${PN}-trivial-httpd = " \
@@ -168,8 +157,10 @@ RDEPENDS_${PN}-ptest += " \
     grep \
     python3-core \
     python3-multiprocessing \
-    python3-pyyaml \
+    tar \
     ${PN}-trivial-httpd \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'python3-pyyaml', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \
 "
 RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us"
 
@@ -180,13 +171,3 @@ SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path"
 SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service"
 
 BBCLASSEXTEND = "native"
-
-python __anonymous() {
-    if not bb.data.inherits_class('native', d) and bb.utils.contains('PTEST_ENABLED', '1', 'True', 'False', d):
-        if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', 'False', d):
-            raise bb.parse.SkipRecipe('ptest requires meta-python to be present.')
-        elif not bb.utils.contains_any('PACKAGECONFIG', 'soup curl', 'True', 'False', d):
-            raise bb.parse.SkipRecipe('ptest requires soup enabled in PACKAGECONFIG.')
-        elif not oe.utils.any_distro_features(d, "xattr"):
-            raise bb.parse.SkipRecipe('ptest requires xattr enabled in DISTRO_FEATURES.')
-}