meta-openembedded: subtree update:4fe1065655..2449e5f07a

Alexander Kanavin (1):
      remmina: make avahi support optional and off by default

Alexander Vickberg (1):
      hostapd: fix building with CONFIG_TLS=internal

Andreas Müller (63):
      mariadb: Fix configure
      evolution-data-server: Backport upstream patch to fix configure on latest CMake
      libgtop: tidy up recipe
      xfce4-systemload-plugin: upgrade 1.3.0 -> 1.3.1 / introduce PACKAGECONFIGs
      xfce4-clipman-plugin: upgrade 1.6.1 -> 1.6.2
      xfce4-panel: upgrade 4.16.2 -> 4.16.3
      fluidsynth: upgrade 2.2.0 -> 2.2.1
      gparted: upgrade 1.2.0 -> 1.3.0
      poppler: upgrade 21.04.0 -> 21.05.0
      tracker: upgrade 2.3.6 -> 3.0.4
      tracker-miners: upgrade 2.3.5 -> 3.0.5
      nautilus: upgrade 3.36.3 -> 40.1
      gnome-photos: upgrade 3.34.2 -> 40.0
      file-roller: upgrade 3.36.3 -> 3.38.1
      tepl: upgrade 4.4.0 -> 6.00.0
      gedit: upgrade 3.36.2 -> 40.1
      evince: upgrade 3.38.0 -> 40.1
      gnome-calculator: upgrade 3.36.0 -> 40.1
      gnome-system-monitor: upgrade 3.36.1 -> 40.1
      dconf-editor: upgrade 3.38.2 -> 3.38.3
      libwnck3: upgrade 3.36.0 -> 40.0
      babl: upgrade 0.1.84 -> 0.1.86
      gimp: upgrade 2.10.22 -> 2.10.24
      gegl: add PACKAGECONFIG libraw and enable it by default
      gegl: add poppler PCAKAGECONFIG and enable it by default
      Revert "gimp: Disable svg icons on arm"
      grilo-plugins: initial add 0.3.13
      gnome-photos: rrecommend grilo-plugins
      gnome-photos: Let all desktops add gnome-photos to their start menu
      meta-gnome: remove upstream-version-is-even from inherit on 40.x version recipes
      portaudio-v19: upgrade 19.6.0 -> 19.7.0
      mousepad: upgrade 0.5.4 -> 0.5.5
      network-manager-applet: upgrade 1.18.0 -> 1.22.0
      nano: upgrade 5.6 -> 5.7
      gnuplot: upgrade 5.2.8 -> 5.4.1
      zsh: upgrade 5.4.2 -> 5.8
      ttf-lohit: upgrade 2 -> 2.92.1
      xrdp: upgrade 0.9.15 -> 0.9.16
      snappy: upgrade 1.1.8 -> 1.1.9
      redis: upgrade 6.2.2 -> 6.2.3
      remmina: upgrade 1.4.11 -> 1.4.17
      libpeas: upgrade 1.26.0 -> 1.30.0
      modemmanager: upgrade 1.16.2 -> 1.16.4
      mm-common: upgrade 1.0.2 -> 1.0.3
      protobuf: upgrade 3.15.2 -> 3.17.0
      qpdf: upgrade 10.2.0 -> 10.3.2
      libmxml: upgrade 3.1 -> 3.2
      libgusb: upgrade 0.3.5 -> 0.3.6
      libeigen: upgrade 3.3.7 -> 3.3.9
      giflib: upgrade 5.1.4 -> 5.2.1
      fltk: upgrade 1.3.5 -> 1.3.6
      botan: upgrade 2.14.0 -> 2.18.1
      dialog: upgrade 1.3-20210319 -> 1.3-20210509
      colord: upgrade 1.4.4 -> 1.4.5
      flatbuffers: upgrade 1.12.0 -> 2.0.0
      gtkwave: upgrade 3.3.108 -> 3.3.109 / move to gtk3 / tidy up recipe
      hwdata: upgrade 0.346 -> 0.347
      mime-support: upgrade 3.48 -> 3.62
      mpv: upgrade 0.32.0 -> 0.33.1
      renderdoc: upgrade 1.7 -> 1.13
      xfce4-screenshooter: upgrade 1.9.8 -> 1.9.9
      hunspell-dictionaries: use better names for dictionary files
      gupnp: upgrade 1.2.4 -> 1.2.6

Andrej Kozemcak (1):
      squid: upgrade 4.14 -> 4.15

Armin Kuster (6):
      audit: migrate from meta-selinux
      packagegroup-meta-oe: add audit to pkg grp
      python3-scapy: move from meta-security
      python3-scapy: add pkg to pkg grp
      python3-scapy: drop from pkg grp
      python3-scapy: drop this recipe

Ayoub Zaki (1):
      evemu-tools: Add initial recipe

Bartosz Golaszewski (3):
      python3-pycocotools: new package
      python3-pydbus-manager: add runtime dependencies
      python3-asyncio-glib: new package

Bruce Mitchell (1):
      makedumpfile: Bump srcrev

Changqing Li (3):
      python3-paho-mqtt: add package python3-paho-mqtt-examples
      nmap: change shebang to python3
      libgtop: fix do_compile error

Chen Qi (1):
      mutter: add polkit to REQUIRED_DISTRO_FEATRUES

Daniel Ammann (1):
      nyancat: add new package

Gianfranco (1):
      vboxguestdrivers: upgrade 6.1.20 -> 6.1.22

Guy Morand (1):
      qperf: add qperf recipe

Hongxu Jia (1):
      cdrkit: add nativesdk support

Kai Kang (1):
      thunar: 4.16.6 -> 4.16.8

Khem Raj (47):
      liburing: Upgrade to 2.0
      catch2: Upgrade to 2.13.6
      mongodb: Update to 4.4.6-rc0
      icewm: Upgrade to 2.3.3
      python3-m2crypto: Pass correct ABI defines to swig
      python3-lazy-object-proxy: Add missing dep on pip
      python3-markdown: Remove
      sdbus-c++-libsystemd: Avoid hard dependency on rsync
      libmusicbrainz: Rework native and target pieces
      abseil-cpp: Upgrade to lts_2021_03_24
      grpc: Upgrade to 1.37.1
      minicoredumper: Replace pthread_mutexattr_setrobust_np with pthread_mutexattr_setrobust
      libupnp: Do not use _np versions of mutex APIs
      mariadb: Upgrade to 10.5.10
      apitrace: Upgrade to 0.10
      evolution-data-server: Update to 3.40.1
      mongodb: Do not use MINSIGSTKSZ
      tbb: Fix build with GCC 11
      breakpad: Fix type mismatch for SIGSTKSZ
      packagegroup-meta-networking.bb: Add http-parser to packagegroup-meta-networking-support
      nautilus: Exclude from builds
      python3-m2crypto: Fix build on riscv and mips
      googletest: Update to tip of trunk
      libraw: Move from meta-qt5-extra to meta-oe
      Revert "nautilus: Exclude from builds"
      libcamera: Update to latest master tip
      python3-haversine: Fix build with latest python/setuptools
      opencv: Disable tbb on riscv/musl
      rdma-core: Upgrade to 35.0
      wireshark: Add zstd via packageconfig
      dhcp-relay: Use recent config.guess and config.sub for bind
      projucer: Update to latest master tip
      opencv: Do not lock to gcc only compiler
      minifi-cpp: Fix build with llvm C++ runtime
      sdbus-cpp: Do not fetch googletest on the fly
      python3-grpcio: Update to 1.38.0
      heaptrack: Fix build with clang and llvm libunwind
      grpc: Upgrade to 1.38.0
      packagegroup-meta-oe: Add qperf package
      dovecot: Fix build with llvm libunwind
      mpich: Upgrade to 3.4.2
      packagegroup-meta-oe: Add evemu-tools
      vk-gl-cts: Fix O_TRUNC conflict with fcntl.h
      dhcp-relay: Fix libtool files for internal bind build
      mongodb: Change PV to 4.4.6
      mongodb: Fix -Wc++11-narrowing warning on 32bit
      mariadb: Include missing sys/type.h for ssize_t

Leon Anavi (81):
      python3-pywbemtools: Upgrade 0.8.1 -> 0.9.0
      python3-humanize: Upgrade 3.4.1 -> 3.5.0
      python3-elementpath: Upgrade 2.2.1 -> 2.2.2
      python3-typing-extensions: Upgrade 3.7.4.3 -> 3.10.0.0
      python3-watchdog: Upgrade 2.0.3 -> 2.1.0
      python3-greenlet: Upgrade 1.0.0 -> 1.1.0
      python3-bitarray: Upgrade 2.0.1 -> 2.1.0
      python3-websockets: Upgrade 8.1 -> 9.0.1
      python3-babel: Upgrade 2.9.0 -> 2.9.1
      python3-croniter: Upgrade 1.0.12 -> 1.0.13
      python3-serpent: Upgrade 1.30.2 -> 1.40
      python3-cerberus: Upgrade 1.3.3 -> 1.3.4
      python3-aiohue: Upgrade 2.2.0 -> 2.3.0
      python3-robotframework: Upgrade 4.0.1 -> 4.0.2
      python3-sentry-sdk: Upgrade 1.0.0 -> 1.1.0
      python3-aiohue: Upgrade 2.3.0 -> 2.3.1
      python3-watchdog: Upgrade 2.1.0 -> 2.1.1
      python3-itsdangerous: Upgrade 1.1.0 -> 2.0.0
      python3-websocket-client: Upgrade 0.58.0 -> 0.59.0
      python3-google-api-python-client: Upgrade 2.2.0 -> 2.4.0
      python3-configargparse: Upgrade 1.4 -> 1.4.1
      python3-click: Upgrade 7.1.2 -> 8.0.0
      python3-pysonos: Upgrade 0.0.43 -> 0.0.46
      python3-rfc3339-validator: Upgrade 0.1.3 -> 0.1.4
      python3-pymongo: Upgrade 3.11.3 -> 3.11.4
      python3-alembic: Upgrade 1.5.8 -> 1.6.2
      python3-deprecated: Add recipe
      python3-pymisp: Upgrade 2.4.142 -> 2.4.143
      python3-aiohue: Upgrade 2.3.1 -> 2.4.0
      python3-pyroute2: Upgrade 0.5.18 -> 0.5.19
      python3-matplotlib-inline: Add recipe
      python3-ipython: Upgrade 7.22.0 -> 7.23.1
      python3-sh: Upgrade 1.14.1 -> 1.14.2
      python3-javaobj-py3: Upgrade 0.4.2 -> 0.4.3
      python3-pyjwt: Upgrade 2.0.1 -> 2.1.0
      python3-aiofiles: Upgrade 0.6.0 -> 0.7.0
      python3-aiohue: Upgrade 2.4.0 -> 2.5.0
      python3-cbor2: Upgrade 5.2.0 -> 5.3.0
      python3-websockets: Upgrade 9.0.1 -> 9.0.2
      python3-decorator: Upgrade 5.0.7 -> 5.0.9
      python3-websocket-client: Upgrade 0.59.0 -> 1.0.0
      python3-pysonos: Upgrade 0.0.46 -> 0.0.48
      surf: Upgrade 2.0 -> 2.1
      python3-pywbem: Upgrade 1.1.3 -> 1.2.0
      python3-watchdog: Upgrade 2.1.1 -> 2.1.2
      python3-click: Upgrade 8.0.0 -> 8.0.1
      python3-pysonos: Upgrade 0.0.48 -> 0.0.49
      python3-pytest-runner: Upgrade 5.3.0 -> 5.3.1
      python3-xmlschema: Upgrade 1.6.1 -> 1.6.2
      python3-websocket-client: Upgrade 1.0.0 -> 1.0.1
      python3-alembic: Upgrade 1.6.2 -> 1.6.4
      python3-sqlalchemy: Upgrade 1.4.11 -> 1.4.15
      python3-flask-migrate: Upgrade 2.7.0 -> 3.0.0
      python3-flask: Upgrade 1.1.2 -> 2.0.1
      python3-flask-wtf: Upgrade 0.14.3 -> 0.15.1
      python3-flask-socketio: Upgrade 5.0.1 -> 5.0.3
      python3-werkzeug: Upgrade 1.0.1 -> 2.0.1
      python3-bidict: Add recipe
      python3-socketio: Upgrade 5.1.0 -> 5.3.0
      python3-robotframework: Upgrade 4.0.2 -> 4.0.3
      python3-flask-restful: Upgrade 0.3.8 -> 0.3.9
      python3-pysonos: Upgrade 0.0.49 -> 0.0.50
      python3-aenum: Upgrade 3.0.0 -> 3.1.0
      python3-pyscaffold: Upgrade 4.0.1 -> 4.0.2
      python3-urllib3: Upgrade 1.26.4 -> 1.26.5
      python3-tqdm: Upgrade 4.60.0 -> 4.61.0
      python3-flask: Extend RDEPENDS
      python3-ecdsa: Upgrade 0.16.1 -> 0.17.0
      python3-alembic: Upgrade 1.6.4 -> 1.6.5
      python3-websockets: Upgrade 9.0.2 -> 9.1
      python3-pyzmq: Upgrade 22.0.3 -> 22.1.0
      python3-ntplib: Upgrade 0.3.4 -> 0.4.0
      python3-humanize: Upgrade 3.5.0 -> 3.6.0
      python3-astroid: Upgrade 2.5.6 -> 2.5.7
      python3-netifaces: Upgrade 0.10.9 -> 0.11.0
      python3-certifi: Upgrade 2020.12.5 -> 2021.5.30
      python3-click-repl: Upgrade 0.1.6 -> 0.2.0
      python3-google-api-python-client: Upgrade 2.4.0 -> 2.6.0
      python3-pytest-helpers-namespace: Upgrade 2021.3.24 -> 2021.4.29
      python3-ipython: Upgrade 7.23.1 -> 7.24.0
      python3-ruamel-yaml: Upgrade 0.17.4 -> 0.17.7

LiweiSong (1):
      pm-graph: parse separated cpu exec line

Martin Jansa (7):
      ostree: switch from default master branch to main to fix do_fetch failure
      snappy: explicity disable building tests and benchmark
      libtinyxml2: restore building shared library
      zsh: work around file-rdeps QA issues with usrmerge in DISTRO_FEATURES
      snappy: fix native build with older gcc on host
      p7zip: refresh patches with devtool to apply cleanly
      gtkwave: set REQUIRED_DISTRO_FEATURES only to wayland

Nisha Parrakat (1):
      p7zip: build and package lib7z.so needed for fastboot

Nuno Sá (2):
      libiio: add serial backend support
      libiio: mark libxml2 as depends for usb_backend

Robert Joslyn (1):
      ctags: Use PACKAGECONFIG for build options

Romain Naour (4):
      poke: add recipe for version 1.2
      poke: add optional json-c dependency
      packagegroup-meta-oe: Add poke to packagegroup-meta-oe-devtools
      libiec61850: Upgrade to 1.5.0

Ross Burton (3):
      nss: disable -Werror
      nss: remove -march vs -mcpu workaround
      meta-gnome: add Cogl/Clutter from oe-core

Saul Wold (2):
      opencv: remove tbb packageconfig for powerpc
      sysdig: disable building for ppc

Stefan Ghinea (1):
      thunar: fix CVE-2021-32563

Stefan Wiehler (3):
      http-parser: add recipe
      restinio: add recipe
      restinio: fix license

Trevor Gamblin (6):
      python3-django: upgrade 2.2.20 -> 2.2.22
      python3-django: upgrade 3.2 -> 3.2.2
      python3-django: upgrade 2.2.22 -> 2.2.23
      python3-django: upgrade 3.2.2 -> 3.2.3
      python3-ujson: fix ptests
      python3-prettytable: add python3-sqlite3 for ptest

William A. Kennington III (1):
      span-lite: upgrade 0.8.1 -> 0.9.2

Yi Zhao (1):
      dhcp-relay: add recipe

wangmy (11):
      uftrace: Fix a plthook crash on aarch64 with binutils2.35.1 and later versions on aarch64
      exiv2: Fix CVE-2021-29457
      exiv2: Fix CVE-2021-29458
      exiv2: Fix CVE-2021-29463
      exiv2: Fix CVE-2021-3482
      exiv2: Fix CVE-2021-29464
      exiv2: Fix CVE-2021-29470
      exiv2: Fix CVE-2021-29473
      libsdl: Fix CVE-2019-13616
      trace-cmd: Conflict resolution
      uftrace: upgrade 0.9.4 -> 0.10

zangrc (21):
      ifenslave: upgrade 2.11 -> 2.12
      lksctp-tools: upgrade 1.0.18 -> 1.0.19
      nbdkit: upgrade 1.25.6 -> 1.25.7
      tcpreplay: upgrade 4.3.3 -> 4.3.4
      cloc: upgrade 1.88 -> 1.90
      gensio: upgrade 2.2.4 -> 2.2.5
      iwd: upgrade 1.13 -> 1.14
      makedumpfile: upgrade 1.6.8 -> 1.6.9
      postgresql: upgrade 13.2 -> 13.3
      libencode-perl: upgrade 3.08 -> 3.10
      python3-xlsxwriter: upgrade 1.4.0 -> 1.4.3
      python3-itsdangerous: upgrade 2.0.0 -> 2.0.1
      python3-protobuf: upgrade 3.14.0 -> 3.17.0
      python3-pulsectl: upgrade 21.3.4 -> 21.5.17
      python3-engineio: upgrade 3.13.0 -> 4.2.0
      python3-can: upgrade 3.3.3 -> 3.3.4
      gexiv2: upgrade 0.12.1 -> 0.12.2
      gnome-autoar: upgrade 0.3.1 -> 0.3.2
      gnome-bluetooth: upgrade 3.34.1 -> 3.34.5
      libgweather: upgrade 3.36.1 -> 3.36.2
      libstemmer: upgrade 2.0.0 -> 2.1.0

zhengruoqin (8):
      libdivecomputer: upgrade 0.6.0 -> 0.7.0
      libjcat: upgrade 0.1.6 -> 0.1.7
      libxmlb: upgrade 0.3.0 -> 0.3.1
      chrony: upgrade 4.0 -> 4.1
      libqmi: upgrade 1.28.2 -> 1.28.4
      libtinyxml2: upgrade 8.0.0 -> 8.1.0
      libndp: upgrade 1.7 -> 1.8
      valijson: upgrade 0.3 -> 0.4

Change-Id: I8a1f42af3063886d88a7c0c5c79a45dde55c34da
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
index 270cc35..2b108ab 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
+++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
@@ -17,10 +17,8 @@
  Makefile | 45 +++++++++++++++++++++++----------------------
  1 file changed, 23 insertions(+), 22 deletions(-)
 
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile
-+++ git/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -8,12 +8,6 @@ ifeq ($(strip $CC),)
  CC	= gcc
  endif
@@ -79,7 +77,7 @@
 +              -DRELEASE_DATE='"$(DATE)"'
 +
  SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h
- SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c
+ SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c
  OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
 @@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
  
@@ -104,7 +102,7 @@
 +CFLAGS_COMMON += -DUSESNAPPY
  endif
  
- LIBS := -lpthread $(LIBS)
+ LIBS := $(LIBS) -lpthread
 @@ -90,14 +91,14 @@ LIBS := $(LIBS) $(call try-run,\
  all: makedumpfile
  
diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch
index 85d8833..f46fb31 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch
+++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch
@@ -28,10 +28,8 @@
  arch/ppc64.c | 38 ++------------------------------------
  1 file changed, 2 insertions(+), 36 deletions(-)
 
-Index: git/arch/ppc64.c
-===================================================================
---- git.orig/arch/ppc64.c
-+++ git/arch/ppc64.c
+--- a/arch/ppc64.c
++++ b/arch/ppc64.c
 @@ -462,44 +462,6 @@ ppc64_vtop_level4(unsigned long vaddr)
  	return paddr;
  }
diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.9.bb
similarity index 96%
rename from meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb
rename to meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.9.bb
index 4754651..79bad0a 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb
+++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.9.bb
@@ -11,7 +11,7 @@
 LICENSE = "GPLv2.0"
 
 SRCBRANCH ?= "master"
-SRCREV = "18e0cdba48feeccea2429b3b0b2691f4314d1062"
+SRCREV = "a9ad811c15e769c8e6d8d915a05cebc32f2ea2f5"
 
 DEPENDS = "bzip2 zlib elfutils xz"
 RDEPENDS_${PN}-tools = "perl ${PN}"
diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch
deleted file mode 100644
index ad255fa..0000000
--- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6181d9c3c407ee030b4c3a94045318b9e3a3cc89 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 25 Jul 2017 14:08:54 -0700
-Subject: [PATCH] minicoredumper: Initialize pointer to config struct to null
-
-Fixes
-corestripper.c:3632:13: error: variable 'cfg' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/minicoredumper/corestripper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/minicoredumper/corestripper.c b/src/minicoredumper/corestripper.c
-index a764073..ddb0d25 100644
---- a/src/minicoredumper/corestripper.c
-+++ b/src/minicoredumper/corestripper.c
-@@ -3605,7 +3605,7 @@ out:
- 
- static int do_all_dumps(struct dump_info *di, int argc, char *argv[])
- {
--	struct config *cfg;
-+	struct config *cfg = 0;
- 	const char *recept;
- 	bool live_dumper;
- 	char *comm_base;
--- 
-2.13.3
-
diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch
new file mode 100644
index 0000000..455e6f3
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch
@@ -0,0 +1,33 @@
+From 5895caba6573e84f73f159d9e84cd1aa7e969f18 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 9 May 2021 14:37:00 -0700
+Subject: [PATCH] replace pthread_mutexattr_setrobust_np with
+ pthread_mutexattr_setrobust
+
+This is now part of standard POSIX function [1]
+
+Upstream-Status: Submitted [https://github.com/diamon/minicoredumper/pull/3]
+
+[1] https://man7.org/linux/man-pages/man3/pthread_mutexattr_setrobust_np.3.html
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/minicoredumper_regd/daemon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/minicoredumper_regd/daemon.c b/src/minicoredumper_regd/daemon.c
+index 115ec92..b9ad1ea 100644
+--- a/src/minicoredumper_regd/daemon.c
++++ b/src/minicoredumper_regd/daemon.c
+@@ -224,7 +224,7 @@ static int setup_shm(void)
+ 
+ 	pthread_mutexattr_init(&attr);
+ 	pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
+-	pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP);
++	pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST);
+ 	pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
+ 	pthread_mutex_init(&sh->m, &attr);
+ 
+-- 
+2.31.1
+
diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb
index d381c83..6a04e78 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb
+++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb
@@ -14,6 +14,7 @@
 PR .= "+git${SRCPV}"
 
 SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https \
+           file://0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch \
            file://minicoredumper.service \
            file://minicoredumper.init \
            "
diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch
new file mode 100644
index 0000000..3355727
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch
@@ -0,0 +1,51 @@
+From 9bbc991a927722439cad38c892fc9f57207089d3 Mon Sep 17 00:00:00 2001
+From: Liwei Song <liwei.song@windriver.com>
+Date: Mon, 24 May 2021 08:27:28 +0000
+Subject: [PATCH] sleepgraph.py: parse unfished cpu exec line
+
+exist the below case in ftrace file:
+sleepgraph-6508    [003] .... 18197.824037: tracing_mark_write: ps - xxx..., lock_torture_wr-94 169,lock_torture_wr-95 143,lock_tort
+sleepgraph-6508    [003] .... 18197.824043: tracing_mark_write: ure_wr-96 189,lock_torture_wr-97 174,lock_torture_wr-98 160,lock_torture_st-99 1
+
+lock_torture_wr-96 was split to different line due to limited buffer
+size(1k) set in kernel, check this case and re-parse the unfinished
+line.
+
+Upstream-Status: [Submitted: https://github.com/intel/pm-graph/pull/20]
+
+Signed-off-by: Liwei Song <liwei.song@windriver.com>
+---
+ sleepgraph.py | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/sleepgraph.py b/sleepgraph.py
+index e340d5b3f03b..38b4439db8eb 100755
+--- a/sleepgraph.py
++++ b/sleepgraph.py
+@@ -3365,8 +3365,21 @@ def parseTraceLog(live=False):
+ 					val = ps.split()
+ 					if not val:
+ 						continue
+-					name = val[0].replace('--', '-')
+-					proclist[name] = int(val[1])
++					if not len(val) < 2:
++						name = val[0].replace('--', '-')
++						proclist[name] = int(val[1])
++					else:
++						proclist = dict()
++						nextline = next(tf)
++						mcont = re.match(tp.ftrace_line_fmt, nextline)
++						n = m.group('ps') + mcont.group('msg').split(': ')[1]
++						for pscont in n.split(','):
++							val = pscont.split()
++							if not val:
++								continue
++							if not len(val) < 2:
++								name = val[0].replace('--', '-')
++								proclist[name] = int(val[1])
+ 				data.pstl[t.time] = proclist
+ 				continue
+ 		# find the end of resume
+-- 
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb
index 4526eee..4d7a1b2 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb
+++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb
@@ -10,6 +10,7 @@
            file://0001-Makefile-fix-multilib-build-failure.patch \
            file://0001-sleepgraph.py-use-python3.patch \
            file://0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch \
+           file://0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb
index d39afff..906ca2c 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb
+++ b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb
@@ -12,6 +12,8 @@
 
 do_install() {
        oe_runmake etcdir=${sysconfdir} DESTDIR=${D} install
+       mkdir -p ${D}${libdir}/traceevent/plugins/${BPN}
+       mv ${D}/${libdir}/traceevent/plugins/*.so ${D}${libdir}/traceevent/plugins/${BPN}/
 }
 
 FILES_${PN} += "${libdir}/traceevent/plugins"