meta-openembedded: subtree update:e0daf6f8e0..3a9262866d

Adrian Bunk (1):
      xfce-polkit: Upgrade 0.2 -> 0.3

Alex Kiernan (2):
      ostree: Add support for ptest
      ostree: Upgrade 2019.4 -> 2019.5

Alistair Francis (1):
      openocd: Update to latest git version

Anders Roxell (1):
      s-suite: install missing create_config.sh

Andreas Müller (6):
      mm-common: upgrade 0.9.12 -> 1.0.0 / meson build / add SUMMARY
      mm-common: do really build with meson
      libpeas: upgrade 1.22.0 -> 1.24.1
      xfce4-screenshooter: upgrade 1.9.6 -> 1.9.7
      xfce4-time-out-plugin: upgrade 1.0.3 -> 1.1.0
      xfce4-whiskermenu-plugin: upgrade 2.3.3 -> 2.3.4

Andreas Oberritter (4):
      haveged: Fix missing initscript when both systemd and sysvinit are enabled
      samba: fix installation for minimal build
      autofs: set some paths for configure script
      autofs: install sysvinit script manually if systemd is enabled

André Draszik (8):
      jansson: allow to build a -native package
      cunit: allow to build a -native package
      libev: allow to build a -native package
      nghttp2: fix UPSTREAM_CHECK_URI
      nghttp2: update to 1.39.2
      nghttp2: build more of this & fix packaging
      nghttp2: allow to build a -native package
      nodejs: allow use of system nghttp2

Hongxu Jia (10):
      python-pluggy: add python-importlib-metadata to RDEPENDS
      python-more-itertools.inc: fix python2 package not incorrectly generated
      python-more-itertools: downgrade 7.2.0 -> 5.0.0
      python-importlib-metadata: add missing runtime depends
      python-pathlib2: add python-scandir and python-misc to runtime depends
      python-scandir: add version 1.10.0
      python-contextlib2/python3-contextlib2: add version 0.6.0
      python3-importlib-metadata: add python3-misc to runtime depends
      python-importlib-metadata: add python-compression to runtime depends
      python-configparser: add python-pkgutil to runtime depends

Kai Kang (4):
      xfce4-genmon-plugin: 4.0.1 -> 4.0.2
      xfce-panel-plugin.bbclass: correct SRC_URI with xfce_verdir
      xfce4-weather-plugin: 0.9.1 -> 0.10.0
      xfce4-screensaver: 0.1.5 -> 0.1.8

Khem Raj (8):
      iwd: Fix installed-vs-shipped QA errors on systemd units
      iwd: Fix build race during documentation build
      ifplugd: Include stdint.h for uintXX_t
      netkit-rwho: Include stdint.h for int32_t
      libowfat: Fix parallel build
      grpc: Add dep on libnsl
      gtkwave: Upgrade to 3.3.102
      syslog-ng: Do not install non-existing systemd file

Ming Liu (2):
      python-jsonschema: RDEPENDS on python-importlib-metadata
      ostree: fix some invalid condition checking

Oleksandr Kravchuk (1):
      iwd: update to 1.0

Stefan Agner (2):
      zstd: Upgrade 1.4.3 -> 1.4.4
      zstd: move recipe to oe-core

Yi Zhao (2):
      libldb: upgrade 1.5.5 -> 1.5.6
      samba: upgrade 4.10.8 -> 4.10.10

Zang Ruochen (20):
      python-pyjks: upgrade 17.1.1 -> 19.0.0
      python-pyjwt: upgrade 1.6.4 -> 1.7.1
      python-pymisp: upgrade 2.4.93 -> 2.4.117.2
      xorriso: upgrade 1.5.0 -> 1.5.3
      python-cython: upgrade 0.29.13 -> 0.29.14
      python-decorator: upgrade 4.4.0 -> 4.4.1
      python-dominate: upgrade 2.3.1 -> 2.4.0
      python-flask-babel: upgrade 0.11.2 -> 0.12.2
      python-flask-migrate: upgrade 2.2.1 -> 2.5.2
      python-flask-restful: upgrade 0.3.6 -> 0.3.7
      python-flask-socketio: upgrade 3.3.2 -> 4.2.1
      python-flask-sqlalchemy: upgrade 2.3.2 -> 2.4.1
      python-paho-mqtt: upgrade 1.4.0 -> 1.5.0
      python-pyroute2: upgrade 0.5.2 -> 0.5.7
      python-pyrsistent: upgrade 0.15.4 -> 0.15.5
      python-pysmi: upgrade 0.2.2 -> 0.3.4
      python-pytest: upgrade 5.2.1 -> 5.2.2
      python-serpent: upgrade 1.25 -> 1.28
      python-smbus: upgrade 4.0 -> 4.1
      python-snimpy: upgrade 0.8.12 -> 0.8.13

Zheng Ruoqin (19):
      mdns: upgrade 878.200.35 -> 878.260.1
      ledmon: Modify the Upstream-Status to Submitted.
      byacc: upgrade 20190617 -> 20191103
      ccid: upgrade 1.4.30 -> 1.4.31
      dialog: upgrade 1.3-20190728 -> 1.3-20190808
      cryptsetup: upgrade 2.2.1 -> 2.2.2
      lvm2/libdevmapper: 2.03.05 -> 2.03.06
      libssh2: upgrade 1.8.2 -> 1.9.0
      mariadb: upgrade 10.3.16 -> 10.3.18
      mcelog: upgrade 164 -> 165
      mce-test: Update to latest git version
      postgresql: upgrade 11.5 -> 12.0
      protobuf: upgrade 3.10.0 -> 3.10.1
      sshfs-fuse: upgrade 3.5.2 -> 3.6.0
      syslog-ng: upgrade 3.19.1 -> 3.24.1
      tslib: upgrade 1.16 -> 1.21
      xkbprint: upgrade 1.0.4 -> 1.0.5
      xterm: upgrade 349 -> 350
      zabbix: upgrade 4.2.7 -> 4.2.8

Zhixiong Chi (1):
      gtkwave: add the libtirpc dependence and config

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

2 files changed, 4 insertions, 64 deletions

diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch
deleted file mode 100644
index c80d9f19f8..0000000000
--- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From bee22f143ffa0457aefcf31053f76416e6d242e5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 20 May 2019 23:24:26 -0700
-Subject: [PATCH] esirisc_flash: Rename PAGE_SIZE to FLASH_PAGE_SIZE
-
-PAGE_SIZE is defined in system includes on some systems, this would
-avoid the unintended conflict
-
-Fixes
-| src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined [-Werror,-Wmacro-redefined]
-| #define PAGE_SIZE                       4096
-|         ^
-| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu
-de/limits.h:89:9: note: previous definition is here
-| #define PAGE_SIZE PAGESIZE
-
-Upstream-Status: Submitted [http://openocd.zylin.com/#/c/5180/2]
-Change-Id: I195b303fc88a7c848ca4e55fd6ba893796df55cc
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/flash/nor/esirisc_flash.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/flash/nor/esirisc_flash.c b/src/flash/nor/esirisc_flash.c
-index 4e33b942..3bed0658 100644
---- a/src/flash/nor/esirisc_flash.c
-+++ b/src/flash/nor/esirisc_flash.c
-@@ -92,7 +92,7 @@
- #endif
- 
- #define CONTROL_TIMEOUT		5000		/* 5s    */
--#define PAGE_SIZE			4096
-+#define FLASH_PAGE_SIZE		4096
- #define PB_MAX				32
- 
- #define NUM_NS_PER_S		1000000000ULL
-@@ -264,7 +264,7 @@ static int esirisc_flash_erase(struct flash_bank *bank, int first, int last)
- 	(void)esirisc_flash_disable_protect(bank);
- 
- 	for (int page = first; page < last; ++page) {
--		uint32_t address = page * PAGE_SIZE;
-+		uint32_t address = page * FLASH_PAGE_SIZE;
- 
- 		target_write_u32(target, esirisc_info->cfg + ADDRESS, address);
- 
-@@ -464,8 +464,8 @@ static int esirisc_flash_probe(struct flash_bank *bank)
- 	if (target->state != TARGET_HALTED)
- 		return ERROR_TARGET_NOT_HALTED;
- 
--	bank->num_sectors = bank->size / PAGE_SIZE;
--	bank->sectors = alloc_block_array(0, PAGE_SIZE, bank->num_sectors);
-+	bank->num_sectors = bank->size / FLASH_PAGE_SIZE;
-+	bank->sectors = alloc_block_array(0, FLASH_PAGE_SIZE, bank->num_sectors);
- 
- 	retval = esirisc_flash_init(bank);
- 	if (retval != ERROR_OK) {
--- 
-2.21.0
-
diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb
index 241b4baa33..9ec77fdc4d 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb
@@ -9,22 +9,21 @@ SRC_URI = " \
     git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \
     git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \
     git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \
-    file://0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch \
     file://0001-Do-not-include-syscrtl.h-with-glibc.patch \
 "
 
 SRCREV_FORMAT = "openocd"
-SRCREV_openocd = "7ee618692f56b0efea864890da45d73d28e393d9"
+SRCREV_openocd = "ded67990255cc1e63c77832ffd6e6bef9120873d"
 SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba"
-SRCREV_jimtcl = "a9bf5975fd0f89974d689a2d9ebd0873c8d64787"
-SRCREV_libjaylink = "8645845c1abebd004e991ba9a7f808f4fd0c608b"
+SRCREV_jimtcl = "dc4ba7770d580800634f90b67a24e077b4a26d98"
+SRCREV_libjaylink = "cfccbc9d6763733f1d14dff3c2dc5b75aaef136b"
 
 PV = "0.10+gitr${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools-brokensep gettext
 
-BBCLASSEXTEND += "nativesdk"
+BBCLASSEXTEND += "native nativesdk"
 
 EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html --disable-werror"