meta-openembedded: subtree update:164a6030b0..f623d8b574
Adrian Freihofer (1):
paho-mqtt-c: upgrade 1.3.6 -> 1.3.7
Alexander Kamensky (2):
makedumpfile: add PACKAGECONFIG options for lzo and snappy compression
makedumpfile: upgrade 1.6.7 -> 1.6.8
Alexander Kanavin (4):
collect: do not build with -Werror
libsigrokdecode: add python 3.9 support
python3-mprpc: remove the recipe
gnome-calendar: update to 3.38.1, add libhandy 1.x support
Anatol Belski (1):
chrony: Patch CVE-2020-14367
Bartosz Golaszewski (1):
libgpiod: update v1.4.4 -> v1.4.5
Beni (1):
unbound: upgrade to 1.12.0
Gregory Anders (5):
Add suitesparse
Add python3-transitions
Add python3-dill
Add python3-cerberus
Add python3-cvxopt
Hongxu Jia (1):
lvm2.inc: switch branch master to main
Jasper Orschulko (1):
upgrade and de-blacklist nanopb recipe
Jose Quaresma (3):
spirv-tools: moved into OE-core, delete from meta-oe
srt: add receipe
opencv: Update 4.4.0 -> 4.5.0
Kai Kang (4):
xfce4-cpufreq-plugin: 1.2.1 -> 1.2.2
xfce4-weather-plugin: 0.10.1 -> 0.10.2
xfce4-mailwatch-plugin: 1.2.0 -> 1.3.0
tumbler: 0.2.9 -> 0.3.1
Khem Raj (71):
nodejs: Fix arm32/thumb builds with clang
nodejs: Update to 12.19.0
redis: Fix build on 32bit targets and clang
gperftools: Fix build with new musl updates
minifi-cpp: Fix build with riscv64/clang
graphviz: Upgrade to 2.44.1 release
musl-nscd: Update to latest
remmina: Update to 1.4.8
mdbus2: Fix build with vala 0.50
ibus: Update to 1.5.3 plus fix for vala 0.50
networkd-dispatcher: Upgrade to 2.1
geoclue: Use git fetcher
kernel-selftest: Disable vm packageconfig for riscv
layer.conf: Add hardknott to LAYERSERIES_COMPAT
fmt: Upgrade to 7.1.2
lksctp-tools: Update to latest master
fuse3: Upgrade to 3.10.0
rdma-core: Upgrade to 31.1
opengl-es-cts: Disable LTO
fluentbit: Disable LTO
traceroute: Fix build with LTO
cmocka: Fix buils with LTO
dovecot: Disable LTO
redis-plus-plus: Upgrade to 1.2.1
suitesparse: Exclude from world
python3-icu: Update to 2.6
meta-python: Drop RDEPEND'ing on python3-typing
python3-cvxopt: Exclude from world builds
packagegroup-meta-multimedia: Add srt
gedit: Inherit python3targetconfig
gmime: Fix append to do_configure
dconf: Add leading whitespace for append operator
kexec-tools-klibc: Add leading whitespace for append operator
spice: Add leading whitespace for append operator
meta-oe: Add leading whitespace for append operator
libgusb: Update to 0.3.5
botan: Mark incompatible with riscv32
projucer: Link with libatomic on rv32
mariadb: Fix build on 32bit arches with 64bit time_t
liburing: Fix build on 32-bit arches with 64-bit time_t
librtorrent: Disable instrumentation on rv32
ntopng: Link with libatomic on rv32
poco: Add riscv32 support
capnproto: Fix build on 32bit arches with 64bit time_t defaults
directfb: Fix build on riscv32
opensaf: Fix build on 32bit arches with 64bit time_t e.g. RISCV-32
rocksdb: Update to 6.12.7
qpdf: Link with libatomic on rv32
libkcapi: Fix build on riscv32
jack: Upgrade to 1.19.16
vlc: Fix build on riscv32
fluentbit: Link with libatomic on riscv32
openipmi: Inherit python3targetconfig
libplist: Inherit python3targetconfig
postgresql: Inherit python3targetconfig
python-grpcio-tools: Add missing space for append
python3-pykwalify: Do not unset _PYTHON_SYSCONFIGDATA_NAME
thingsboard-gateway: Move under dynamic layers
musl-nscd: Replace -fcommon with code patch
musl-nscd: Add missing deps on flex and bison during build
python3-pytest: Upgrade to 6.1.2
python3-hypothesis: Add recipe
python3-sortedcontainers: Add recipe
heaptrack: Fix build on musl
heaptrack: Mark RISCV host incompatible
packagegroup-meta-oe: Exclude heaptrack for rv32/rv64
chrony: Upgrade to 4.0
canutils,can-utils: Add cansequence to u-a as well
packagegroup-meta-python: Add newly added recipes to packagegroup-meta-python3
pipewire: Link with libatomic for riscv32
python3-matplotlib: Disable LTO for clang/riscv
Kory Maincent (1):
libftdi: add swig-native to dependencies
Leon Anavi (37):
python3-luma-oled: Upgrade 3.6.0 -> 3.7.0
python3-cryptography-vectors: Upgrade 3.1.1 -> 3.2
python3-pyexpect: Upgrade 1.0.20 -> 1.0.21
python3-markdown: Upgrade 3.3.2 -> 3.3.3
python3-sh: Upgrade 1.14.0 -> 1.14.1
python3-kiwisolver: Upgrade 1.2.0 -> 1.3.0
python3-aiohttp: Upgrade 3.7.1 -> 3.7.2
python3-aiofiles: Upgrade 0.5.0 -> 0.6.0
python3-regex: Upgrade 2020.10.23 -> 2020.10.28
python3-dateparser: Upgrade 0.7.6 -> 1.0.0
python3-langtable: Upgrade 0.0.53 -> 0.0.54
python3-kiwisolver: Upgrade 1.3.0 -> 1.3.1
python3-tornado: Upgrade 6.0.4 -> 6.1
python3-ipython: Upgrade 7.18.1 -> 7.19.0
python3-cmd2: Upgrade 1.3.11 -> 1.4.0
python3-dill: Upgrade 0.3.2 -> 0.3.3
python3-colorlog: Upgrade 4.4.0 -> 4.6.2
python3-pandas: Upgrade 1.1.3 -> 1.1.4
python3-attrs: 20.2.0 -> 20.3.0
python3-gmqtt: Upgrade 0.6.7 -> 0.6.8
python3-diskcache: Upgrade 5.0.3 -> 5.1.0
python3-croniter: Upgrade 0.3.35 -> 0.3.36
python3-bitarray: Upgrade 1.6.0 -> 1.6.1
python3-certifi: Upgrade 2020.6.20 -> 2020.11.8
python3-cantools: Upgrade 35.3.0 -> 35.5.0
python3-arpeggio: Upgrade 1.9.2 -> 1.10.1
python3-toml: Upgrade 0.10.1 -> 0.10.2
python3-pyrad: Upgrade 2.3 -> 2.4
python3-bitstruct: Upgrade 8.11.0 -> 8.11.1
python3-yarl: Upgrade 1.6.2 -> 1.6.3
python3-luma-core: Upgrade 1.17.3 -> 2.0.1
python3-luma-oled: Upgrade 3.7.0 -> 3.8.1
python3-fastnumbers: Upgrade 3.0.0 -> 3.1.0
python3-ansi2html: Upgrade 1.5.2 -> 1.6.0
python3-prettytable: Upgrade 1.0.1 -> 2.0.0
python3-urllib3: Upgrade 1.25.11 -> 1.26.2
python3-transitions: Upgrade 0.8.4 -> 0.8.5
Li Zhou (1):
ptpd: Solve memory leak for function NTPDCrequest
Maciej Pijanowski (2):
cdrkit: add native to BBCLASSEXTEND
cdrkit: split into more packages
Mark Jonas (5):
mbedtls: Fix typo in PACKAGECONFIG
python3-pyinotify: Add missing ctypes dependency
libsocketcan: Add PACKAGECONFIG options
libsocketcan: Update to 0.0.12
imagemagick: Add NOTICE to collected license texts
Max Kellermann (1):
php: remove the failing ${D}/${TMPDIR} code
Mingli Yu (6):
ndpi: add new recipe
libmaxminddb: add new recipe
ntopng: add new recipe
ntop: remove the recipe
packagegroup-meta-networking.bb: add ntopng related recipes
traceroute: set VPATH
Nick Rosbrook (3):
strongswan: add some PACKAGECONFIG options for EAP
strongswan: do not use deprecated stroke and starter by default
strongswan: remove ldap from default PACKAGECONFIG
Pierre-Jean Texier (1):
inotify-tools: upgrade 3.20.2.2 -> 3.20.11.0
Randy Witt (1):
numactl: Remove the recipe
Ricardo Salveti (3):
wireguard-module: upgrade 1.0.20200712 -> 1.0.20200908
wireguard-tools: upgrade 1.0.20200513 -> 1.0.20200827
wireguard-module: upgrade 1.0.20200908 -> 1.0.20201112
Sakib Sajal (1):
libssh2: fix ptest
Sinan Kaya (3):
collectd: fix the test condition for dash compatibility
heaptrack: add bitbake recipe
cpp-netlib: add bitbake recipe
Tim Orling (16):
python3-atomicwrites: drop (moved to oe-core)
python3-attrs: drop (moved to oe-core)
python3-iniconfig: drop (moved to oe-core)
python3-more-itertools: drop (moved to oe-core)
python3-pathlib2: drop (moved to oe-core)
python3-toml: drop (moved to oe-core)
python3-py: drop (moved to oe-core)
python3-setuptools-scm: drop (moved to oe-core)
python3-packaging: drop (moved to oe-core)
python3-wcwidth: drop (moved to oe-core)
python3-zipp: drop (moved to oe-core)
python3-importlib-metadata: drop (moved to oe-core)
python3-pluggy: drop (moved to oe-core)
python3-pytest: drop (moved to oe-core)
python3-hypothesis: drop (moved to oe-core)
python3-sortedcontainers: drop (moved to oe-core)
Trevor Gamblin (2):
python3-jinja2: Fix ptest RDEPENDS and file installation
python3-markupsafe: Fix ptest RDEPENDS and installation
William A. Kennington III (1):
span-lite: Bump e03d116..0.8.1
Yi Zhao (5):
minifi-cpp: specify GCC_AR and GCC_RANLIB
quagga: unify volatiles file name
minifi-cpp: depend on nettle and lz4
nss: upgrade 3.57 -> 3.59
krb5: upgrade 1.17.1 -> 1.17.2
Zang Ruochen (19):
libnftnl: upgrade 1.1.7 -> 1.1.8
xfsprogs: upgrade 5.8.0 -> 5.9.0
radvd: upgrade 2.18 -> 2.19
fmt: upgrade 7.0.3 -> 7.1.0
hidapi: upgrade 0.9.0 -> 0.10.0
libkcapi: upgrade 1.2.0 -> 1.2.1
modemmanager: upgrade 1.14.2 -> 1.14.6
nvme-cli: upgrade 1.12 -> 1.13
ostree: upgrade 2020.6 -> 2020.7
poppler-data: upgrade 0.4.9 -> 0.4.10
nftables: upgrade 0.9.6 -> 0.9.7
toybox: upgrade 0.8.3 -> 0.8.4
fbgrab: upgrade 1.3.3 -> 1.4
mraa: upgrade 2.1.0 -> 2.2.0
opensaf: upgrade 5.20.05 -> 5.20.08
openvpn: upgrade 2.4.9 -> 2.5.0
poppler: upgrade 20.10.0 -> 20.11.0
tmux: upgrade 3.1b -> 3.1c
xmlsec1: upgrade 1.2.30 -> 1.2.31
changqing.li@windriver.com (1):
thin-provisioning-tools: switch branch from master to main
hasan.men (2):
thingsboard-gateway: Add recipe for v2.5.2
python3-jsonpath-rw: Add recipe for v1.4.0
richard (1):
poco: Upgrade 1.9.4 -> 1.10.1
viatsk (1):
tcpdump: Patch for CVE-2020-8037
zangrc (27):
sshfs-fuse: upgrade 3.7.0 -> 3.7.1
can-utils: upgrade 2020.02.04 -> 2020.11.0
hwdata: upgrade 0.340 -> 0.341
libio-pty-perl: upgrade 1.14 -> 1.15
live555: upgrade 20200819 -> 20201105
zile: upgrade 2.4.14 -> 2.4.15
rdma-core: upgrade 31.1 -> 32.0
strongswan: upgrade 5.8.4 -> 5.9.1
fio: upgrade 3.22 -> 3.24
libharu: Fix the packaging bug
modemmanager: upgrade 1.14.6 -> 1.14.8
openldap: upgrade 2.4.51 -> 2.4.56
protobuf: upgrade 3.13.0.1 -> 3.14.0
nghttp2: upgrade 2.41.0 -> 2.42.0
nngpp: upgrade 1.2.4 -> 1.3.0
snort: upgrade 2.9.16.1 -> 2.9.17
weechat: upgrade 2.9 -> 3.0
cjson: upgrade 1.7.13 -> 1.7.14
cloc: upgrade 1.84 -> 1.88
jpnevulator: upgrade 2.3.5 -> 2.3.6
libjcat: upgrade 0.1.3 -> 0.1.4
libsigc++-3: upgrade 3.0.3 -> 3.0.6
ocl-icd: upgrade 2.2.12 -> 2.2.13
opencl-clhpp: upgrade 2.0.11 -> 2.0.12
ostree: upgrade 2020.7 -> 2020.8
pkcs11-helper: upgrade 1.26 -> 1.27
netplan: upgrade 0.99 -> 0.100
zhengruoqin (1):
dnf-plugin-tui: Update to the latest version
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I286bb6d58bf30588516b35ec06ddfd0bedee2e64
diff --git a/meta-openembedded/meta-filesystems/conf/layer.conf b/meta-openembedded/meta-filesystems/conf/layer.conf
index 47c9906..343f520 100644
--- a/meta-openembedded/meta-filesystems/conf/layer.conf
+++ b/meta-openembedded/meta-filesystems/conf/layer.conf
@@ -15,4 +15,4 @@
LAYERDEPENDS_filesystems-layer = "core openembedded-layer"
-LAYERSERIES_COMPAT_filesystems-layer = "gatesgarth"
+LAYERSERIES_COMPAT_filesystems-layer = "gatesgarth hardknott"
diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.1.bb
similarity index 92%
rename from meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb
rename to meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.1.bb
index 47c9a64..1db3284 100644
--- a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.0.bb
+++ b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.1.bb
@@ -7,7 +7,7 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/libfuse/sshfs"
-SRCREV = "a7e1038203c856cc7e052d439d1da49fe131339f"
+SRCREV = "8059e2ce630dd2b984f7a6c44a2b5291b0fe2abc"
S = "${WORKDIR}/git"
inherit meson ptest
diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.3.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.0.bb
similarity index 94%
rename from meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.3.bb
rename to meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.0.bb
index 8ef9ee1..c8680d9 100644
--- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.3.bb
+++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.0.bb
@@ -13,7 +13,7 @@
SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \
"
-SRC_URI[sha256sum] = "cd45270a064d2ae14f17cfc914f1555106d6c5091025b0b2698b860399d4ede6"
+SRC_URI[sha256sum] = "26517954567f237a7dbcb532755ba0d2c77575c5d90db7566b6e40ec05b0a039"
S = "${WORKDIR}/fuse-${PV}"
diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.8.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.9.0.bb
similarity index 96%
rename from meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.8.0.bb
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.9.0.bb
index b02ec6f..48d15cc 100644
--- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.8.0.bb
+++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.9.0.bb
@@ -12,7 +12,7 @@
file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \
file://0001-support-usrmerge.patch \
"
-SRC_URI[sha256sum] = "8ef46ed9e6bb927f407f541dc4324857c908ddf1374265edc910d23724048c6b"
+SRC_URI[sha256sum] = "bc5c805596bc609a18dc1f1b4ed6a2821dba9f47408ec00e7799ceea1b2097f1"
inherit autotools-brokensep
PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle"
diff --git a/meta-openembedded/meta-gnome/conf/layer.conf b/meta-openembedded/meta-gnome/conf/layer.conf
index ac581e6..5e92cdb 100644
--- a/meta-openembedded/meta-gnome/conf/layer.conf
+++ b/meta-openembedded/meta-gnome/conf/layer.conf
@@ -17,7 +17,7 @@
LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer"
-LAYERSERIES_COMPAT_gnome-layer = "gatesgarth"
+LAYERSERIES_COMPAT_gnome-layer = "gatesgarth hardknott"
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\
faenza-icon-theme->gdk-pixbuf \
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb
index 9146726..4b924d8 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb
@@ -15,7 +15,7 @@
# I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
EXTRA_OEMESON = "-Dman=false"
# no bash-completion for native
-EXTRA_OEMESON_append_class-native = "-Dbash_completion=false"
+EXTRA_OEMESON_append_class-native = " -Dbash_completion=false"
FILES_${PN} += " \
${datadir}/dbus-1 \
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb
index 506bd11..b20f204 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb
@@ -16,7 +16,7 @@
tepl \
"
-inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check upstream-version-is-even mime-xdg
+inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check upstream-version-is-even mime-xdg python3targetconfig
REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/files/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/files/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch
new file mode 100644
index 0000000..eabf61a
--- /dev/null
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/files/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch
@@ -0,0 +1,242 @@
+From 8be361b6ce8f0f8053e1609decbdbdc164ec8448 Mon Sep 17 00:00:00 2001
+From: Evangelos Ribeiro Tzaras <devrtz@fortysixandtwo.eu>
+Date: Sat, 5 Sep 2020 02:06:34 +0200
+Subject: [PATCH] project: Switch to libhandy-1
+
+This commit updates the dependencies for libhandy to the tagged 1.0
+release and changes the code to accomodate the changes from
+libhandy-0 to libhandy-1.
+
+Notable changes:
+edit-dialog: HdyDialog has been dropped in [1]
+alarm-row: action child type in HdyActionRow has been removed.
+
+[1] https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/434
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ build-aux/flatpak/org.gnome.Calendar.json | 4 ++--
+ meson.build | 2 +-
+ src/gui/gcal-alarm-row.c | 2 +-
+ src/gui/gcal-alarm-row.ui | 2 +-
+ src/gui/gcal-application.c | 4 ++++
+ src/gui/gcal-edit-dialog.c | 4 ++--
+ src/gui/gcal-edit-dialog.h | 3 +--
+ src/gui/gcal-edit-dialog.ui | 20 ++++++++++----------
+ 8 files changed, 22 insertions(+), 19 deletions(-)
+
+diff --git a/build-aux/flatpak/org.gnome.Calendar.json b/build-aux/flatpak/org.gnome.Calendar.json
+index 18893ad6..0772ca8d 100644
+--- a/build-aux/flatpak/org.gnome.Calendar.json
++++ b/build-aux/flatpak/org.gnome.Calendar.json
+@@ -174,8 +174,8 @@
+ "sources" : [
+ {
+ "type" : "git",
+- "url" : "https://source.puri.sm/Librem5/libhandy.git",
+- "branch" : "libhandy-0-0"
++ "url" : "https://gitlab.gnome.org/GNOME/libhandy.git",
++ "tag" : "1.0.0"
+ }
+ ]
+ },
+diff --git a/meson.build b/meson.build
+index 2a546252..b81b95c9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -165,7 +165,7 @@ libedataserver_dep = dependency('libedataserver-1.2', version: '>= 3.17.1')
+ libecal_dep = dependency('libecal-2.0', version: '>= 3.33.2')
+ libsoup_dep = dependency('libsoup-2.4')
+ libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.33.1')
+-libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.9')
++libhandy_dep = dependency('libhandy-1', version: '>= 1.0.0')
+ glib_dep = dependency('glib-2.0', version: '>= 2.58.0')
+ gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.20')
+ gio_dep = dependency('gio-2.0', version: '>= 2.58.0')
+diff --git a/src/gui/gcal-alarm-row.c b/src/gui/gcal-alarm-row.c
+index 1f95426c..1ada82f4 100644
+--- a/src/gui/gcal-alarm-row.c
++++ b/src/gui/gcal-alarm-row.c
+@@ -214,7 +214,7 @@ setup_alarm (GcalAlarmRow *self)
+ duration = e_cal_component_alarm_trigger_get_duration (trigger);
+ formatted_duration = format_alarm_duration (duration);
+
+- hdy_action_row_set_title (HDY_ACTION_ROW (self), formatted_duration);
++ hdy_preferences_row_set_title (HDY_PREFERENCES_ROW (self), formatted_duration);
+
+ action = e_cal_component_alarm_get_action (self->alarm);
+ gtk_toggle_button_set_active (self->volume_button, action == E_CAL_COMPONENT_ALARM_AUDIO);
+diff --git a/src/gui/gcal-alarm-row.ui b/src/gui/gcal-alarm-row.ui
+index 7d416c4c..bca8af50 100644
+--- a/src/gui/gcal-alarm-row.ui
++++ b/src/gui/gcal-alarm-row.ui
+@@ -3,7 +3,7 @@
+ <template class="GcalAlarmRow" parent="HdyActionRow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <child type="action">
++ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+diff --git a/src/gui/gcal-application.c b/src/gui/gcal-application.c
+index b9d46cec..591b95c8 100644
+--- a/src/gui/gcal-application.c
++++ b/src/gui/gcal-application.c
+@@ -34,6 +34,7 @@
+ #include <glib-object.h>
+ #include <gio/gio.h>
+ #include <glib/gi18n.h>
++#include <handy.h>
+
+ struct _GcalApplication
+ {
+@@ -446,6 +447,9 @@ gcal_application_startup (GApplication *app)
+ if ((g_application_get_flags (app) & G_APPLICATION_IS_SERVICE) != 0)
+ g_application_set_inactivity_timeout (app, 3 * 60 * 1000);
+
++ /* initialize libhandy */
++ hdy_init();
++
+ GCAL_EXIT;
+ }
+
+diff --git a/src/gui/gcal-edit-dialog.c b/src/gui/gcal-edit-dialog.c
+index ae2b6714..5494a700 100644
+--- a/src/gui/gcal-edit-dialog.c
++++ b/src/gui/gcal-edit-dialog.c
+@@ -47,7 +47,7 @@
+
+ struct _GcalEditDialog
+ {
+- HdyDialog parent;
++ GtkDialog parent;
+
+ gboolean writable;
+
+@@ -133,7 +133,7 @@ static void on_location_entry_changed_cb (GtkEntry
+ static void on_add_alarm_button_clicked_cb (GtkWidget *button,
+ GcalEditDialog *self);
+
+-G_DEFINE_TYPE (GcalEditDialog, gcal_edit_dialog, HDY_TYPE_DIALOG)
++G_DEFINE_TYPE (GcalEditDialog, gcal_edit_dialog, GTK_TYPE_DIALOG)
+
+ enum
+ {
+diff --git a/src/gui/gcal-edit-dialog.h b/src/gui/gcal-edit-dialog.h
+index e4f44ec5..a557916b 100644
+--- a/src/gui/gcal-edit-dialog.h
++++ b/src/gui/gcal-edit-dialog.h
+@@ -22,7 +22,6 @@
+ #include "gcal-event.h"
+ #include "gcal-manager.h"
+
+-#include <handy.h>
+
+ G_BEGIN_DECLS
+
+@@ -32,7 +31,7 @@ G_BEGIN_DECLS
+
+ #define GCAL_TYPE_EDIT_DIALOG (gcal_edit_dialog_get_type ())
+
+-G_DECLARE_FINAL_TYPE (GcalEditDialog, gcal_edit_dialog, GCAL, EDIT_DIALOG, HdyDialog);
++G_DECLARE_FINAL_TYPE (GcalEditDialog, gcal_edit_dialog, GCAL, EDIT_DIALOG, GtkDialog);
+
+ GtkWidget* gcal_edit_dialog_new (void);
+
+diff --git a/src/gui/gcal-edit-dialog.ui b/src/gui/gcal-edit-dialog.ui
+index a36d8ae6..c28c22bb 100644
+--- a/src/gui/gcal-edit-dialog.ui
++++ b/src/gui/gcal-edit-dialog.ui
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <interface>
+- <template class="GcalEditDialog" parent="HdyDialog">
++ <template class="GcalEditDialog" parent="GtkDialog">
+ <property name="can_focus">False</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+@@ -156,7 +156,7 @@
+ <property name="title" translatable="yes">Title</property>
+ <property name="activatable-widget">summary_entry</property>
+
+- <child type="action">
++ <child>
+ <object class="GtkEntry" id="summary_entry">
+ <property name="visible">True</property>
+ <property name="valign">center</property>
+@@ -177,7 +177,7 @@
+ <property name="title" translatable="yes">Location</property>
+ <property name="activatable-widget">location_entry</property>
+
+- <child type="action">
++ <child>
+ <object class="GtkEntry" id="location_entry">
+ <property name="visible">True</property>
+ <property name="valign">center</property>
+@@ -226,7 +226,7 @@
+ <property name="title" translatable="yes">All Day</property>
+ <property name="activatable-widget">all_day_switch</property>
+
+- <child type="action">
++ <child>
+ <object class="GtkSwitch" id="all_day_switch">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+@@ -246,7 +246,7 @@
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Starts</property>
+
+- <child type="action">
++ <child>
+ <object class="GtkLabel" id="event_start_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+@@ -294,7 +294,7 @@
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Ends</property>
+
+- <child type="action">
++ <child>
+ <object class="GtkLabel" id="event_end_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+@@ -343,7 +343,7 @@
+ <property name="title" translatable="yes">Repeat</property>
+ <property name="activatable-widget">repeat_combo</property>
+
+- <child type="action">
++ <child>
+ <object class="GtkComboBoxText" id="repeat_combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+@@ -372,7 +372,7 @@
+ <property name="title" translatable="yes">End Repeat</property>
+ <property name="activatable-widget">repeat_combo</property>
+
+- <child type="action">
++ <child>
+ <object class="GtkComboBoxText" id="repeat_duration_combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+@@ -397,7 +397,7 @@
+ <property name="title" translatable="yes">Number of Occurrences</property>
+ <property name="activatable-widget">number_of_occurrences_spin</property>
+
+- <child type="action">
++ <child>
+ <object class = "GtkSpinButton" id="number_of_occurrences_spin">
+ <property name="input_purpose">number</property>
+ <property name="input-hints">no-emoji</property>
+@@ -415,7 +415,7 @@
+ <property name="title" translatable="yes">End Repeat Date</property>
+ <property name="activatable-widget">until_date_selector</property>
+
+- <child type="action">
++ <child>
+ <object class = "GcalDateSelector" id="until_date_selector">
+ <property name="valign">center</property>
+ </object>
+--
+GitLab
+
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_3.38.1.bb
similarity index 77%
rename from meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_3.36.2.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_3.38.1.bb
index 4605857..67e251e 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_3.36.2.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_3.38.1.bb
@@ -22,7 +22,8 @@
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI[archive.sha256sum] = "d0b05345c0555a085e6e5426eab49494aba2826c856eb06fd7fdb762ec0c4c1f"
+SRC_URI += "file://8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch"
+SRC_URI[archive.sha256sum] = "7280880a082d631624d02a102dd547ceb59498da368311f3e49a06cff897f512"
FILES_${PN} += " \
${datadir}/gnome-shell \
diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc
index 1bbeb2c..ea413cf 100644
--- a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc
+++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc
@@ -5,7 +5,7 @@
inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala
-PV = "1.5.22"
+PV = "1.5.23+git${SRCPV}"
DEPENDS = "unicode-ucd"
@@ -13,7 +13,7 @@
git://github.com/ibus/ibus.git \
file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \
"
-SRCREV = "e3262f08b9e3efc57808700823b0622ec03a1b5f"
+SRCREV = "dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40"
S = "${WORKDIR}/git"
PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase"
diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
index 3701d19..aec9e7a 100644
--- a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
+++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
@@ -13,8 +13,6 @@
data/dconf/make-dconf-override-db.sh | 6 ------
1 file changed, 6 deletions(-)
-diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
-index 9c650e97..02fbf059 100755
--- a/data/dconf/make-dconf-override-db.sh
+++ b/data/dconf/make-dconf-override-db.sh
@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache"
@@ -28,12 +26,9 @@
# in case that schema is not installed on the system
glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD"
-@@ -46,5 +42,3 @@ for schema in $schemas; do
- done
-
+@@ -52,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then
+ umount $TMPDIR/cache/gvfs
+ fi
rm -rf $TMPDIR
-
-kill $DBUS_SESSION_BUS_PID
---
-2.20.1
-
diff --git a/meta-openembedded/meta-initramfs/conf/layer.conf b/meta-openembedded/meta-initramfs/conf/layer.conf
index 9752a5a..92df579 100644
--- a/meta-openembedded/meta-initramfs/conf/layer.conf
+++ b/meta-openembedded/meta-initramfs/conf/layer.conf
@@ -16,7 +16,7 @@
BBFILE_PRIORITY_meta-initramfs = "8"
LAYERDEPENDS_meta-initramfs = "core"
-LAYERSERIES_COMPAT_meta-initramfs = "gatesgarth"
+LAYERSERIES_COMPAT_meta-initramfs = "gatesgarth hardknott"
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
dracut->virtual/kernel \
diff --git a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb
index 7ad55d8..d28cfc9 100644
--- a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb
+++ b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb
@@ -68,7 +68,7 @@
CFLAGS_x86_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32"
CFLAGS_x86-64_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64"
CFLAGS_arm_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32"
-CFLAGS_aarch64_append = "${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64"
+CFLAGS_aarch64_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64"
CFLAGS_mips_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32"
CFLAGS_mipsel_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32"
CFLAGS_mips64_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64"
diff --git a/meta-openembedded/meta-multimedia/conf/layer.conf b/meta-openembedded/meta-multimedia/conf/layer.conf
index be0e2b3..a27b97d 100644
--- a/meta-openembedded/meta-multimedia/conf/layer.conf
+++ b/meta-openembedded/meta-multimedia/conf/layer.conf
@@ -31,4 +31,4 @@
LAYERDEPENDS_multimedia-layer = "core meta-python"
-LAYERSERIES_COMPAT_multimedia-layer = "gatesgarth"
+LAYERSERIES_COMPAT_multimedia-layer = "gatesgarth hardknott"
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc
index fc8baa4..ab0f238 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc
@@ -34,6 +34,7 @@
LDFLAGS_append_mipsarcho32 = " -latomic"
LDFLAGS_append_powerpc = " -latomic"
LDFLAGS_append_riscv64 = " -latomic"
+LDFLAGS_append_riscv32 = " -latomic"
LDFLAGS_append_armv5 = " -latomic"
do_configure() {
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
index b4f09cd..78c7c06 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
@@ -101,6 +101,7 @@
libmediaart \
gst-instruments \
libsrtp \
+ srt \
"
# devel headers/libraries only packages
# libsquish
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0001-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0001-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch
new file mode 100644
index 0000000..405490d
--- /dev/null
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0001-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch
@@ -0,0 +1,46 @@
+From f7957c35654222e5bd1038341612bbb40a88e98b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 16 Nov 2020 12:08:43 -0800
+Subject: [PATCH] linux/thread: Use SYS_futex instead of __NR_futex
+
+SYS_futex it expected from system C library.
+in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex)
+some newer 32bit architectures e.g. riscv32 are using 64bit time_t from
+get go unlike other 32bit architectures in glibc, therefore it wont have
+NR_futex defined but just NR_futex_time64 this aliases it to NR_futex so
+that SYS_futex is then defined for rv32
+
+Upstream-Status: Submitted [https://github.com/videolan/vlc/pull/117]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/linux/thread.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/linux/thread.c b/src/linux/thread.c
+index 20da296..30639a3 100644
+--- a/src/linux/thread.c
++++ b/src/linux/thread.c
+@@ -30,6 +30,11 @@
+ #include <sys/syscall.h>
+ #include <linux/futex.h>
+
++/* 32bit architectures with 64bit time_t do not define __NR_futex syscall */
++#if !defined(SYS_futex) && defined(SYS_futex_time64)
++#define SYS_futex SYS_futex_time64
++#endif
++
+ #ifndef FUTEX_PRIVATE_FLAG
+ #define FUTEX_WAKE_PRIVATE FUTEX_WAKE
+ #define FUTEX_WAIT_PRIVATE FUTEX_WAIT
+@@ -50,7 +55,7 @@ unsigned long vlc_thread_id(void)
+ static int sys_futex(void *addr, int op, unsigned val,
+ const struct timespec *to, void *addr2, int val3)
+ {
+- return syscall(__NR_futex, addr, op, val, to, addr2, val3);
++ return syscall(SYS_futex, addr, op, val, to, addr2, val3);
+ }
+
+ static int vlc_futex_wake(void *addr, int nr)
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb
index 44178a1..7902825 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb
@@ -14,6 +14,7 @@
tiff"
LDFLAGS_append_riscv64 = " -latomic"
+LDFLAGS_append_riscv32 = " -latomic"
# While this item does not require it, it depends on ffmpeg which does
LICENSE_FLAGS = "commercial"
@@ -24,6 +25,7 @@
file://0003-fix-luaL-checkint.patch \
file://0004-Use-packageconfig-to-detect-mmal-support.patch \
file://0005-Fix-build-with-Qt-5.15.patch \
+ file://0001-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch \
"
SRC_URI[sha256sum] = "189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8"
diff --git a/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-don-t-install-srt-ffplay.patch b/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-don-t-install-srt-ffplay.patch
new file mode 100644
index 0000000..5b76b16
--- /dev/null
+++ b/meta-openembedded/meta-multimedia/recipes-support/srt/srt/0001-don-t-install-srt-ffplay.patch
@@ -0,0 +1,28 @@
+From a45b43a2acd4c29bc8a204f51a3fa5e7b9815613 Mon Sep 17 00:00:00 2001
+From: Jose Quaresma <quaresma.jose@gmail.com>
+Date: Sat, 14 Nov 2020 12:29:56 +0000
+Subject: [PATCH] don't install srt-ffplay
+
+srt-ffplay is a simple bash scripts that pipes the output of srt-live-transmit to ffplay.
+It need ffmpeg as dependencie and requeire that libsrt is builded with -DENABLE_APPS=ON.
+So remove it because there are no option to disable the instalation.
+
+Upstream-Status: Pending
+
+Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed6e603..ef53dc5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1224,7 +1224,6 @@ if (ENABLE_UNITTESTS AND ENABLE_CXX11)
+ endif()
+
+
+-install(PROGRAMS scripts/srt-ffplay DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+
+ if (DEFINED SRT_EXTRA_APPS_INC)
diff --git a/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb b/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
new file mode 100644
index 0000000..567ea68
--- /dev/null
+++ b/meta-openembedded/meta-multimedia/recipes-support/srt/srt_1.4.2.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Secure Reliable Transport (SRT) Protocol"
+DESCRIPTION = "Secure Reliable Transport (SRT) is an open source transport technology \
+that optimizes streaming performance across unpredictable networks, such as the Internet."
+SECTION = "libs"
+HOMEPAGE = "https://github.com/Haivision/srt"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
+
+SRCREV = "50b7af06f3a0a456c172b4cb3aceafa8a5cc0036"
+SRC_URI = "git://github.com/Haivision/srt;protocol=https \
+ file://0001-don-t-install-srt-ffplay.patch \
+ "
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
+S = "${WORKDIR}/git"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DENABLE_UNITTESTS=OFF"
+
+PACKAGECONFIG ??= "crypt"
+PACKAGECONFIG[debug] = "-DENABLE_DEBUG=1,,"
+PACKAGECONFIG[crypt] = "-DENABLE_ENCRYPTION=ON,-DENABLE_ENCRYPTION=OFF,openssl"
+PACKAGECONFIG[utils] = "-DENABLE_APPS=ON,-DENABLE_APPS=OFF,"
+
+PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'utils', '${PN}-utils', '', d)}"
+FILES_${PN}-utils += "${bindir}"
+RDEPENDS_${PN}-utils += "${PN}"
diff --git a/meta-openembedded/meta-networking/conf/layer.conf b/meta-openembedded/meta-networking/conf/layer.conf
index bd0a44c..c28c7bd 100644
--- a/meta-openembedded/meta-networking/conf/layer.conf
+++ b/meta-openembedded/meta-networking/conf/layer.conf
@@ -17,7 +17,7 @@
LAYERDEPENDS_networking-layer += "openembedded-layer"
LAYERDEPENDS_networking-layer += "meta-python"
-LAYERSERIES_COMPAT_networking-layer = "gatesgarth"
+LAYERSERIES_COMPAT_networking-layer = "gatesgarth hardknott"
LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.6.bb
index 12ad397..8e4b6c8 100644
--- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.6.bb
+++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.16.6.bb
@@ -29,7 +29,7 @@
inherit cmake
PACKAGECONFIG ??= "shared-libs programs"
-PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-USE_SHARED_MBEDTLS_LIBRARY=OFF"
+PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF"
PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF"
EXTRA_OECMAKE = "-DENABLE_TESTING=OFF -DLIB_INSTALL_DIR:STRING=${libdir}"
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb
index 517624d..176fa3b 100644
--- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb
+++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb
@@ -4,8 +4,8 @@
LIC_FILES_CHKSUM = "file://license.txt;md5=6d17d78c3597e0d4452fb1c63bf7c58e"
DEPENDS = "nng"
-SRCREV = "85294eda3f584281439649a074f46e2d3516b2a1"
-PV = "1.2.4"
+SRCREV = "cc5d2641babab165d8a9943817c46d36c6dc17c2"
+PV = "1.3.0"
SRC_URI = "git://github.com/cwzx/nngpp"
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch
index 22ecae3..af28ba7 100644
--- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch
+++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch
@@ -1,24 +1,27 @@
-From 0edb96a5f79dcec4f4467193716c2bf015fe5132 Mon Sep 17 00:00:00 2001
+From e5bd4c3853fb394edc8cbea17fad82ce23bd0fae Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 12 Aug 2020 10:38:07 -0700
+Date: Fri, 27 Nov 2020 12:21:32 -0800
Subject: [PATCH 1/2] dbus: Remove unused variabes
+This issue is seen when using clang to compile it
+
+Same fix is needed for parse.c and networkd.c,
+
Fixes
src/dbus.c:49:23: error: unused variable 'stdout' [-Werror,-Wunused-variable]
g_autofree gchar *stdout = NULL;
^
-
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/CanonicalLtd/netplan/pull/175]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/dbus.c | 3 ---
- 1 file changed, 3 deletions(-)
+ src/dbus.c | 3 ---
+ src/networkd.c | 1 -
+ src/parse.c | 1 -
+ 3 files changed, 5 deletions(-)
-diff --git a/src/dbus.c b/src/dbus.c
-index cb7ec38..a057236 100644
--- a/src/dbus.c
+++ b/src/dbus.c
-@@ -45,9 +45,6 @@ static int method_apply(sd_bus_message *m, void *userdata, sd_bus_error *ret_err
+@@ -45,9 +45,6 @@ static int method_apply(sd_bus_message *
static int method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
sd_bus_message *reply = NULL;
@@ -28,6 +31,23 @@
gint exit_status = 0;
exit_status = sd_bus_message_new_method_return(m, &reply);
---
-2.28.0
-
+--- a/src/networkd.c
++++ b/src/networkd.c
+@@ -896,7 +896,6 @@ append_wpa_auth_conf(GString* s, const N
+ static void
+ write_wpa_unit(const NetplanNetDefinition* def, const char* rootdir)
+ {
+- g_autoptr(GError) err = NULL;
+ g_autofree gchar *stdouth = NULL;
+
+ stdouth = systemd_escape(def->id);
+--- a/src/parse.c
++++ b/src/parse.c
+@@ -1898,7 +1898,6 @@ handle_wireguard_peers(yaml_document_t*
+ }
+
+ for (yaml_node_item_t *i = node->data.sequence.items.start; i < node->data.sequence.items.top; i++) {
+- g_autofree char* addr = NULL;
+ yaml_node_t *entry = yaml_document_get_node(doc, *i);
+ assert_type(entry, YAML_MAPPING_NODE);
+
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-src-parse.c-Initialize-key-to-NULL.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-src-parse.c-Initialize-key-to-NULL.patch
deleted file mode 100644
index a710b1e..0000000
--- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-src-parse.c-Initialize-key-to-NULL.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 63de116c617a35ff3d54c785b3dfb5378bb07f46 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 12 Aug 2020 22:39:17 -0700
-Subject: [PATCH] src/parse.c: Initialize key to NULL
-
-Fixes
-
-src/parse.c:810:22: note: 'key' was declared here
-cc1: all warnings being treated as errors
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/parse.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/parse.c b/src/parse.c
-index 63a0863..c66277f 100644
---- a/src/parse.c
-+++ b/src/parse.c
-@@ -807,7 +807,7 @@ handle_addresses(yaml_document_t* doc, yaml_node_t* node, const void* _, GError*
- char* prefix_len;
- guint64 prefix_len_num;
- yaml_node_t *entry = yaml_document_get_node(doc, *i);
-- yaml_node_t *key, *value = NULL;
-+ yaml_node_t *key = NULL, *value = NULL;
-
- if (entry->type != YAML_SCALAR_NODE && entry->type != YAML_MAPPING_NODE) {
- return yaml_error(entry, error, "expected either scalar or mapping (check indentation)");
---
-2.28.0
-
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch
similarity index 60%
rename from meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch
index e736529..cd75d1c 100644
--- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch
+++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch
@@ -1,35 +1,30 @@
-From 1da4451fd3470e6600b027cb78526b440e296f8b Mon Sep 17 00:00:00 2001
+From 5abb6b8343b5d2633844144979b40f398450b544 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 12 Aug 2020 10:47:08 -0700
-Subject: [PATCH 2/2] Makefile: Use first prerquisite only for target rule
+Date: Fri, 27 Nov 2020 12:22:32 -0800
+Subject: [PATCH 2/2] Makefile: Exclude .h files from target rule
This ensures that src/_features.h is not added to compiler cmdline which
-can confuse the compiler as it may not understand .h as valid input and
-complain
+can confuse the compilers e.g. clang as it may not like .h as valid input
+and complain
| clang-11: error: cannot specify -o when generating multiple output files
| make: *** [Makefile:50: netplan-dbus] Error 1
| make: *** Waiting for unfinished jobs....
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/CanonicalLtd/netplan/pull/175]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/Makefile b/Makefile
-index 4495773..c05dea3 100644
--- a/Makefile
+++ b/Makefile
-@@ -47,7 +47,7 @@ generate: libnetplan.so.$(NETPLAN_SOVER) nm.o networkd.o generate.o sriov.o
+@@ -47,7 +47,7 @@ generate: libnetplan.so.$(NETPLAN_SOVER)
$(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -L. -lnetplan `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid`
netplan-dbus: src/dbus.c src/_features.h
- $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --cflags --libs libsystemd glib-2.0`
-+ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< `pkg-config --cflags --libs libsystemd glib-2.0`
++ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(patsubst %.h,,$^) `pkg-config --cflags --libs libsystemd glib-2.0`
src/_features.h: src/[^_]*.[hc]
printf "#include <stddef.h>\nstatic const char *feature_flags[] __attribute__((__unused__)) = {\n" > $@
---
-2.28.0
-
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.100.bb
similarity index 92%
rename from meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.100.bb
index 5546f30..2f74a22 100644
--- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb
+++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.100.bb
@@ -11,14 +11,13 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
S = "${WORKDIR}/git"
-SRCREV = "85134d13eb1ee5a1a7d139cd74ffa10933d73677"
-PV = "0.99+git${SRCPV}"
+SRCREV = "b7d32aebc880f3161b8f97ee56b729c0c54dd0e4"
+PV = "0.100+git${SRCPV}"
SRC_URI = " \
git://github.com/CanonicalLtd/netplan.git \
file://0001-dbus-Remove-unused-variabes.patch \
- file://0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch \
- file://0001-src-parse.c-Initialize-key-to-NULL.patch \
+ file://0002-Makefile-Exclude-.h-files-from-target-rule.patch \
"
DEPENDS = "glib-2.0 libyaml ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.16.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.17.bb
similarity index 97%
rename from meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.16.1.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.17.bb
index e967f7a..324114f 100644
--- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.16.1.bb
+++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.17.bb
@@ -14,7 +14,7 @@
file://disable-run-test-program-while-cross-compiling.patch \
file://configure.in-disable-tirpc-checking-for-fedora.patch \
"
-SRC_URI[sha256sum] = "e3ac45a1a3cc2c997d52d19cd92f1adf5641c3a919387adab47a4d13a9dc9f8e"
+SRC_URI[sha256sum] = "c3b234c3922a09b0368b847ddb8d1fa371b741f032f42aa9ab53d67b428dc648"
UPSTREAM_CHECK_URI = "https://www.snort.org/downloads"
UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
index a9dc6a1..1a34c4b 100644
--- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
+++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
@@ -220,6 +220,7 @@
macchanger \
nbdkit \
ssmping \
+ libmaxminddb \
libowfat \
ncp \
strongswan \
@@ -232,7 +233,8 @@
traceroute \
tunctl \
wireshark \
- ntop \
+ ndpi \
+ ntopng \
nuttcp \
nvmetcli \
open-isns \
diff --git a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb
similarity index 80%
rename from meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb
rename to meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb
index 6b73506..a697e98 100644
--- a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb
+++ b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb
@@ -12,9 +12,10 @@
RDEPENDS_${PN} = "python3-pygobject python3-dbus"
REQUIRED_DISTRO_FEATURES = "systemd"
-SRC_URI = "https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/${PV}/networkd-dispatcher-${PV}.tar.bz2"
-SRC_URI[md5sum] = "304d7dcc21331ea295e207f8493cb8d8"
-SRC_URI[sha256sum] = "21f84c3646a043329dc64787e4e58dfce592b2559b0e3069af82c469805660c2"
+SRCREV = "30e278e50749a60a930ceaa0971207c6436b8a0c"
+SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1"
+
+S = "${WORKDIR}/git"
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "networkd-dispatcher.service"
diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Add-configure-time-check-for-gettid-API.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Add-configure-time-check-for-gettid-API.patch
deleted file mode 100644
index 2b03b18..0000000
--- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Add-configure-time-check-for-gettid-API.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 91c7362834ccd88d1432b3e6c5c51748b72b10ad Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 27 Jul 2019 07:21:16 -0700
-Subject: [PATCH] Add configure time check for gettid API
-
-glibc 2.30 has added syscalls wrapper for gettid
-it should now be checked during configure if C library provides
-this API then do not define local function
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac | 4 ++++
- src/base/logtrace.cc | 3 +++
- src/osaf/config.h.in | 3 +++
- 3 files changed, 10 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 22ab936..90f3da4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -480,6 +480,10 @@ fi
-
- AC_SUBST([localstatedir])
-
-+#############################################
-+# Checks for functions.
-+#############################################
-+AC_CHECK_FUNCS([ gettid ])
-
- #############################################
- # Checks for programs.
-diff --git a/src/base/logtrace.cc b/src/base/logtrace.cc
-index 8908c1f..fe87e8d 100644
---- a/src/base/logtrace.cc
-+++ b/src/base/logtrace.cc
-@@ -31,6 +31,7 @@
- #include "base/logtrace_client.h"
- #include "base/logtrace_buffer.h"
- #include "base/ncsgl_defs.h"
-+#include "osaf/config.h"
-
- namespace global {
-
-@@ -58,7 +59,9 @@ std::once_flag init_flag;
- thread_local LogTraceBuffer gl_thread_buffer{gl_local_thread_trace,
- global::thread_trace_buffer_size};
-
-+#ifndef HAVE_GETTID
- static pid_t gettid() { return syscall(SYS_gettid); }
-+#endif
-
- /**
- * USR2 signal handler to enable/disable trace (toggle)
-diff --git a/src/osaf/config.h.in b/src/osaf/config.h.in
-index d1f6d1a..0a3f27d 100644
---- a/src/osaf/config.h.in
-+++ b/src/osaf/config.h.in
-@@ -18,6 +18,9 @@
- /* Define if experimental code is enabled */
- #undef HAVE_EXPERIMENTAL
-
-+/* Define to 1 if you have the `gettid' function. */
-+#undef HAVE_GETTID
-+
- /* SAHPI_INTERFACE_VERSION == A01 */
- #undef HAVE_HPI_A01
-
diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch
new file mode 100644
index 0000000..0e113f5
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Use-correct-printf-format-for-__fsblkcnt_t.patch
@@ -0,0 +1,36 @@
+From 90f81c1fb3e560cfc99ee7ab9a48a1736e3929cd Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 15 Nov 2020 13:22:31 -0800
+Subject: [PATCH] Use correct printf format for __fsblkcnt_t
+
+This depends on time_t size and on some 32bit architectures e.g. riscv32
+this would be a 64bit value
+
+Fixes
+os_defs.c:920:40: error: format '%ld' expects argument of type 'long int', but argument 3 has type '__fsblkcnt_t' {aka 'long long unsigned int'} [-Werror=format=]
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/base/os_defs.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/base/os_defs.c b/src/base/os_defs.c
+index 83458c2..655c190 100644
+--- a/src/base/os_defs.c
++++ b/src/base/os_defs.c
+@@ -917,7 +917,11 @@ uint32_t ncs_os_posix_shm(NCS_OS_POSIX_SHM_REQ_INFO *req)
+ ((statsvfs.f_bfree - 1) * statsvfs.f_frsize)) {
+ syslog(
+ LOG_ERR,
++#if __TIMESIZE == 64 && __WORDSIZE == 32
++ "Insufficient shared memory (%lld) to write the data of size: %" PRId64
++#else
+ "Insufficient shared memory (%ld) to write the data of size: %" PRId64
++#endif
+ "\n",
+ (statsvfs.f_bfree * statsvfs.f_frsize),
+ req->info.write.i_write_size);
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb
similarity index 93%
rename from meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb
rename to meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb
index bd972e3..5516fc4 100644
--- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb
+++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb
@@ -24,13 +24,13 @@
file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \
file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \
file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \
- file://0001-Add-configure-time-check-for-gettid-API.patch \
file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \
file://0001-immom_python-convert-to-python3.patch \
file://0001-Fix-build-with-fno-common.patch \
+ file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \
"
-SRC_URI[md5sum] = "d56bacf4c234c134e60e9b25f6f26671"
-SRC_URI[sha256sum] = "2478e298c0bce3b2cfdeb20875022cc11d7d3b53ecd3255422d22eb64c04953b"
+SRC_URI[md5sum] = "02cfe732d194339237da6adce8e54384"
+SRC_URI[sha256sum] = "84268b90dc48a6675e5a77e2b20390a04bb59deb48a829102a9dbc4b9ac27483"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases"
diff --git a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch
new file mode 100644
index 0000000..b2caeba
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch
@@ -0,0 +1,40 @@
+From 3886219c5c1fdca114dd480b46ce211762e30742 Mon Sep 17 00:00:00 2001
+From: Li Zhou <li.zhou@windriver.com>
+Date: Tue, 30 Jun 2020 13:50:11 +0800
+Subject: [PATCH] ptpd: Solve memory leak for function NTPDCrequest
+
+Solve the memory leak in function NTPDCrequest detected by valgrind tool.
+
+Memory leak log example:
+==619== 21 bytes in 1 blocks are still reachable in loss record 1 of 3
+==619== at 0x4A09DB0: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
+==619== by 0x43512E: NTPDCrequest (ntpdcontrol.c:255)
+==619== by 0x43512E: NTPDCquery.isra.1 (ntpdcontrol.c:683)
+==619== by 0x4359EE: ntpdInControl (ntpdcontrol.c:807)
+==619== by 0x4364F5: ntpServiceUpdate (timingdomain.c:622)
+==619== by 0x436935: timingDomainUpdate (timingdomain.c:756)
+==619== by 0x4334A7: protocol (protocol.c:263)
+==619== by 0x402BAE: main (ptpd.c:131)
+
+Upstream-Status: Pending
+
+Signed-off-by: Li Zhou <li.zhou@windriver.com>
+---
+ src/dep/ntpengine/ntpdcontrol.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dep/ntpengine/ntpdcontrol.c b/src/dep/ntpengine/ntpdcontrol.c
+index bfe0b5e..b1973cb 100644
+--- a/src/dep/ntpengine/ntpdcontrol.c
++++ b/src/dep/ntpengine/ntpdcontrol.c
+@@ -271,6 +271,7 @@ NTPDCrequest(
+
+ if (!auth) {
+ qpkt.auth_seq = AUTH_SEQ(0, 0);
++ free(key);
+ return ntpSend(control, (Octet *)&qpkt, req_pkt_size);
+ }
+
+--
+1.9.1
+
diff --git a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb
index cab0d94..227c9f9 100644
--- a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb
+++ b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb
@@ -24,6 +24,7 @@
SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${@get_sub(d)}/ptpd-${PV}.tar.gz \
file://ptpd-use-pkgconfig.patch \
file://Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch \
+ file://0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch \
file://ptpd.service \
file://ptpd.conf \
"
diff --git a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.18.bb b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.18.bb
deleted file mode 100644
index 6097b20..0000000
--- a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.18.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-require radvd.inc
-
-SRC_URI[md5sum] = "26ead3a0d5cfbe4c81c3089eaf7b3250"
-SRC_URI[sha256sum] = "4f573e36b96ba92d03b5abbbd5f059b9c8994967812c77852f44049ac5a448fd"
diff --git a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.19.bb b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.19.bb
new file mode 100644
index 0000000..553987e
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.19.bb
@@ -0,0 +1,5 @@
+
+require radvd.inc
+
+SRC_URI[md5sum] = "e9c425ac48ecb96ea5ea2912c78969f9"
+SRC_URI[sha256sum] = "c36470706fec3a9e6bed394ffea08acaff5dac647848d26b96bb9b9c65d58da0"
diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.7.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.8.bb
similarity index 88%
rename from meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.7.bb
rename to meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.8.bb
index 4ff00bf..f1fd61b 100644
--- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.7.bb
+++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.8.bb
@@ -4,7 +4,7 @@
SECTION = "libs"
DEPENDS = "libmnl"
-SRCREV = "eedafeb6db330b8adff1b7cdd3dac325f9144195"
+SRCREV = "b2cd6d28fab02934c4ddff0699718d74272eccd3"
SRC_URI = "git://git.netfilter.org/libnftnl \
file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \
"
diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.6.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb
similarity index 93%
rename from meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.6.bb
rename to meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb
index 41f7f4c..e5dfef9 100644
--- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.6.bb
+++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.7.bb
@@ -10,7 +10,7 @@
UPSTREAM_CHECK_REGEX = "nftables-(?P<pver>\d+(\.\d+){2,}).tar.bz2"
SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "68d6fdfe8ab02303e6b1f13968a4022da5b0120110eaee3233d806857937b66e"
+SRC_URI[sha256sum] = "fe6b8a8c326a2c09c02ca162b840d7d4aadb043ce7a367c166d6455b0e112cb0"
inherit autotools manpages pkgconfig
diff --git a/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_2.9.bb b/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.0.bb
similarity index 92%
rename from meta-openembedded/meta-networking/recipes-irc/weechat/weechat_2.9.bb
rename to meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.0.bb
index 512ed0e..6a0c938 100644
--- a/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_2.9.bb
+++ b/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.0.bb
@@ -10,7 +10,7 @@
file://0001-use-pkg-config-for-gcrypt-instead.patch \
"
-SRC_URI[sha256sum] = "eab406c385c3a10d0107ddc3aac6596ae8c59af99e9158c6d769e90ec9adfa0e"
+SRC_URI[sha256sum] = "6cb7d25a363b66b835f1b9f29f3580d6f09ac7d38505b46a62c178b618d9f1fb"
inherit cmake pkgconfig
diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb
similarity index 95%
rename from meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb
rename to meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb
index 3a83e48..c540445 100644
--- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb
+++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb
@@ -1,6 +1,6 @@
require wireguard.inc
-SRCREV = "d553aa7c52ac78c1963886afb74ba861b0b7b0fc"
+SRCREV = "fe402261666821514377d06c2c68ed9bc19e7634"
SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat"
diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200827.bb
similarity index 91%
rename from meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb
rename to meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200827.bb
index 3403fd9..c4214de 100644
--- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb
+++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200827.bb
@@ -1,6 +1,6 @@
require wireguard.inc
-SRCREV = "c45d422a93d57f6fdec429640ff7f96b396beed4"
+SRCREV = "7a321ce808ef9cec1f45cce92befcc9e170d3aa9"
SRC_URI = "git://git.zx2c4.com/wireguard-tools"
inherit bash-completion systemd pkgconfig
diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc
index 11b7d57..6df7242 100644
--- a/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -81,7 +81,7 @@
install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga
install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga
install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga
- install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
+ install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga
# Install sample configurations for the daemons
for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do
@@ -106,7 +106,7 @@
sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/*
sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga
sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga
- sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
+ sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga
sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/*
sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h
diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch
index 187898a..97b44dc 100644
--- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch
+++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch
@@ -18,45 +18,60 @@
Refresh patch for new upstream version.
Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
+
+ Refreshed for 4.0
+
+ Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
sys_linux.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
-diff --git a/sys_linux.c b/sys_linux.c
-index 898dc7a..b268ad1 100644
--- a/sys_linux.c
+++ b/sys_linux.c
-@@ -479,14 +479,14 @@ SYS_Linux_EnableSystemCallFilter(int level)
- const int syscalls[] = {
- /* Clock */
- SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday),
-- SCMP_SYS(settimeofday), SCMP_SYS(time),
-+ SCMP_SYS(settimeofday),
+@@ -499,14 +499,12 @@ SYS_Linux_EnableSystemCallFilter(int lev
+ #endif
+ SCMP_SYS(gettimeofday),
+ SCMP_SYS(settimeofday),
+- SCMP_SYS(time),
+
/* Process */
- SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid),
-- SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn),
-+ SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn),
- SCMP_SYS(rt_sigprocmask), SCMP_SYS(set_tid_address), SCMP_SYS(sigreturn),
- SCMP_SYS(wait4), SCMP_SYS(waitpid),
+ SCMP_SYS(clone),
+ SCMP_SYS(exit),
+ SCMP_SYS(exit_group),
+ SCMP_SYS(getpid),
+- SCMP_SYS(getrlimit),
+ SCMP_SYS(getuid),
+ SCMP_SYS(rt_sigaction),
+ SCMP_SYS(rt_sigreturn),
+@@ -519,7 +517,6 @@ SYS_Linux_EnableSystemCallFilter(int lev
/* Memory */
-- SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2),
-+ SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap2),
- SCMP_SYS(mprotect), SCMP_SYS(mremap), SCMP_SYS(munmap), SCMP_SYS(shmdt),
- /* Filesystem */
- SCMP_SYS(_llseek), SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown),
-@@ -499,14 +499,22 @@ SYS_Linux_EnableSystemCallFilter(int level)
- SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname), SCMP_SYS(getsockopt),
- SCMP_SYS(recv), SCMP_SYS(recvfrom), SCMP_SYS(recvmmsg), SCMP_SYS(recvmsg),
- SCMP_SYS(send), SCMP_SYS(sendmmsg), SCMP_SYS(sendmsg), SCMP_SYS(sendto),
+ SCMP_SYS(brk),
+ SCMP_SYS(madvise),
+- SCMP_SYS(mmap),
+ SCMP_SYS(mmap2),
+ SCMP_SYS(mprotect),
+ SCMP_SYS(mremap),
+@@ -573,8 +570,6 @@ SYS_Linux_EnableSystemCallFilter(int lev
+ SCMP_SYS(sendmsg),
+ SCMP_SYS(sendto),
+ SCMP_SYS(shutdown),
- /* TODO: check socketcall arguments */
- SCMP_SYS(socketcall),
+
/* General I/O */
- SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe),
- SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(ppoll), SCMP_SYS(pselect6), SCMP_SYS(read),
-- SCMP_SYS(futex), SCMP_SYS(select), SCMP_SYS(set_robust_list), SCMP_SYS(write),
-+ SCMP_SYS(futex), SCMP_SYS(set_robust_list), SCMP_SYS(write),
- /* Miscellaneous */
- SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname),
+ SCMP_SYS(_newselect),
+@@ -597,7 +592,6 @@ SYS_Linux_EnableSystemCallFilter(int lev
+ #ifdef __NR_futex_time64
+ SCMP_SYS(futex_time64),
+ #endif
+- SCMP_SYS(select),
+ SCMP_SYS(set_robust_list),
+ SCMP_SYS(write),
+
+@@ -605,6 +599,15 @@ SYS_Linux_EnableSystemCallFilter(int lev
+ SCMP_SYS(getrandom),
+ SCMP_SYS(sysinfo),
+ SCMP_SYS(uname),
+ /* not always available */
+#if ! defined(__ARM_EABI__)
+ SCMP_SYS(time),
@@ -66,10 +81,6 @@
+ /* TODO: check socketcall arguments */
+ SCMP_SYS(socketcall),
+#endif
-+
};
-
- const int socket_domains[] = {
---
-2.17.1
+ const int socket_domains[] = {
diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd
index 04f1b68..8c7c167 100644
--- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd
+++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd
@@ -15,7 +15,7 @@
PATH=/sbin:/bin:/usr/bin:/usr/sbin
DAEMON=/usr/sbin/chronyd
-PIDFILE=/var/run/chronyd.pid
+PIDFILE=/run/chrony/chronyd.pid
test -x $DAEMON -a -r /etc/chrony.conf || exit 0
diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.5.bb b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.0.bb
similarity index 93%
rename from meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.5.bb
rename to meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.0.bb
index 7c6356d..c898701 100644
--- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.5.bb
+++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.0.bb
@@ -39,8 +39,7 @@
SRC_URI_append_libc-musl = " \
file://0001-Fix-compilation-with-musl.patch \
"
-SRC_URI[md5sum] = "5f66338bc940a9b51eede8f391e7bed3"
-SRC_URI[sha256sum] = "4e02795b1260a4ec51e6ace84149036305cc9fc340e65edb9f8452aa611339b5"
+SRC_URI[sha256sum] = "be27ea14c55e7a4434b2fa51d53018c7051c42fa6a3198c9aa6a1658bae0c625"
DEPENDS = "pps-tools"
@@ -81,6 +80,10 @@
do_configure() {
./configure --sysconfdir=${sysconfdir} --bindir=${bindir} --sbindir=${sbindir} \
--localstatedir=${localstatedir} --datarootdir=${datadir} \
+ --with-ntp-era=$(shell date -d '1970-01-01 00:00:00+00:00' +'%s') \
+ --with-pidfile=/run/chrony/chronyd.pid \
+ --chronyrundir=/run/chrony \
+ --host-system=Linux \
${PACKAGECONFIG_CONFARGS}
}
@@ -106,9 +109,6 @@
# Variable data (for drift and/or rtc file)
install -d ${D}${localstatedir}/lib/chrony
- # Log files
- install -d ${D}${localstatedir}/log/chrony
-
# Fix hard-coded paths in config files and init scripts
sed -i -e 's!/var/!${localstatedir}/!g' -e 's!/etc/!${sysconfdir}/!g' \
-e 's!/usr/sbin/!${sbindir}/!g' -e 's!/usr/bin/!${bindir}/!g' \
@@ -119,7 +119,7 @@
sed -i 's!^EnvironmentFile=.*!EnvironmentFile=-${sysconfdir}/default/chronyd!' ${D}${systemd_unitdir}/system/chronyd.service
}
-FILES_${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}"
+FILES_${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}/lib/chrony ${localstatedir}"
CONFFILES_${PN} = "${sysconfdir}/chrony.conf"
INITSCRIPT_NAME = "chronyd"
INITSCRIPT_PARAMS = "defaults"
diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb
index 0f7fad2..bda1740 100644
--- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb
+++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb
@@ -44,6 +44,10 @@
EXTRA_OECONF = " --with-ioloop=epoll \
--with-systemdsystemunitdir=${systemd_unitdir}/system"
+# Uses hidden symbols
+# libssl_iostream_openssl.so: undefined reference to `ssl_iostream_handshake'
+LTO = ""
+
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "dovecot.service dovecot.socket"
SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-openembedded/meta-networking/recipes-support/libmaxminddb/libmaxminddb_1.4.3.bb b/meta-openembedded/meta-networking/recipes-support/libmaxminddb/libmaxminddb_1.4.3.bb
new file mode 100644
index 0000000..204148e
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/libmaxminddb/libmaxminddb_1.4.3.bb
@@ -0,0 +1,18 @@
+SUMMARY = "C library for the MaxMind DB file format"
+DESCRIPTION = "The libmaxminddb library provides a C library for reading MaxMind DB files, \
+ncluding the GeoIP2 databases from MaxMind. This is a custom binary \
+format designed to facilitate fast lookups of IP addresses while allowing \
+for great flexibility in the type of data associated with an address."
+
+HOMEPAGE = "https://github.com/maxmind/libmaxminddb"
+SECTION = "libs"
+LICENSE = " Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+"
+SRC_URI = "https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${BPN}-${PV}.tar.gz \
+"
+SRC_URI[sha256sum] = "a5fdf6c7b4880fdc7620f8ace5bd5cbe9f65650c9493034b5b9fc7d83551a439"
+
+inherit autotools-brokensep
+
diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch
deleted file mode 100644
index 7599b1b..0000000
--- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e5952a0cdfa8b1b56a5823574835f1f771f14ae0 Mon Sep 17 00:00:00 2001
-From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
-Date: Fri, 24 Aug 2018 09:53:00 -0300
-Subject: [PATCH] build: 0b0dce7a36fb actually belongs to v4.19
-
-Typo or not, this commit actually belongs to v4.19 and made me wonder why
-on v4.18 it didn't find this feature.
-
-Fixes: 817f0bfa248f ("build: add two defines for Peer Address Parameters extensions on sctp_paddrparams")
-Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
-Reviewed-by: Xin Long <lucien.xin@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f55775a..5de5c76 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -101,7 +101,7 @@ LKSCTP_CHECK_TYPE([struct sctp_prinfo], [HAVE_SCTP_SENDV])
- # added on v4.16, 30f6ebf65bc4
- LKSCTP_CHECK_DECL([SCTP_AUTH_NO_AUTH], [HAVE_SCTP_AUTH_NO_AUTH])
-
--# New members to sctp_paddrparams, added on v4.18, 0b0dce7a36fb
-+# New members to sctp_paddrparams, added on v4.19, 0b0dce7a36fb
- LKSCTP_CHECK_MEMBER([struct sctp_paddrparams.spp_ipv6_flowlabel],
- [HAVE_SCTP_SPP_IPV6_FLOWLABEL])
- LKSCTP_CHECK_MEMBER([struct sctp_paddrparams.spp_dscp],
---
-2.7.4
-
diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch
deleted file mode 100644
index 03c6c4f..0000000
--- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001
-From: Xin Long <lucien.xin@gmail.com>
-Date: Fri, 24 Aug 2018 01:13:32 +0800
-Subject: [PATCH] build: fix netinet/sctp.h not to be installed
-
-After libcnetinet_HEADERS was set to sctp.h.in, netinet/sctp.h can
-no longer be installed into ${includedir}.
-
-Since "AC_CONFIG_HEADERS([src/include/netinet/sctp.h])" is already
-added into configure.ac, there's no need to generate sctp.h by
-automake.
-
-So we simply set libcnetinet_HEADERS back to sctp.h.
-
-Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup")
-Signed-off-by: Xin Long <lucien.xin@gmail.com>
-Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
----
- src/include/netinet/Makefile.am | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am
-index ca0aac2..965db8c 100644
---- a/src/include/netinet/Makefile.am
-+++ b/src/include/netinet/Makefile.am
-@@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet
- # API.
- include_HEADERS =
-
--libcnetinet_HEADERS = sctp.h.in
--BUILT_SOURCES = sctp.h
-+libcnetinet_HEADERS = sctp.h
---
-2.7.4
-
diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch
deleted file mode 100644
index 89c8983..0000000
--- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 596efd6631b83069d41782fb0ee2d6cf76a50dfa Mon Sep 17 00:00:00 2001
-From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
-Date: Fri, 24 Aug 2018 09:52:59 -0300
-Subject: [PATCH] build: fix probing for HAVE_SCTP_SENDV
-
-Somehow it was using a type that is non-existent. The right one is
-sctp_prinfo, introduced on ed63afb8a318 ("sctp: add support for PR-SCTP
-Information for sendmsg"), present on v4.17.
-
-Fixes: 1b798f1ca3b5 ("build: add define HAVE_SCTP_AUTH_NO_AUTH")
-Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
-Reviewed-by: Xin Long <lucien.xin@gmail.com>
----
- configure.ac | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dad658c..f55775a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -94,9 +94,8 @@ LKSCTP_CHECK_MEMBER([struct sctp_pdapi_event.pdapi_stream],
- LKSCTP_CHECK_MEMBER([struct sctp_pdapi_event.pdapi_seq],
- [HAVE_SCTP_PDAPI_EVENT_PDAPI_SEQ])
-
--# PR-SCTP field used to probe for sendv/recvv support, added on v4.17
--LKSCTP_CHECK_MEMBER([struct sendv_prinfo.sctp_prinfo],
-- [HAVE_SCTP_SENDV])
-+# PR-SCTP struct used to probe for sendv/recvv support, added on v4.17
-+LKSCTP_CHECK_TYPE([struct sctp_prinfo], [HAVE_SCTP_SENDV])
-
- # This event indicates that the peer does not support SCTP authentication,
- # added on v4.16, 30f6ebf65bc4
---
-2.7.4
-
diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch
deleted file mode 100644
index d22cda6..0000000
--- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From db6d15bf12a0123e4320e5fd7cb688331dea1bdc Mon Sep 17 00:00:00 2001
-From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
-Date: Fri, 24 Aug 2018 09:52:58 -0300
-Subject: [PATCH] build: remove v4.12 secondary defines in favor of
- HAVE_SCTP_STREAM_RECONFIG
-
-These were backups, commented out since beginning.
-HAVE_SCTP_STREAM_RECONFIG is enough to identify that these are there, so
-lets use only one.
-
-Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
-Reviewed-by: Xin Long <lucien.xin@gmail.com>
----
- configure.ac | 8 --------
- src/include/netinet/sctp.h.in | 2 --
- 2 files changed, 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2ae36ec..dad658c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -82,14 +82,6 @@ AC_CHECK_FUNCS([bzero gethostbyname gettimeofday memmove memset select socket \
- LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_stream_reset_event],
- [HAVE_SCTP_STREAM_RESET_EVENT])
-
--# Support for assoc reset event, added on v4.12, c95129d127c6
--#LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_assoc_reset_event], \
--# [HAVE_SCTP_ASSOC_RESET_EVENT])
--
--# Support for stream change event, added on v4.12, b444153fb5a6
--#LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_stream_change_event], \
--# [HAVE_SCTP_STREAM_CHANGE_EVENT])
--
- # RFC 6525 (Stream Reconf), finished on v4.12, c0d8bab6ae51
- LKSCTP_CHECK_DECL([SCTP_RECONFIG_SUPPORTED], [HAVE_SCTP_STREAM_RECONFIG])
-
-diff --git a/src/include/netinet/sctp.h.in b/src/include/netinet/sctp.h.in
-index c049077..2009f1c 100644
---- a/src/include/netinet/sctp.h.in
-+++ b/src/include/netinet/sctp.h.in
-@@ -61,8 +61,6 @@ extern "C" {
- #define HAVE_SCTP_CANSET_PRIMARY
-
- #undef HAVE_SCTP_STREAM_RESET_EVENT
--#undef HAVE_SCTP_ASSOC_RESET_EVENT
--#undef HAVE_SCTP_STREAM_CHANGE_EVENT
- #undef HAVE_SCTP_STREAM_RECONFIG
- #undef HAVE_SCTP_PEELOFF_FLAGS
- #undef HAVE_SCTP_PDAPI_EVENT_PDAPI_STREAM
---
-2.7.4
-
diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch
deleted file mode 100644
index bec9bf0..0000000
--- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 7de2bd7e769f10521e3d0c2cb42c6f6b9b505dd0 Mon Sep 17 00:00:00 2001
-From: Xin Long <lucien.xin@gmail.com>
-Date: Thu, 16 Aug 2018 14:12:30 +0800
-Subject: [PATCH] configure.ac: add CURRENT REVISION and AGE for libsctp and
- libwithsctp
-
-Add CURRENT REVISION and AGE for libsctp and libwithsctp in
-configure.ac to update these 2 library version information.
-
-Compatible with before, they will start from 1:18:0. But each
-will get updated according to their definitions in the future.
-
-Signed-off-by: Xin Long <lucien.xin@gmail.com>
-Acked-by: Neil Horman <nhorman@tuxdriver.com>
-Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
----
- configure.ac | 7 +++++++
- src/lib/Makefile.am | 7 +++++--
- src/withsctp/Makefile.am | 3 ++-
- 3 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 275ef4e..2ae36ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,6 +14,13 @@ dnl reduce clutter in the root; if we put it below AM_INIT_AUTOMAKE,
- dnl configure will fail ...)
-
- AC_INIT([lksctp-tools], [1.0.18], [], [], [http://www.lksctp.org/])
-+AC_SUBST(LIBSCTP_CURRENT, 1)
-+AC_SUBST(LIBSCTP_REVISION, 18)
-+AC_SUBST(LIBSCTP_AGE, 0)
-+AC_SUBST(LIBWITHSCTP_CURRENT, 1)
-+AC_SUBST(LIBWITHSCTP_REVISION, 18)
-+AC_SUBST(LIBWITHSCTP_AGE, 0)
-+
- AC_CONFIG_AUX_DIR(bin)
- AC_CONFIG_SRCDIR([src/apps/sctp_darn.c])
- AC_CONFIG_HEADERS([config.h])
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index 6100c56..1d62175 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -8,5 +8,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
- lib_LTLIBRARIES = libsctp.la
-
--libsctp_la_SOURCES = bindx.c connectx.c peeloff.c opt_info.c addrs.c sendmsg.c recvmsg.c Versions.map
--libsctp_la_LDFLAGS = -version-info 1:17:0 -Wl,--version-script=$(srcdir)/Versions.map
-+libsctp_la_SOURCES = bindx.c connectx.c peeloff.c opt_info.c \
-+ addrs.c sendmsg.c recvmsg.c Versions.map
-+libsctp_la_LDFLAGS = -version-info \
-+ @LIBSCTP_CURRENT@:@LIBSCTP_REVISION@:@LIBSCTP_AGE@ \
-+ -Wl,--version-script=$(srcdir)/Versions.map
-diff --git a/src/withsctp/Makefile.am b/src/withsctp/Makefile.am
-index 70b1cca..1f6ca37 100644
---- a/src/withsctp/Makefile.am
-+++ b/src/withsctp/Makefile.am
-@@ -14,7 +14,8 @@ AM_CPPFLAGS=-I$(top_srcdir)/src/include
- pkglib_LTLIBRARIES = libwithsctp.la
- libwithsctp_la_SOURCES = sctp_load_libs.c sctp_socket.c sctp_bind.c \
- sctp_sockopt.c sctp_socket.h
--libwithsctp_la_LDFLAGS = -version-info 1:17:0 -ldl
-+libwithsctp_la_LDFLAGS = -version-info \
-+ @LIBWITHSCTP_CURRENT@:@LIBWITHSCTP_REVISION@:@LIBWITHSCTP_AGE@ -ldl
-
- pkgdoc_DATA = sctp_load_libs.c sctp_socket.c sctp_bind.c \
- sctp_sockopt.c sctp_socket.h checksctp.c
---
-2.7.4
-
diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch
deleted file mode 100644
index 621e6f4..0000000
--- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From e1e670defb84d51efdd124e5f3fa166a1a4b7c1d Mon Sep 17 00:00:00 2001
-From: Mingli Yu <Mingli.Yu@windriver.com>
-Date: Tue, 25 Sep 2018 11:39:43 +0800
-Subject: [PATCH] test_1_to_1_events.c: initialize event properly
-
-Initialize event properly to avoid below
-Segmentation fault when run below test
-related to AUTH_NO_AUTH.
-
- # ./test_1_to_1_events
-test_1_to_1_events.c 1 PASS : COMM_UP notification on client socket - SUCCESS
-test_1_to_1_events.c 2 PASS : COMM_UP notification on server socket - SUCCESS
-test_1_to_1_events.c 3 BROK : Got a datamsg, expecting notification
-DUMP_CORE sctputil.c: 187
-[ 1468.733938] test_1_to_1_eve[2376]: segfault at 0 ip 0000561a4a3d5079 sp 00007ffd49101580 error 6 in test_1_to_1_events[561a4a3d4000+2000]
-[ 1468.734479] Code: ff bf 0a 00 00 00 e8 e6 ef ff ff b9 c9 00 00 00 48 8d 15 61 13 00 00 bf 01 00 00 00 31 c0 48 8d 35 c7 0f 00 00 e8 97 f0
-Segmentation fault
-
-Upstream-Status: Pending
-
-Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
----
- src/func_tests/test_1_to_1_events.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/func_tests/test_1_to_1_events.c b/src/func_tests/test_1_to_1_events.c
-index 46439bf..a086832 100644
---- a/src/func_tests/test_1_to_1_events.c
-+++ b/src/func_tests/test_1_to_1_events.c
-@@ -92,9 +92,11 @@ main(int argc, char *argv[])
- /* Create the client socket. */
- clt_sk = test_socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP);
-
-+ memset(&event, 0, sizeof(event));
- event.sctp_data_io_event = 1;
- event.sctp_association_event = 1;
- event.sctp_shutdown_event = 1;
-+ event.sctp_authentication_event = 1;
- len = sizeof(struct sctp_event_subscribe);
- test_setsockopt(svr_sk, SCTP_EVENTS, &event, len);
- test_setsockopt(clt_sk, SCTP_EVENTS, &event, len);
---
-2.7.4
-
diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch
deleted file mode 100644
index 2537bb9..0000000
--- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7c0ef4d441b3833e721df58f56e2cb8c81b34df4 Mon Sep 17 00:00:00 2001
-From: Xin Long <lucien.xin@gmail.com>
-Date: Thu, 16 Aug 2018 14:12:01 +0800
-Subject: [PATCH] withsctp: use @PACKAGE_VERSION@ in withsctp.h
-
-use @PACKAGE_VERSION@ to replace the hardcode version.
-
-Signed-off-by: Xin Long <lucien.xin@gmail.com>
-Acked-by: Neil Horman <nhorman@tuxdriver.com>
-Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
----
- Makefile.rules | 3 ++-
- src/withsctp/withsctp.in | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.rules b/Makefile.rules
-index 83f5f0c..d3693fa 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -15,4 +15,5 @@
- edit = @sed \
- -e "s|\@bindir\@|$(bindir)|" \
- -e "s|\@libdir\@|$(libdir)|" \
-- -e "s|\@PACKAGE\@|$(PACKAGE)|"
-+ -e "s|\@PACKAGE\@|$(PACKAGE)|" \
-+ -e "s|\@PACKAGE_VERSION\@|$(PACKAGE_VERSION)|"
-diff --git a/src/withsctp/withsctp.in b/src/withsctp/withsctp.in
-index 7f182ba..fda5ebc 100644
---- a/src/withsctp/withsctp.in
-+++ b/src/withsctp/withsctp.in
-@@ -2,7 +2,8 @@
- # -*- sh -*-
- LIBDIR=@libdir@/@PACKAGE@
- BINDIR=@bindir@
--export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.17
-+LIBVER=@PACKAGE_VERSION@
-+export LD_PRELOAD=${LIBDIR}/libwithsctp.so.${LIBVER}
- if ! ${BINDIR}/checksctp 2> /dev/null
- then
- ${BINDIR}/checksctp;
---
-2.7.4
-
diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb
index 3cabc4f..1e2c644 100644
--- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb
+++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb
@@ -8,20 +8,13 @@
file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
"
-SRCREV = "1b077af62d83d53c34b1bde8bad6648149d5edf9"
+SRCREV = "12c74404e09755561dee40cf194954f7ff5afd60"
PV .= "+git${SRCPV}"
LK_REL = "1.0.18"
SRC_URI = " \
git://github.com/sctp/lksctp-tools.git \
- file://0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch \
- file://0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch \
- file://0001-build-fix-netinet-sctp.h-not-to-be-installed.patch \
- file://0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch \
- file://0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch \
- file://0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch \
- file://0001-test_1_to_1_events.c-initialize-event-properly.patch \
file://run-ptest \
file://v4test.sh \
file://v6test.sh \
diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.41.0.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.42.0.bb
similarity index 89%
rename from meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.41.0.bb
rename to meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.42.0.bb
index 29ab0b7..d24b0b4 100644
--- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.41.0.bb
+++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.42.0.bb
@@ -11,8 +11,8 @@
https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz \
file://0001-fetch-ocsp-response-use-python3.patch \
"
-SRC_URI[md5sum] = "549db3507a7637b28ca467c7f3e9e023"
-SRC_URI[sha256sum] = "abc25b8dc601f5b3fefe084ce50fcbdc63e3385621bee0cbfa7b57f9ec3e67c2"
+SRC_URI[md5sum] = "c38f1d230af8cec480ff9dd60c9e0db0"
+SRC_URI[sha256sum] = "c5a7f09020f31247d0d1609078a75efadeccb7e5b86fc2e4389189b1b431fe63"
inherit cmake manpages python3native
PACKAGECONFIG[manpages] = ""
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch
deleted file mode 100644
index 81ffeec..0000000
--- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6543f3e2d5fe214e2fc6c050289bf1ae73b18724 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 30 Aug 2017 13:56:24 -0700
-Subject: [PATCH] nDPI: Include sys/types.h
-
-Needed for uint_t types
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- nDPI/src/include/ipq_api.h | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: ntop-5.0.1/nDPI/src/include/ipq_api.h
-===================================================================
---- ntop-5.0.1.orig/nDPI/src/include/ipq_api.h
-+++ ntop-5.0.1/nDPI/src/include/ipq_api.h
-@@ -24,6 +24,7 @@
- #ifndef __IPOQUE_API_INCLUDE_FILE__
- #define __IPOQUE_API_INCLUDE_FILE__
-
-+#include <sys/types.h>
-
- #if defined(HAVE_NTOP) && defined(WIN32)
- #include <winsock2.h>
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch
deleted file mode 100644
index d6f7eb5..0000000
--- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From d22ddc73f00ed056032a635ee8379305ec83bf81 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Wed, 11 Jul 2018 12:02:50 +0800
-Subject: [PATCH] plugins/Makefile.am: fix for automake 1.16.1
-
-Fixed:
-| i586-poky-linux-gcc: error: netflowPlugin.o: No such file or directory
-| i586-poky-linux-gcc: error: unrecognized command line option '-flat_namespace'; did you mean '-Wnamespaces'?
-| i586-poky-linux-gcc: fatal error: no input files
-
-The previous code make things complicated, but we don't have to, let libtool do
-most of the things can fix the problem.
-
-Upstream-Status: Pending [ntop is not longer maintained any more, we need consider moving to ntopng]
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- plugins/Makefile.am | 34 ++++++----------------------------
- 1 file changed, 6 insertions(+), 28 deletions(-)
-
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 64492e0..bcd0c10 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -69,40 +69,18 @@ libsflowPlugin_la_CFLAGS = $(AM_CFLAGS)
- # by default ntop looks for plugins in the plugins/ subdirectory
- #
-
--
--.libs/libnetflowPlugin.so@SO_VERSION_PATCH@:
-- @if test -f libnetflowPlugin_la-netflowPlugin.o; then \
-- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \
-- else \
-- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ netflowPlugin.o; \
-- fi
--
--netflowPlugin.so$(EXEEXT): .libs/libnetflowPlugin.so@SO_VERSION_PATCH@
-- @$(LN_S) .libs/libnetflowPlugin.so netflowPlugin.so
-+netflowPlugin.so$(EXEEXT): libnetflowPlugin.la
-+ @$(LN_S) -f .libs/libnetflowPlugin.so netflowPlugin.so
-
- ###############
-
--.libs/librrdPlugin.so@SO_VERSION_PATCH@:
-- @if test -f librrdPlugin_la-rrdPlugin.o; then \
-- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ librrdPlugin_la-rrdPlugin.o; \
-- else \
-- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ rrdPlugin.o; \
-- fi
--
--rrdPlugin.so$(EXEEXT): .libs/librrdPlugin.so@SO_VERSION_PATCH@
-- @$(LN_S) .libs/librrdPlugin.so rrdPlugin.so
-+rrdPlugin.so$(EXEEXT): librrdPlugin.la
-+ @$(LN_S) -f .libs/librrdPlugin.so rrdPlugin.so
-
- ###############
-
--.libs/libsflowPlugin.so@SO_VERSION_PATCH@:
-- @if test -f libsflowPlugin_la-sflowPlugin.o; then \
-- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ libsflowPlugin_la-sflowPlugin.o; \
-- else \
-- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ sflowPlugin.o; \
-- fi
--
--sflowPlugin.so$(EXEEXT): .libs/libsflowPlugin.so@SO_VERSION_PATCH@
-- @$(LN_S) .libs/libsflowPlugin.so sflowPlugin.so
-+sflowPlugin.so$(EXEEXT): libsflowPlugin.la
-+ @$(LN_S) -f .libs/libsflowPlugin.so sflowPlugin.so
-
- ###############
-
---
-2.7.4
-
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/embed-libs.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/embed-libs.patch
deleted file mode 100644
index 2d1ab73..0000000
--- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/embed-libs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Use --embed option so that it can return libpython as well
-
-% ../recipe-sysroot-native/usr/bin/python3-native/python3-config --libs --embed
--lpython3.8 -lcrypt -lpthread -ldl -lutil -lm -lm
-[kraj@apollo /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/ntop/5.0.1-r0/ntop-5.0.1]
-% ../recipe-sysroot-native/usr/bin/python3-native/python3-config --libs
--lcrypt -lpthread -ldl -lutil -lm -lm
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/configure.in
-+++ b/configure.in
-@@ -1463,7 +1463,7 @@ dnl>
- fi
-
- if test "x$PYTHON_CONFIG" != "x"; then
-- PYTHON_LIBS="`$PYTHON_CONFIG --libs`"
-+ PYTHON_LIBS="`$PYTHON_CONFIG --libs --embed`"
- if test "x$PYTHON_LIBS" = "x"; then
- AC_MSG_RESULT(Python[-devel] support is present but misconfigured)
- else
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/fix-missing-return-from-non-void-function.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/fix-missing-return-from-non-void-function.patch
deleted file mode 100644
index e627e59..0000000
--- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/fix-missing-return-from-non-void-function.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix following error:
-
-netflowPlugin.c: In function 'netflowUtilsLoop':
-netflowPlugin.c:2144:1: error: no return statement in function returning non-void [-Werror=return-type]
- 2144 | }
- | ^
-
-Return NULL like netflowMainLoop does.
-
---- ntop-5.0.1.orig/plugins/netflowPlugin.c 2012-03-09 17:44:17.000000000 +0000
-+++ ntop-5.0.1/plugins/netflowPlugin.c 2019-08-09 10:25:40.878799852 +0000
-@@ -2141,6 +2141,7 @@
- waitCondvar(&myGlobals.device[deviceId].netflowGlobals->ifStatsQueueCondvar);
- }
- }
-+ return(NULL);
- }
- #endif
-
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop.service b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop.service
deleted file mode 100644
index 1ead2a0..0000000
--- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=A network traffic probe similar to the UNIX top command
-Requires=network.target
-
-ConditionPathExists=@SYSCONFDIR@/ntop.conf
-After=syslog.target network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@LIBEXECDIR@/ntop-helper start
-ExecStop=@LIBEXECDIR@/ntop-helper stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch
deleted file mode 100644
index 392cb08..0000000
--- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-1)add --with-pcap-config option to use libpcap's pcap-config
-2)add AC_CHECK_LIB if user didn't specify PCAP_ROOT and pcap-config
- put it before host check to make cross-compiling easier.
- pcap doesn't need extra include and libs so it is fine.
-3)remove old rrd configure code but use pkg-config to config rrd
- rrdtool should have the pkg-config file installed.
-4)fix python-config
-5)change AC_TRY_RUN to AC_COMPILE_IFELSE for pthread_rwlock_t checking
-6)fix a net-snmp-config bug
-
-Upstream-Status: Pending
-
-Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
----
-diff --git a/configure.in b/configure.in
-index 0c7c0a5..cad40be 100644
---- a/configure.in
-+++ b/configure.in
-@@ -230,14 +230,14 @@ dnl>
- AC_ARG_WITH(void,
- [ +-External-source-locations:-------------------------------------------------+])
-
--AC_ARG_WITH( rrd-home,
-- [ --with-rrd-home=DIR Usually /usr/local/rrdtool-1.2.x],
-- RRD_HOME="$withval",
-- RRD_HOME=/usr/local/rrdtool-1.2.19)
- AC_ARG_WITH( pcap-root,
- [ --with-pcap-root=DIR LBNL pcap located in DIR],
- PCAP_ROOT="$withval",
- PCAP_ROOT=)
-+AC_ARG_WITH( pcap-config,
-+ [ --with-pcap-config=path/pcap-config where to find pcap-config],
-+ PCAP_CONFIG="$withval",
-+ PCAP_CONFIG=)
- AC_ARG_WITH( gdbm-root,
- [ --with-gdbm-root=DIR gdbm located in DIR],
- GDBM_DIRECTORY="$withval",
-@@ -556,6 +556,7 @@ if test ".${PCAPRING_DIR}" != .; then
- else
-
- TMP_ROOT=${HOME}/PF_RING/userland/libpcap/
-+FOUND_PCAP=1
- if test ".${PCAP_ROOT}" == . &&
- test -d ${TMP_ROOT} &&
- test -r ${TMP_ROOT}/libpcap.a; then
-@@ -563,6 +564,18 @@ if test ".${PCAP_ROOT}" == . &&
- CORELIBS="${CORELIBS} -L${TMP_ROOT} -L${HOME}/PF_RING/userland/lib -lpfring -lpcap "
- INCS="${INCS} -I ${PCAP_ROOT}"
- AC_MSG_RESULT([found in $PCAP_ROOT])
-+elif test -n "${PCAP_CONFIG}" && test -x "${PCAP_CONFIG}"; then
-+ CORELIBS="${CORELIBS} $(${PCAP_CONFIG} --libs)"
-+ INCS="${INCS} $(${PCAP_CONFIG} --cflags)"
-+ AC_DEFINE_UNQUOTED(HAVE_LIBPCAP, 1, [have libpcap ])
-+ AC_MSG_RESULT([found pcap-config: $PCAP_CONFIG, libs:$(${PCAP_CONFIG} --libs) cflags:$(${PCAP_CONFIG} --cflags)])
-+else
-+ AC_CHECK_LIB(pcap, pcap_lookupdev, ,
-+ [FOUND_PCAP=])
-+fi
-+
-+if test -n "$FOUND_PCAP"; then
-+ :
- elif test ".${PCAP_ROOT}" != .; then
- if test -d $PCAP_ROOT &&
- test -r $PCAP_ROOT/lib/libpcap.a &&
-@@ -880,44 +893,11 @@ AC_CHECK_LIB([z], [zlibVersion], [], [
- exit -1
- ])
-
--# RRD
--if test -d "$RRD_HOME"; then
-- AC_MSG_RESULT(checking for RRD home... yes)
--else
-- RRD_HOME=/usr/local/rrdtool
-- if test -d "$RRD_HOME"; then
-- AC_MSG_RESULT(Checking rrdtool in $RRD_HOME)
-- else
-- RRD_HOME=/usr/local
-- fi
--fi
--
--RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
--
--if test -f "$RRD_HOME/lib/librrd_th.so"; then
-- AC_MSG_RESULT(checking for rrdtool... yes)
--else
-- if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
-- AC_MSG_RESULT(checking for rrdtool... yes)
-- else
-- if test -f "$RRD_HOME/lib/librrd_th.a"; then
-- AC_MSG_RESULT(checking for rrdtool... yes)
-- else
-- AC_CHECK_LIB([rrd_th], [main])
-- if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
-- AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
-- AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
-- else
-- RRD_LIB=
-- fi
-- fi
-- fi
--fi
--
--RRD_INC=
--if test -d "${RRD_HOME}/include"; then
-- RRD_INC="-I${RRD_HOME}/include"
--fi
-+PKG_CHECK_MODULES( [RRD], [librrd] )
-+AC_SUBST(RRD_CFLAGS)
-+AC_SUBST(RRD_LIBS)
-+RRD_INC=$RRD_FLAGS
-+RRD_LIB=$RRD_LIBS
-
- dnl> The failed recheck stuff below is courtesy of Chris Turbeville [turbo@verio.net]
- dnl> Chris developed this for Solaris 9, confirming work I had done earlier for FreeBSD
-@@ -1041,7 +1021,7 @@ AC_CHECK_HEADERS([sched.h sys/sched.h])
- AC_CHECK_HEADERS([pthread.h])
-
- AC_MSG_CHECKING([if r/w locks are supported])
--AC_TRY_RUN([
-+AC_COMPILE_IFELSE([
- #include <pthread.h>
-
- int main()
-@@ -1443,15 +1423,15 @@ dnl> NET-SNMP
- dnl>
- if test ".${ac_disable_snmp}" != ".yes"; then
- AC_CHECK_TOOL(NETSNMP, net-snmp-config)
-- if test "x$ac_cv_prog_ac_ct_NETSNMP" = "xnet-snmp-config"; then
-+ if test -n "$NETSNMP"; then
- AC_DEFINE_UNQUOTED(HAVE_SNMP, 1, [SNMP is supported])
-- SNMPLIBS="`net-snmp-config --libs`"
-+ SNMPLIBS="`$NETSNMP --libs`"
- SNMPLIBS="`echo ${SNMPLIBS}|sed -e s,'-R../lib',,g`"
- echo "net-snmp libs: ${SNMPLIBS}"
- LIBS="${LIBS} ${SNMPLIBS}"
- dnl remove unecessary path
- LIBS=`echo ${LIBS}|sed -e s,'-R../lib',,g`
-- INCS="${INCS} `net-snmp-config --cflags`"
-+ INCS="${INCS} `$NETSNMP --cflags`"
- else
- AC_MSG_RESULT(NETSNMP is not present: SNMP support is disabled)
- fi
-@@ -1464,10 +1444,9 @@ SAVED_LIBS=$LIBS
- dnl>
- dnl> PYTHON
- dnl>
-- AC_CHECK_TOOL(PYTHON, python-config)
-- PYTHON_CONFIG=""
-+ AC_CHECK_TOOL(PYTHON_CONFIG, python-config)
-
-- if test "x$ac_cv_prog_ac_ct_PYTHON" != "xpython-config"; then
-+ if test -z "$PYTHON_CONFIG"; then
- if test -f "/etc/debian_version"; then
- AC_MSG_RESULT(Please install python-dev and rerun configure)
- exit 1
-@@ -1481,8 +1460,6 @@ dnl>
- PYTHON_CONFIG="python-config"
- fi
- fi
-- else
-- PYTHON_CONFIG="python-config"
- fi
-
- if test "x$PYTHON_CONFIG" != "x"; then
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch
deleted file mode 100644
index 269138d..0000000
--- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Check net-snmp-config's existence in case user specified the
-ac_cv_prog_NETSNMP to avoid HAVE_SNMP defined if the specified
-net-snmp-config doesn't exist.
-
-Upstream-Status: Inappropriate [Embedded specific]
-
-Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
----
-diff --git a/configure.in b/configure.in
-index 6f3e88f..8ddf017 100755
---- a/configure.in
-+++ b/configure.in
-@@ -1423,7 +1423,7 @@ dnl> NET-SNMP
- dnl>
- if test ".${ac_disable_snmp}" != ".yes"; then
- AC_CHECK_TOOL(NETSNMP, net-snmp-config)
-- if test -n "$NETSNMP"; then
-+ if test -n "$NETSNMP" -a -e "$NETSNMP"; then
- AC_DEFINE_UNQUOTED(HAVE_SNMP, 1, [SNMP is supported])
- SNMPLIBS="`$NETSNMP --libs`"
- SNMPLIBS="`echo ${SNMPLIBS}|sed -e s,'-R../lib',,g`"
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_init.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_init.patch
deleted file mode 100644
index e7684c1..0000000
--- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_init.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-Modify ntop.init to WRLinux 5.0 style.
-
-Fix a small problem that when ntop not running,
-/etc/init.d/ntop stop will return 1
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
----
- packages/RedHat/ntop.init | 102 +++++++++-----------------------------------
- 1 files changed, 21 insertions(+), 81 deletions(-)
-
-diff --git a/packages/RedHat/ntop.init b/packages/RedHat/ntop.init
-index 40d49f1..a189c59 100755
---- a/packages/RedHat/ntop.init
-+++ b/packages/RedHat/ntop.init
-@@ -10,19 +10,9 @@
- # You have set the admin password - read docs/1STRUN.txt
- # You have created /etc/ntop.conf with appropriate parameters.
-
--# To identify an interface to ntop, use the following flags
--# in /etc/sysconfig/network-scripts/ifcfg-ethx
--
--# NTOP="yes" <--- means for ntop to use this interface
--# NTOPCONFIG="yes" <--- means for ntop to configure this interface
--
- # Note that if you give a -i parameter in either /etc/ntop.conf or
- # the command line, the scan is NOT performed.
-
--# However, when it comes to the configuration step, with NTOPCONFIG="yes"
--# the interface is configured regardless of how the interface list was
--# specified.
--
- #
- # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
- #
-@@ -107,11 +97,7 @@ ntopusesyslog="local3"
- invoked=$0
-
- # Source function library.
--. /etc/rc.d/init.d/functions
--
--# Source networking configuration.
--. /etc/sysconfig/network
--
-+. /etc/init.d/functions
-
- # Basic sanity checks...
- if ! [ -x $prog ]; then
-@@ -124,16 +110,6 @@ if ! [ -x $prog ]; then
- exit 1
- fi
-
--if [ ${NETWORKING} = "no" ]; then
-- echo ""
-- echo "ERROR -"
-- echo " Networking is not up!"
-- echo ""
-- echo "Aborting..."
-- echo ""
-- exit 1
--fi
--
- if ! [ -f ${conf} ]; then
- echo ""
- echo "ERROR -"
-@@ -180,8 +156,8 @@ fi
- if [ "${debug}" = "y" ]; then echo "DEBUG: parm file temp is ${parmfile}"; fi
-
- cmd=`echo \
-- @${conf} \
- -i tbd \
-+ @${conf} \
- $extra $@`
-
- echo ${cmd} | awk ' \
-@@ -305,42 +281,6 @@ logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Configuration
-
- # Build list of interfaces, e.g eth0 eth1 eth1:1
- # (Yeah, we'll have to convert that to eth0,eth1,eth1:1 later
--if [ ".${ntopinterface}" = ".tbd" ]; then
--
-- ntopinterface=""
-- iflist=`ip link show | \
-- awk '/^[0-9]*:\ eth/ { printf("%s ", substr($2, 1, length($2)-1)) }'`
-- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Scanning all interfaces $iflist"
-- if [ "${debug}" = "y" ]; then echo "DEBUG: Interface candidates are ${iflist}"; fi
--
-- for eth in $iflist; do
--
-- if ! LANG=C egrep -L "^[Nn][Tt][Oo][Pp]=['\"]?[Yy][Ee][Ss]['\"]?" \
-- /etc/sysconfig/network-scripts/ifcfg-$eth > /dev/null ; then
-- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is not ntop=yes, skipping"
-- if [ "${debug}" = "y" ]; then echo "DEBUG: $eth not ntop=yes"; fi
-- continue
-- fi
--
-- ntopinterface="${ntopinterface} $eth"
--
-- ip=`ip addr show $eth | \
-- awk '/inet/ { printf("%s", substr($2, 1, index($2, "/")-1)) }'`
--
-- if [ ".$ip" = "." ]; then
-- is="is unnumbered interface"
-- else
-- is="has IP address $ip"
-- fi
-- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is ntop=yes, ${is}"
-- if [ "${debug}" = "y" ]; then echo "DEBUG: $eth ntop=yes, ${is}"; fi
--
-- done
--
--else
-- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Skipping interface scan - list in parms"
--fi
--
- if [ "x${ntopinterface}" = "x" ]; then
- ntopinterface="none"
- fi
-@@ -462,12 +402,6 @@ config_interfaces () {
- if="${if},${eth}"
- fi
-
-- if ! LANG=C egrep -L "^[Nn][Tt][Oo][Pp][Cc].*=['\"]?[Yy][Ee][Ss]['\"]?" \
-- /etc/sysconfig/network-scripts/ifcfg-$eth > /dev/null ; then
-- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is not ntopconfigure=yes, skipping"
-- continue
-- fi
--
- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Configuring $eth"
- if [ "${debug}" = "y" ]; then echo "DEBUG: Configuring $eth"; fi
-
-@@ -527,7 +461,7 @@ start () {
- show_extra
- config_interfaces
-
-- cmd=`echo $prog \
-+ cmd=`echo \
- @${conf} \
- -i $if \
- $extra $@`
-@@ -541,7 +475,7 @@ start () {
- if [ ".${ldlibpath}" != "." ]; then
- export LD_LIBRARY_PATH="${ldlibpath}"
- fi
-- daemon ${cmd}
-+ start-stop-daemon --start --quiet --exec $prog -- ${cmd}
- RETVAL=$?
-
- [ $RETVAL = 0 ] && touch /var/lock/subsys/${name}${instance}
-@@ -551,6 +485,7 @@ start () {
- stop () {
- # stop daemon
-
-+ NOT_RUNNING=1
- RETVAL=1
- echo -n $"Stopping ${name}${instance}: "
- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Stopping: ${name}${instance}"
-@@ -563,13 +498,14 @@ stop () {
- if [ $rc = 0 ]; then
- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Sending SIGTERM to ${pid}"
- if [ "${debug}" = "y" ]; then echo "Sending SIGTERM to ${pid}"; fi
-- kill -s SIGTERM ${pid}
-+ kill -TERM ${pid} 2>&1 > /dev/null
- RETVAL=$?
- rm -f ${ntopdbfilepath}/ntop.pid
- else
- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Unable to find process ${pid} ... will kill by name"
- if [ "${debug}" = "y" ]; then echo "Unable to find process ${pid} ... will kill by name"; fi
- fi
-+ NOT_RUNNING=0
- else
-
- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Unable to find ${ntopdbfilepath}/ntop.pid file ... will kill by name"
-@@ -577,15 +513,16 @@ stop () {
-
- fi
-
-- echo
--
- if [ $RETVAL != 0 ]; then
- pids=`ps axf | grep '\/usr\/bin\/ntop' | awk '{ printf(" %s", $1) }; END { print "" }'`
-- if [ "${pids}" != " " ]; then
-+ if [ "${pids}" != "" ]; then
- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Sending SIGTERM to ${prog}...${pids}"
- if [ "${debug}" = "y" ]; then echo "Sending SIGTERM to ${prog}...${pids}"; fi
-- kill -INT ${pids}
-+ kill -TERM ${pids} > /dev/null 2>&1
- RETVAL=$?
-+ NOT_RUNNING=0
-+ else
-+ NOT_RUNNING=1
- fi
- fi
-
-@@ -597,13 +534,9 @@ stop () {
- if [ "${debug}" = "y" ]; then echo "DEBUG: Unconfiguring interfaces"; fi
-
- for eth in ${ntopinterface}; do
-- if ! LANG=C egrep -L "^[Nn][Tt][Oo][Pp][Cc].*=['\"]?[Yy][Ee][Ss]['\"]?" \
-- /etc/sysconfig/network-scripts/ifcfg-$eth > /dev/null ; then
-- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - $eth is not ntopconfigure=yes, skipping"
-- if [ "${debug}" = "y" ]; then echo "DEBUG: $eth is not ntopconfigure=yes"; fi
-- continue
-+ if [ "$eth" = "none" ]; then
-+ continue
- fi
--
- logger -p ${ntopusesyslog} -t ${name}${instance} -- "INITD - Unconfiguring $eth"
- if [ "${debug}" = "y" ]; then echo "DEBUG: Unconfiguring $eth"; fi
-
-@@ -623,6 +556,13 @@ stop () {
- if [ "${debug}" = "y" ]; then echo "DEBUG: Interfaces are unconfigured"; fi
- fi
-
-+ if [ $NOT_RUNNING -eq 1 -o $RETVAL -eq 0 ]; then
-+ echo " [ OK ]"
-+ RETVAL=0
-+ else
-+ echo " [ FAILED ]"
-+ fi
-+
- return $RETVAL
- }
-
---
-1.7.5.4
-
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch
deleted file mode 100644
index 9f57ca4..0000000
--- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-change osName to version as it prints out "ntop Version".
-
-Upstream-Status: Pending
-
-Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
----
-diff --git a/webInterface.c b/webInterface.c
-index 5622e69..8cb7a67 100644
---- a/webInterface.c
-+++ b/webInterface.c
-@@ -5816,7 +5816,7 @@ static void printNtopConfigInfoData(int textPrintFlag, UserPref *pref) {
- printInfoSectionTitle(textPrintFlag, "Basic Information");
-
- safe_snprintf(__FILE__, __LINE__, formatBuf, sizeof(formatBuf), "%s (%d bit)",
-- osName, sizeof(long) == 8 ? 64 : 32);
-+ version, sizeof(long) == 8 ? 64 : 32);
- printFeatureConfigInfo(textPrintFlag, "ntop Version", formatBuf);
-
- #ifndef WIN32
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch
deleted file mode 100644
index 2b001c1..0000000
--- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-[PATCH] replace 'inline' with 'static inline' for gcc 5.x
-
-gcc 5.x defaults to -std=gnu11 instead of -std=gnu89 which change
-the semantics for inline functions and the standalone 'inline'
-causes error with "gcc5 -g -o0"
-
-Replace inline with static inline to be compatible with both gcc 4
-and 5.
-
-Upstream-status: Pending
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
----
- nDPI/src/lib/protocols/ssl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nDPI/src/lib/protocols/ssl.c b/nDPI/src/lib/protocols/ssl.c
-index 245b8c3..72beda9 100644
---- a/nDPI/src/lib/protocols/ssl.c
-+++ b/nDPI/src/lib/protocols/ssl.c
-@@ -39,7 +39,7 @@ static void ipoque_int_ssl_add_connection(struct ipoque_detection_module_struct
-
- #ifdef HAVE_NTOP
- #ifndef WIN32
--inline int min(int a, int b) { return(a < b ? a : b); }
-+static inline int min(int a, int b) { return(a < b ? a : b); }
- #endif
-
- static void stripCertificateTrailer(char *buffer, int buffer_len) {
---
-1.9.1
-
diff --git a/meta-openembedded/meta-networking/recipes-support/ntop/ntop_5.0.1.bb b/meta-openembedded/meta-networking/recipes-support/ntop/ntop_5.0.1.bb
deleted file mode 100644
index 13a8784..0000000
--- a/meta-openembedded/meta-networking/recipes-support/ntop/ntop_5.0.1.bb
+++ /dev/null
@@ -1,142 +0,0 @@
-SUMMARY = "ntop is network top"
-DESCRIPTION = "ntop is a network traffic probe that shows the network usage, \
-similar to what the popular top Unix command does."
-
-SECTION = "console/network"
-
-LICENSE = "GPLv2+ & GPLv3 & OpenSSL"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
- file://LICENSE-OpenSSL.txt;md5=a409f902e447ddd889cffa0c70e7c7c2 \
- "
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tar.gz \
- file://ntop_configure_in.patch \
- file://ntop_init.patch \
- file://ntop_webInterface.patch \
- file://ntop_configure_in_net_snmp_config_exist.patch \
- file://ntop.service \
- file://use-static-inline.patch \
- file://0001-nDPI-Include-sys-types.h.patch \
- file://0001-plugins-Makefile.am-fix-for-automake-1.16.1.patch \
- file://fix-missing-return-from-non-void-function.patch \
- file://embed-libs.patch \
- "
-SRC_URI[md5sum] = "01710b6925a8a5ffe1a41b8b512ebd69"
-SRC_URI[sha256sum] = "7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8"
-
-UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ntop/files/ntop/Stable"
-
-inherit autotools-brokensep useradd python3native pkgconfig systemd
-
-DEPENDS = "geoip rrdtool python3 zlib libpcap gdbm"
-
-PACKAGECONFIG ??= "openssl snmp plugins"
-PACKAGECONFIG[openssl] = "--with-ssl, --without-ssl, openssl, openssl"
-PACKAGECONFIG[snmp] = "--enable-snmp=yes NETSNMP=${STAGING_BINDIR_CROSS}/net-snmp-config, \
---disable-snmp,net-snmp,"
-PACKAGECONFIG[plugins] = "--enable-plugins=yes, --disable-plugins, ,"
-
-EXTRA_OECONF += "ac_cv_file_aclocal_m4=yes ac_cv_file_depcomp=no PYTHON_CONFIG=python3-config"
-
-do_configure() {
- cp ${STAGING_DATADIR_NATIVE}/aclocal/libtool.m4 libtool.m4.in
- install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
- install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
- install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/nDPI
- install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/nDPI
- cat acinclude.m4.in acinclude.m4.ntop libtool.m4.in > acinclude.m4
- cp 3rd_party/* ./
-
- # config nDPI
- cd nDPI
- ./configure ${CONFIGUREOPTS} --with-pic
- cd ..
-
- sed -i -e 's:^CFG_DBFILE_DIR=$localstatedir/ntop:CFG_DBFILE_DIR=$localstatedir/lib/ntop:' ${S}/configure.in
-
- # fix the CFLAGS, CPPFLAGS, LDFLAGS, remove the host include
- sed -i \
- -e 's:\(^CFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \
- -e 's:\(^CPPFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \
- -e 's:\(^LDFLAGS="\$.*\) -L/usr/local/lib -L/opt/local/lib":\1":' \
- ${S}/configure.in
-
- # replace the DISTRO RELEASE in configure.in which are host's
- # with our release, although those doesn't affect functionality
- sed -i -e \
- '/DEFINEOS="LINUX"/{N;s/DISTRO=.*/DISTRO="${DISTRO}"/;N;s/RELEASE=.*/RELEASE="${DISTRO_VERSION}"/;}' \
- ${S}/configure.in
-
- # osName in original configure.in should be ${TARGET_SYS}
- # which will show in ntop's "show configuration"
- sed -i -e \
- 's:^osName=.*:osName=${TARGET_SYS}:' \
- ${S}/configure.in
-
- # rename configureextra to configureextra_rename to avoid
- # configure.in to guess host OS and pull in more configure, non needed
- # which will cause some cross-compiling failure on specific host
- # e.g. SUSE(SLED...)
- test ! -f configureextra || mv -f configureextra configureextra_rename
-
- # make sure configure finds python includdirs/libs with these envs
- export BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- STAGING_INCDIR=${STAGING_INCDIR} \
- STAGING_LIBDIR=${STAGING_LIBDIR}
-
- autotools_do_configure
-}
-
-do_compile_prepend() {
- cd nDPI
- oe_runmake
- cd ..
-}
-
-do_install_append() {
- # remove the empty dirs
- rm -rf ${D}${libdir}/plugins
-
- install -D -m 0755 ${S}/packages/RedHat/ntop.init \
- ${D}${sysconfdir}/init.d/ntop
- install -D -m 0644 ${S}/packages/RedHat/ntop.conf.sample \
- ${D}${sysconfdir}/ntop.conf
-
- # change ntop dir in ntop.conf
- # don't use the -P as the ntop.init didn't support it
- sed -i -e "s:^--db-file-path /usr/share/ntop:--db-file-path /var/lib/ntop:" \
- -e "s:^#? -P /var/ntop:#? -P /var/lib/ntop:" \
- ${D}${sysconfdir}/ntop.conf
-
- # For systemd
- if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
- install -D -m 0755 ${S}/packages/RedHat/ntop.init ${D}${libexecdir}/ntop-helper
- install -D -m 0644 ${WORKDIR}/ntop.service ${D}${systemd_system_unitdir}/ntop.service
- sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \
- -e 's,@SYSCONFDIR@,${sysconfdir},g' \
- ${D}${systemd_system_unitdir}/ntop.service
- fi
-
- # Fix host-user-contaminated issue
- chown -R root:root ${D}
-
- chown -R ntop.ntop ${D}${datadir}/ntop
- chown -R ntop:ntop ${D}${localstatedir}/lib/ntop
-}
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "-M -g ntop -r -d ${localstatedir}/lib/ntop \
--s /usr/sbin/nologin -c 'ntop' ntop"
-GROUPADD_PARAM_${PN} = "-r ntop"
-
-SYSTEMD_SERVICE_${PN} = "ntop.service"
-SYSTEMD_AUTO_ENABLE = "disable"
-
-FILES_${PN}_append = "${libdir}/ntop/plugins ${libdir}/libntop-*.so \
- ${libdir}/libntopreport-*.so ${libdir}/lib*-${PV}.so"
-FILES_${PN}-dev = "${includedir} ${libdir}/libntop.so \
- ${libdir}/libntopreport.so \
- ${libdir}/libnetflowPlugin.so ${libdir}/libsflowPlugin.so \
- ${libdir}/librrdPlugin.so \
- ${libdir}/*.la"
-
diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch
new file mode 100644
index 0000000..4672455
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch
@@ -0,0 +1,39 @@
+From 65c15247d268566b79e4595b8e734b7e40679d75 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Wed, 4 Nov 2020 08:55:10 +0000
+Subject: [PATCH] Makefile.in: don't use the internal lua
+
+ntopng depends on lua and it will compile the lua under
+third-party sub dir of source tree, but this one supports
+cross-compiling badly, so use the one under RECIPE_SYSROOT.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ Makefile.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 143535746..fc06a5341 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -40,7 +40,6 @@ endif
+
+ LUA_HOME=${PWD}/third-party/lua-5.3.5
+ LUA_INC=-I$(LUA_HOME)/src
+-LUA_LIB=$(LUA_HOME)/src/liblua.a
+
+ ######
+ LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
+@@ -118,7 +117,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm
+ RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm
+ ######
+
+-LIB_TARGETS = $(LUA_LIB)
+
+ ifneq ($(HAS_ZEROMQ), 0)
+ LIB_TARGETS += $(ZEROMQ_LIB)
+--
+2.26.2
+
diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch
new file mode 100644
index 0000000..8d62147
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-generate-configure.ac-only.patch
@@ -0,0 +1,36 @@
+From 22f0bec462763f1b0b92daa33133e274d3b45f4f Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 5 Nov 2020 00:05:21 -0800
+Subject: [PATCH] autogen.sh: generate configure.ac only
+
+The autogen.sh should only generate configure.ac and the
+logic used to generate configure script should follow the
+autotools.bbclass in oe. Otherwise there may comes below
+do_configure error:
+ | checking whether we are cross compiling... configure: error: in `/path/tmp/work/core2-64-poky-linux/ndpi/3.4-r0/git':
+ | configure: error: cannot run C compiled programs.
+ | If you meant to cross compile, use `--host'.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ autogen.sh | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 73f8d0ebe..15ff0aa84 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -73,8 +73,3 @@ cat configure.seed | sed \
+ > configure.ac
+
+ rm -f config.h config.h.in *~ #*
+-
+-echo "Wait please..."
+-autoreconf -if
+-echo ""
+-echo "Now run ./configure"
+--
+2.17.1
+
diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
new file mode 100644
index 0000000..ffc6ec1
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
@@ -0,0 +1,33 @@
+From d482bcc8fca90afc95ac3cbe848a3c9d7ad81ddc Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Wed, 4 Nov 2020 23:37:44 -0800
+Subject: [PATCH] autogen.sh: not generate configure
+
+Only use autogen.sh to generate configure.ac.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ autogen.sh | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index df734ce9..d7bbf8cb 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -52,11 +52,3 @@ cat configure.seed | sed \
+ -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \
+ -e "s/@FUZZY@/$FUZZY/g" \
+ > configure.ac
+-
+-autoreconf -ivf
+-cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp
+-cat configure.tmp > configure
+-
+-chmod +x configure
+-./configure $@
+-
+--
+2.17.1
+
diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch
new file mode 100644
index 0000000..dffab24
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch
@@ -0,0 +1,42 @@
+From 29797dd037009d38e4976249ed21b2076240751e Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Wed, 4 Nov 2020 04:36:46 +0000
+Subject: [PATCH] configure.seed: fix configure error
+
+fix the below error:
+configure: error: cannot run test program while cross compiling
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ configure.seed | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/configure.seed b/configure.seed
+index a321f9bbf..03f9a31b0 100644
+--- a/configure.seed
++++ b/configure.seed
+@@ -642,18 +642,7 @@ if test x$radcli = xtrue; then
+ fi
+ fi
+
+-AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported], [
+- AC_TRY_RUN([
+- #include <pthread.h>
+-
+- int main() {
+- pthread_rwlock_t t;
+- return 0;
+- }
+-]
+-, [my_cv_rw_locks_supported=yes], [my_cv_rw_locks_supported=no])
+-]
+-)
++AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported])
+
+ if test "$my_cv_rw_locks_supported" = yes; then
+ AC_DEFINE_UNQUOTED(HAVE_RW_LOCK, 1, [pthread rwlocks supported])
+--
+2.26.2
+
diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch
new file mode 100644
index 0000000..a5ac59f
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch
@@ -0,0 +1,82 @@
+From 81e3512718f80965c26ccb1f9d694c91b121fea0 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Wed, 4 Nov 2020 06:28:28 +0000
+Subject: [PATCH] configure.seed: fix host contamination
+
+Fix below error:
+This autoconf log indicates errors, it looked at host include and/or
+library paths while determining system capabilities.
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ configure.seed | 47 +++++------------------------------------------
+ 1 file changed, 5 insertions(+), 42 deletions(-)
+
+diff --git a/configure.seed b/configure.seed
+index 03f9a31b0..58aebb5b8 100644
+--- a/configure.seed
++++ b/configure.seed
+@@ -79,31 +79,6 @@ fi
+ #
+ REVISION=`git log --pretty=oneline | wc -l`
+
+-if test -d "/usr/local/include"; then
+- CFLAGS="${CFLAGS} -I/usr/local/include"
+- CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+-fi
+-
+-if test -d "/usr/local/lib"; then
+- LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+-fi
+-
+-if test -d /opt/local/include; then :
+- CFLAGS="${CFLAGS} -I/opt/local/include"
+- CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
+-fi
+-
+-if test -d /opt/local/lib; then :
+- LDFLAGS="${LDFLAGS} -L/opt/local/lib"
+-fi
+-
+-if [ test -f /usr/bin/lsb_release ]; then
+- CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
+- if [[ $CODENAME == "wheezy" ]]; then :
+- CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1"
+- fi
+-fi
+-
+ SHORT_MACHINE=`uname -m | cut -b1-3`
+
+ GIT_RELEASE="@GIT_RELEASE@"
+@@ -214,23 +189,11 @@ dnl> fi
+ pkg-config --exists libssl
+ if test "$?" -ne 1; then
+ AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
+- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
++ SSL_INC="`pkg-config --cflags libssl`"
+ SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
+ else
+- dnl Workaround for MacOS Brew
+- if test -d "/usr/local/opt/openssl/lib"; then
+- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
+- SSL_INC="-I/usr/local/opt/openssl/include"
+- SSL_LIB="-L/usr/local/opt/openssl/lib -lssl"
+- dnl Workaround for FreeBSD
+- elif test -f "/usr/lib/libssl.so"; then
+- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
+- SSL_INC="-I/usr/include"
+- SSL_LIB="-L/usr/lib -lssl -lcrypto"
+- else
+- echo "Please install openssl-dev(el) package prerequisite"
+- exit -1
+- fi
++ echo "Please install openssl-dev(el) package prerequisite"
++ exit -1
+ fi
+
+ AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LDFLAGS="${LDFLAGS} -lgcrypt"])
+--
+2.26.2
+
diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch
new file mode 100644
index 0000000..95d1f99
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch
@@ -0,0 +1,47 @@
+From eead0c589b71d4256bf9f16492164786b0ee07e4 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Mon, 9 Nov 2020 04:05:25 +0000
+Subject: [PATCH] configure.seed: not check clang on host
+
+Don't check clang on host to avoid host contamination.
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ configure.seed | 19 -------------------
+ 1 file changed, 19 deletions(-)
+
+diff --git a/configure.seed b/configure.seed
+index d0335b599..cb97adca2 100644
+--- a/configure.seed
++++ b/configure.seed
+@@ -509,25 +509,6 @@ if test $SYSTEM = "Darwin"; then
+ CFLAGS="-fno-color-diagnostics $CFLAGS"
+ fi
+ fi
+-else
+- if test $SYSTEM = "Linux"; then
+- if [ test -f /usr/bin/clang++ ]; then
+- CC=clang
+- CXX=clang++
+- AC_MSG_RESULT(Using clang++ compiler)
+- fi
+-
+- if [ test -f /etc/redhat-release ]; then
+- if [ test -f /usr/bin/lsb_release ]; then
+- dnl> CentOS 7
+- CENTOS_N2N_DEP=", n2n"
+- fi
+- else
+- if [ test -f /usr/bin/lsb_release ]; then
+- OS=`/usr/bin/lsb_release -d|cut -d ':' -f 2`
+- fi
+- fi
+- fi
+ fi
+
+ dnl> Remove spaces
+--
+2.26.2
+
diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/ntopng.service b/meta-openembedded/meta-networking/recipes-support/ntopng/files/ntopng.service
new file mode 100644
index 0000000..66912fb
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/ntopng.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=ntopng - High-Speed Web-based Traffic Analysis and Flow Collection Tool
+After=network.target
+
+[Service]
+Type=forking
+StandardOutput=syslog
+StandardError=inherit
+ExecStart=/usr/bin/ntopng -e -w 3000
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb
new file mode 100644
index 0000000..1e41537
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb
@@ -0,0 +1,26 @@
+SUMMARY = "A library for deep-packet inspection."
+DESCRIPTION = "nDPI is an open source LGPLv3 library for deep-packet \
+inspection. Based on OpenDPI it includes ntop extensions"
+
+SECTION = "libdevel"
+DEPENDS = "libpcap"
+RDEPENDS_${PN} += " libpcap"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24"
+
+SRCREV = "64929a75e0a7a60d864bd25a9fd97fdf9ac892a2"
+SRC_URI = "git://github.com/ntop/nDPI.git;branch=3.4-stable \
+ file://0001-autogen.sh-not-generate-configure.patch \
+"
+
+S = "${WORKDIR}/git"
+
+inherit autotools-brokensep pkgconfig
+
+do_configure_prepend() {
+ ${S}/autogen.sh
+}
+
+EXTRA_OEMAKE = " \
+ libdir=${libdir} \
+"
diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_4.2.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_4.2.bb
new file mode 100644
index 0000000..5961866
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_4.2.bb
@@ -0,0 +1,49 @@
+SUMMARY = "Web-based Traffic and Security Network Traffic Monitoring"
+DESCRIPTION = "ntopng is a web-based network traffic monitoring application \
+released under GPLv3. It is the new incarnation of the original \
+ntop written in 1998, and now revamped in terms of performance, \
+usability, and features."
+
+SECTION = "console/network"
+
+DEPENDS = "curl libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq"
+RDEPENDS_${PN} = "bash redis"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRCREV = "5e649a2d1130b4a3ab0c5bb673d615172cc0bdbb"
+SRC_URI = "git://github.com/ntop/ntopng.git;protocol=git;branch=4.2-stable \
+ file://0001-configure.seed-fix-configure-error.patch \
+ file://0001-configure.seed-fix-host-contamination.patch \
+ file://0001-Makefile.in-don-t-use-the-internal-lua.patch \
+ file://0001-autogen.sh-generate-configure.ac-only.patch \
+ file://0001-configure.seed-not-check-clang-on-host.patch \
+ file://ntopng.service \
+"
+
+S = "${WORKDIR}/git"
+
+# don't use the lua under thirdparty as it supports cross compiling badly
+export LUA_LIB = "${STAGING_LIBDIR}/liblua.a"
+
+LDFLAGS_append_mipsarch = " -latomic"
+LDFLAGS_append_powerpc = " -latomic"
+LDFLAGS_append_riscv32 = " -latomic"
+inherit autotools-brokensep gettext systemd
+
+do_install_append() {
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/ntopng.service ${D}${systemd_unitdir}/system
+}
+
+FILES_${PN} += "\
+ ${systemd_unitdir}/system/ntopng.service"
+
+FILES_${PN}-doc += "\
+ /usr/man/man8/ntopng.8"
+
+do_configure_prepend() {
+ ${S}/autogen.sh
+}
+
+SYSTEMD_SERVICE_${PN} = "ntopng.service"
diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb
index 85634a7..6918485 100644
--- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb
+++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb
@@ -38,7 +38,7 @@
SRC_URI[md5sum] = "46b452e95d69c92e4172b3673ed88d52"
SRC_URI[sha256sum] = "2244124579afb14e569f34393e9ac61e658a28b6ffa8e5c0d2c1c12a8ce695cd"
-inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base
+inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base python3targetconfig
EXTRA_OECONF = "--disable-static \
--with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \
diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.9.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.0.bb
similarity index 95%
rename from meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.9.bb
rename to meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.0.bb
index 529e391..3dc25ba 100644
--- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.9.bb
+++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.0.bb
@@ -14,8 +14,8 @@
UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads"
-SRC_URI[md5sum] = "52863fa9b98e5a3d7f8bec1d5785a2ba"
-SRC_URI[sha256sum] = "46b268ef88e67ca6de2e9f19943eb9e5ac8544e55f5c1f3af677298d03e64b6e"
+SRC_URI[md5sum] = "2d42d3c2fff942bfe9eefa41cfd6f123"
+SRC_URI[sha256sum] = "87ef9f5d42c1193fec2ebd86757229b5ae4f295504968392375155adeda83b56"
SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service"
SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch
deleted file mode 100644
index 4b2e33e..0000000
--- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-From cfcfb8a110b72b9d92cf7c56f374478f65473653 Mon Sep 17 00:00:00 2001
-From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
-Date: Wed, 5 Aug 2020 17:21:14 +0900
-Subject: [PATCH] Remove man files which cant be built
-
-Remove need for pandoc-prebuilt during cross build
-
-Fixes errors
-
-| CMake Error at libibumad/man/cmake_install.cmake:105 (file):
-| file INSTALL cannot find
-| "/mnt/a/oe/build/tmp/work/core2-64-bec-linux-musl/rdma-core/18.1-r0/git/buildlib/pandoc-prebuilt/41bbb0bed7a781be59e8c0dcd8b7278af2ce6882".
-| Call Stack (most recent call first):
-| cmake_install.cmake:48 (include)
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Update for version 26.1. Remove more man files which can no be built.
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
-Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
----
- infiniband-diags/man/CMakeLists.txt | 34 ------------
- libibumad/man/CMakeLists.txt | 2 -
- libibverbs/man/CMakeLists.txt | 53 -------------------
- librdmacm/man/CMakeLists.txt | 2 -
- providers/efa/man/CMakeLists.txt | 2 -
- providers/mlx4/man/CMakeLists.txt | 1 -
- providers/mlx5/man/CMakeLists.txt | 82 -----------------------------
- 7 files changed, 176 deletions(-)
-
-diff --git a/infiniband-diags/man/CMakeLists.txt b/infiniband-diags/man/CMakeLists.txt
-index 1f1f91c9..094a389f 100644
---- a/infiniband-diags/man/CMakeLists.txt
-+++ b/infiniband-diags/man/CMakeLists.txt
-@@ -46,40 +46,6 @@ rdma_rst_common(
- )
-
- rdma_man_pages(
-- check_lft_balance.8.in.rst
-- dump_fts.8.in.rst
-- ibaddr.8.in.rst
-- ibcacheedit.8.in.rst
-- ibccconfig.8.in.rst
-- ibccquery.8.in.rst
-- ibfindnodesusing.8.in.rst
-- ibhosts.8.in.rst
-- ibidsverify.8.in.rst
-- iblinkinfo.8.in.rst
-- ibnetdiscover.8.in.rst
-- ibnodes.8.in.rst
-- ibping.8.in.rst
-- ibportstate.8.in.rst
-- ibqueryerrors.8.in.rst
-- ibroute.8.in.rst
-- ibrouters.8.in.rst
-- ibstat.8.in.rst
-- ibstatus.8.in.rst
-- ibswitches.8.in.rst
-- ibsysstat.8.in.rst
-- ibtracert.8.in.rst
-- infiniband-diags.8.in.rst
-- perfquery.8.in.rst
-- saquery.8.in.rst
-- sminfo.8.in.rst
-- smpdump.8.in.rst
-- smpquery.8.in.rst
-- vendstat.8.in.rst
-- )
--
--rdma_alias_man_pages(
-- dump_fts.8 dump_lfts.8
-- dump_fts.8 dump_mfts.8
- )
-
- if (ENABLE_IBDIAGS_COMPAT)
-diff --git a/libibumad/man/CMakeLists.txt b/libibumad/man/CMakeLists.txt
-index 185584a0..857a4b8b 100644
---- a/libibumad/man/CMakeLists.txt
-+++ b/libibumad/man/CMakeLists.txt
-@@ -15,7 +15,6 @@ rdma_man_pages(
- umad_get_mad_addr.3
- umad_get_pkey.3
- umad_get_port.3
-- umad_init.3.md
- umad_open_port.3
- umad_poll.3
- umad_recv.3
-@@ -38,5 +37,4 @@ rdma_alias_man_pages(
- umad_class_str.3 umad_method_str.3
- umad_get_ca.3 umad_release_ca.3
- umad_get_port.3 umad_release_port.3
-- umad_init.3 umad_done.3
- )
-diff --git a/libibverbs/man/CMakeLists.txt b/libibverbs/man/CMakeLists.txt
-index 87f00185..92c68611 100644
---- a/libibverbs/man/CMakeLists.txt
-+++ b/libibverbs/man/CMakeLists.txt
-@@ -1,24 +1,18 @@
- rdma_man_pages(
-- ibv_advise_mr.3.md
- ibv_alloc_dm.3
- ibv_alloc_mw.3
-- ibv_alloc_null_mr.3.md
- ibv_alloc_parent_domain.3
- ibv_alloc_pd.3
- ibv_alloc_td.3
- ibv_asyncwatch.1
-- ibv_attach_counters_point_flow.3.md
-- ibv_attach_mcast.3.md
- ibv_bind_mw.3
- ibv_create_ah.3
- ibv_create_ah_from_wc.3
- ibv_create_comp_channel.3
-- ibv_create_counters.3.md
- ibv_create_cq.3
- ibv_create_cq_ex.3
- ibv_modify_cq.3
- ibv_create_flow.3
-- ibv_create_flow_action.3.md
- ibv_create_qp.3
- ibv_create_qp_ex.3
- ibv_create_rwq_ind_table.3
-@@ -27,17 +21,8 @@ rdma_man_pages(
- ibv_create_wq.3
- ibv_devices.1
- ibv_devinfo.1
-- ibv_event_type_str.3.md
-- ibv_fork_init.3.md
- ibv_get_async_event.3
- ibv_get_cq_event.3
-- ibv_get_device_guid.3.md
-- ibv_get_device_index.3.md
-- ibv_get_device_list.3.md
-- ibv_get_device_name.3.md
-- ibv_get_pkey_index.3.md
-- ibv_get_srq_num.3.md
-- ibv_inc_rkey.3.md
- ibv_modify_qp.3
- ibv_modify_qp_rate_limit.3
- ibv_modify_srq.3
-@@ -52,24 +37,15 @@ rdma_man_pages(
- ibv_post_srq_recv.3
- ibv_query_device.3
- ibv_query_device_ex.3
-- ibv_query_gid.3.md
-- ibv_query_pkey.3.md
- ibv_query_port.3
- ibv_query_qp.3
- ibv_query_rt_values_ex.3
- ibv_query_srq.3
-- ibv_rate_to_mbps.3.md
-- ibv_rate_to_mult.3.md
- ibv_rc_pingpong.1
-- ibv_read_counters.3.md
- ibv_reg_mr.3
-- ibv_req_notify_cq.3.md
-- ibv_rereg_mr.3.md
-- ibv_resize_cq.3.md
- ibv_srq_pingpong.1
- ibv_uc_pingpong.1
- ibv_ud_pingpong.1
-- ibv_wr_post.3.md
- ibv_xsrq_pingpong.1
- )
- rdma_alias_man_pages(
-@@ -80,47 +56,18 @@ rdma_alias_man_pages(
- ibv_alloc_mw.3 ibv_dealloc_mw.3
- ibv_alloc_pd.3 ibv_dealloc_pd.3
- ibv_alloc_td.3 ibv_dealloc_td.3
-- ibv_attach_mcast.3 ibv_detach_mcast.3
- ibv_create_ah.3 ibv_destroy_ah.3
- ibv_create_ah_from_wc.3 ibv_init_ah_from_wc.3
- ibv_create_comp_channel.3 ibv_destroy_comp_channel.3
-- ibv_create_counters.3 ibv_destroy_counters.3
- ibv_create_cq.3 ibv_destroy_cq.3
- ibv_create_flow.3 ibv_destroy_flow.3
-- ibv_create_flow_action.3 ibv_destroy_flow_action.3
-- ibv_create_flow_action.3 ibv_modify_flow_action.3
- ibv_create_qp.3 ibv_destroy_qp.3
- ibv_create_rwq_ind_table.3 ibv_destroy_rwq_ind_table.3
- ibv_create_srq.3 ibv_destroy_srq.3
- ibv_create_wq.3 ibv_destroy_wq.3
-- ibv_event_type_str.3 ibv_node_type_str.3
-- ibv_event_type_str.3 ibv_port_state_str.3
- ibv_get_async_event.3 ibv_ack_async_event.3
- ibv_get_cq_event.3 ibv_ack_cq_events.3
-- ibv_get_device_list.3 ibv_free_device_list.3
- ibv_open_device.3 ibv_close_device.3
- ibv_open_xrcd.3 ibv_close_xrcd.3
-- ibv_rate_to_mbps.3 mbps_to_ibv_rate.3
-- ibv_rate_to_mult.3 mult_to_ibv_rate.3
- ibv_reg_mr.3 ibv_dereg_mr.3
-- ibv_wr_post.3 ibv_wr_abort.3
-- ibv_wr_post.3 ibv_wr_complete.3
-- ibv_wr_post.3 ibv_wr_start.3
-- ibv_wr_post.3 ibv_wr_atomic_cmp_swp.3
-- ibv_wr_post.3 ibv_wr_atomic_fetch_add.3
-- ibv_wr_post.3 ibv_wr_bind_mw.3
-- ibv_wr_post.3 ibv_wr_local_inv.3
-- ibv_wr_post.3 ibv_wr_rdma_read.3
-- ibv_wr_post.3 ibv_wr_rdma_write.3
-- ibv_wr_post.3 ibv_wr_rdma_write_imm.3
-- ibv_wr_post.3 ibv_wr_send.3
-- ibv_wr_post.3 ibv_wr_send_imm.3
-- ibv_wr_post.3 ibv_wr_send_inv.3
-- ibv_wr_post.3 ibv_wr_send_tso.3
-- ibv_wr_post.3 ibv_wr_set_inline_data.3
-- ibv_wr_post.3 ibv_wr_set_inline_data_list.3
-- ibv_wr_post.3 ibv_wr_set_sge.3
-- ibv_wr_post.3 ibv_wr_set_sge_list.3
-- ibv_wr_post.3 ibv_wr_set_ud_addr.3
-- ibv_wr_post.3 ibv_wr_set_xrc_srqn.3
- )
-diff --git a/librdmacm/man/CMakeLists.txt b/librdmacm/man/CMakeLists.txt
-index 2d1efbff..d016c926 100644
---- a/librdmacm/man/CMakeLists.txt
-+++ b/librdmacm/man/CMakeLists.txt
-@@ -20,7 +20,6 @@ rdma_man_pages(
- rdma_destroy_qp.3
- rdma_destroy_srq.3
- rdma_disconnect.3
-- rdma_establish.3.md
- rdma_event_str.3
- rdma_free_devices.3
- rdma_get_cm_event.3
-@@ -33,7 +32,6 @@ rdma_man_pages(
- rdma_get_send_comp.3
- rdma_get_src_port.3
- rdma_getaddrinfo.3
-- rdma_init_qp_attr.3.md
- rdma_join_multicast.3
- rdma_join_multicast_ex.3
- rdma_leave_multicast.3
-diff --git a/providers/efa/man/CMakeLists.txt b/providers/efa/man/CMakeLists.txt
-index d6a4f57b..376f293d 100644
---- a/providers/efa/man/CMakeLists.txt
-+++ b/providers/efa/man/CMakeLists.txt
-@@ -1,4 +1,2 @@
- rdma_man_pages(
-- efadv_create_driver_qp.3.md
-- efadv.7.md
- )
-diff --git a/providers/mlx4/man/CMakeLists.txt b/providers/mlx4/man/CMakeLists.txt
-index 3df77caf..99a75101 100644
---- a/providers/mlx4/man/CMakeLists.txt
-+++ b/providers/mlx4/man/CMakeLists.txt
-@@ -1,6 +1,5 @@
- rdma_man_pages(
- mlx4dv_init_obj.3
- mlx4dv_query_device.3
-- mlx4dv_set_context_attr.3.md
- mlx4dv.7
- )
-diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.txt
-index c3ad70a2..876b6fcf 100644
---- a/providers/mlx5/man/CMakeLists.txt
-+++ b/providers/mlx5/man/CMakeLists.txt
-@@ -1,89 +1,7 @@
- rdma_man_pages(
-- mlx5dv_alloc_dm.3.md
-- mlx5dv_alloc_var.3.md
-- mlx5dv_create_cq.3.md
-- mlx5dv_create_flow.3.md
-- mlx5dv_create_flow_action_modify_header.3.md
-- mlx5dv_create_flow_action_packet_reformat.3.md
-- mlx5dv_create_flow_matcher.3.md
-- mlx5dv_create_mkey.3.md
-- mlx5dv_create_qp.3.md
-- mlx5dv_devx_alloc_uar.3.md
-- mlx5dv_devx_create_cmd_comp.3.md
-- mlx5dv_devx_create_event_channel.3.md
-- mlx5dv_devx_get_event.3.md
-- mlx5dv_devx_obj_create.3.md
-- mlx5dv_devx_qp_modify.3.md
-- mlx5dv_devx_query_eqn.3.md
-- mlx5dv_devx_subscribe_devx_event.3.md
-- mlx5dv_devx_umem_reg.3.md
-- mlx5dv_dr_flow.3.md
-- mlx5dv_dump.3.md
-- mlx5dv_flow_action_esp.3.md
- mlx5dv_get_clock_info.3
- mlx5dv_init_obj.3
-- mlx5dv_is_supported.3.md
-- mlx5dv_modify_qp_lag_port.3.md
-- mlx5dv_open_device.3.md
-- mlx5dv_pp_alloc.3.md
- mlx5dv_query_device.3
-- mlx5dv_query_qp_lag_port.3.md
- mlx5dv_ts_to_ns.3
-- mlx5dv_wr_post.3.md
- mlx5dv.7
- )
--rdma_alias_man_pages(
-- mlx5dv_alloc_var.3 mlx5dv_free_var.3
-- mlx5dv_create_mkey.3 mlx5dv_destroy_mkey.3
-- mlx5dv_devx_alloc_uar.3 mlx5dv_devx_free_uar.3
-- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_destroy_cmd_comp.3
-- mlx5dv_devx_create_event_channel.3 mlx5dv_devx_destroy_event_channel.3
-- mlx5dv_devx_create_cmd_comp.3 mlx5dv_devx_get_async_cmd_comp.3
-- mlx5dv_devx_obj_create.3 mlx5dv_devx_general_cmd.3
-- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_destroy.3
-- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query.3
-- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_query_async.3
-- mlx5dv_devx_obj_create.3 mlx5dv_devx_obj_modify.3
-- mlx5dv_devx_qp_modify.3 mlx5dv_devx_qp_query.3
-- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_modify.3
-- mlx5dv_devx_qp_modify.3 mlx5dv_devx_cq_query.3
-- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_modify.3
-- mlx5dv_devx_qp_modify.3 mlx5dv_devx_wq_query.3
-- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_modify.3
-- mlx5dv_devx_qp_modify.3 mlx5dv_devx_srq_query.3
-- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_modify.3
-- mlx5dv_devx_qp_modify.3 mlx5dv_devx_ind_tbl_query.3
-- mlx5dv_devx_subscribe_devx_event.3 mlx5dv_devx_subscribe_devx_event_fd.3
-- mlx5dv_devx_umem_reg.3 mlx5dv_devx_umem_dereg.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_table.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_ibv_qp.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_default_miss.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_meter.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_tag.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_destroy.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_action_modify_flow_meter.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_domain_set_reclaim_device_memory.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_create.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_matcher_destroy.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_rule_create.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_rule_destroy.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_table_create.3
-- mlx5dv_dr_flow.3 mlx5dv_dr_table_destroy.3
-- mlx5dv_dump.3 mlx5dv_dump_dr_domain.3
-- mlx5dv_dump.3 mlx5dv_dump_dr_matcher.3
-- mlx5dv_dump.3 mlx5dv_dump_dr_rule.3
-- mlx5dv_dump.3 mlx5dv_dump_dr_table.3
-- mlx5dv_pp_alloc.3 mlx5dv_pp_free.3
-- mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3
-- mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3
-- mlx5dv_wr_post.3 mlx5dv_wr_mr_interleaved.3
-- mlx5dv_wr_post.3 mlx5dv_wr_mr_list.3
--)
---
-2.25.1
-
diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_32.0.bb
similarity index 90%
rename from meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb
rename to meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_32.0.bb
index 18c34fb..7772120 100644
--- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb
+++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_32.0.bb
@@ -7,9 +7,8 @@
BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}"
SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \
- file://0001-Remove-man-files-which-cant-be-built.patch \
"
-SRCREV = "0f4dd71d38a0f1b005635a3ff344e15791d2afa7"
+SRCREV = "7a4f9ad9a1d906c5f2bbb18b588309c3d12460ac"
S = "${WORKDIR}/git"
#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md
@@ -20,8 +19,11 @@
EXTRA_OECMAKE = " \
-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \
-DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \
+ -DNO_MAN_PAGES=1 \
"
+LTO = ""
+
FILES_SOLIBSDEV = ""
FILES_${PN} += "${libdir}/*"
INSANE_SKIP_${PN} += "dev-so"
diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb
index 9d3a0e6..fad8b63 100644
--- a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb
+++ b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb
@@ -32,7 +32,7 @@
inherit autotools gettext python3native python3-dir pkgconfig
DEPENDS += "spice-protocol jpeg pixman alsa-lib glib-2.0 python3-pyparsing-native python3-six-native glib-2.0-native"
-DEPENDS_append_class-nativesdk = "nativesdk-openssl"
+DEPENDS_append_class-nativesdk = " nativesdk-openssl"
export PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3"
diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch b/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
deleted file mode 100644
index 78adcf8..0000000
--- a/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7b1e376d7d22244feab466e9889ba77561117357 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Wed, 23 Sep 2020 16:20:22 +0800
-Subject: [PATCH] Remove obsolete setting regarding the Standard Output
-
-The Standard output type "syslog" is obsolete, causing a warning since systemd
-version 246 [1].
-
-Please consider using "journal" or "journal+console"
-
-[1] https://github.com/systemd/systemd/blob/master/NEWS#L202
-
-Upstream-Status: Submitted [https://github.com/strongswan/strongswan/pull/181]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- init/systemd-starter/strongswan-starter.service.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/init/systemd-starter/strongswan-starter.service.in b/init/systemd-starter/strongswan-starter.service.in
-index 474284a19..6a0672352 100644
---- a/init/systemd-starter/strongswan-starter.service.in
-+++ b/init/systemd-starter/strongswan-starter.service.in
-@@ -4,7 +4,6 @@ After=syslog.target network-online.target
-
- [Service]
- ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork
--StandardOutput=syslog
- Restart=on-abnormal
-
- [Install]
---
-2.17.1
-
diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb
similarity index 85%
rename from meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb
rename to meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb
index 8a88092..095a93d 100644
--- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb
+++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb
@@ -10,11 +10,10 @@
SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
file://fix-funtion-parameter.patch \
file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \
- file://0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch \
"
-SRC_URI[md5sum] = "0634e7f40591bd3f6770e583c3f27d29"
-SRC_URI[sha256sum] = "2d9a57e33813b62d58cba07531c4d5a35c6b823dfe9b8ff7c623b6571f02553c"
+SRC_URI[md5sum] = "1f4db969d072e120dc12d1c116a0f658"
+SRC_URI[sha256sum] = "a337c9fb63d973b8440827755c784031648bf423b7114a04918b0b00fd42cafb"
UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"
@@ -25,13 +24,15 @@
EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
-PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \
- ${@bb.utils.filter('DISTRO_FEATURES', 'ldap', d)} \
+PACKAGECONFIG ??= "curl gmp openssl sqlite3 swanctl \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \
"
PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni"
PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils"
PACKAGECONFIG[charon] = "--enable-charon,--disable-charon,"
PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl"
+PACKAGECONFIG[eap-identity] = "--enable-eap-identity,--disable-eap-identity,,${PN}-plugin-eap-identity"
+PACKAGECONFIG[eap-mschapv2] = "--enable-eap-mschapv2,--disable-eap-mschapv2,,${PN}-plugin-eap-mschapv2"
PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp"
PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap"
PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql"
@@ -133,4 +134,11 @@
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} ${BPN}-starter.service"
+
+# The deprecated legacy 'strongswan-starter' service should only be used when charon and
+# stroke are enabled. When swanctl is in use, 'strongswan.service' is needed.
+# See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd
+SYSTEMD_SERVICE_${PN} = " \
+ ${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'charon', '${BPN}-starter.service', '', d)} \
+"
diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch
new file mode 100644
index 0000000..9b74e00
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch
@@ -0,0 +1,70 @@
+From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001
+From: Guy Harris <guy@alum.mit.edu>
+Date: Sat, 18 Apr 2020 14:04:59 -0700
+Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer.
+
+The buffer should be big enough to hold the captured data, but it
+doesn't need to be big enough to hold the entire on-the-network packet,
+if we haven't captured all of it.
+
+(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334)
+
+Upstream-Status: Backport
+Signed-off-by: Stacy Gaikovaia <stacy.gaikovaia@windriver.com>
+
+---
+ print-ppp.c | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/print-ppp.c b/print-ppp.c
+index 89176172..33fb0341 100644
+--- a/print-ppp.c
++++ b/print-ppp.c
+@@ -1367,19 +1367,29 @@ trunc:
+ return 0;
+ }
+
++/*
++ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes.
++ * The length argument is the on-the-wire length, not the captured
++ * length; we can only un-escape the captured part.
++ */
+ static void
+ ppp_hdlc(netdissect_options *ndo,
+ const u_char *p, int length)
+ {
++ u_int caplen = ndo->ndo_snapend - p;
+ u_char *b, *t, c;
+ const u_char *s;
+- int i, proto;
++ u_int i;
++ int proto;
+ const void *se;
+
++ if (caplen == 0)
++ return;
++
+ if (length <= 0)
+ return;
+
+- b = (u_char *)malloc(length);
++ b = (u_char *)malloc(caplen);
+ if (b == NULL)
+ return;
+
+@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo,
+ * Do this so that we dont overwrite the original packet
+ * contents.
+ */
+- for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) {
++ for (s = p, t = b, i = caplen; i != 0; i--) {
+ c = *s++;
+ if (c == 0x7d) {
+- if (i <= 1 || !ND_TTEST(*s))
++ if (i <= 1)
+ break;
+ i--;
+ c = *s++ ^ 0x20;
+--
+2.17.1
+
diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb
index 94543dd..8f7bd59 100644
--- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb
+++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb
@@ -17,6 +17,7 @@
file://avoid-absolute-path-when-searching-for-libdlpi.patch \
file://add-ptest.patch \
file://run-ptest \
+ file://0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch \
"
SRC_URI[md5sum] = "a4ead41d371f91aa0a2287f589958bae"
diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
deleted file mode 100644
index 2c030b5..0000000
--- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e273e0ebc753645555909bcc4874c72458b17891 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Fri, 17 Jan 2014 03:17:44 -0500
-Subject: [PATCH] Make.rules: filter-out the patches from subdirs
-
-The $(subdirs) contains all the dirs under the ${B}, and this one:
-
-do_unpack[cleandirs] = "${S}/patches"
-
-will create a "patches" dir, then there will be compile errors, filter
-out the patches will fix the problem.
-
-Note: poky doesn't have this problem since it separates the ${S} and
-${B}
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- Make.rules | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Make.rules b/Make.rules
-index b077cd5..0bfce2d 100644
---- a/Make.rules
-+++ b/Make.rules
-@@ -97,7 +97,7 @@ endif
- subdirs := $(filter-out $(SKIPDIRS), $(subdirs))
- endif
-
--install install-%: subdirs := $(filter-out $(SKIPINSTALL), $(subdirs))
-+install install-%: subdirs := $(filter-out $(SKIPINSTALL) patches, $(subdirs))
-
-
- override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared)
-@@ -106,7 +106,7 @@ override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared)
- INCLUDEDIRS := $(filter $(INCLUDEDIRS), $(subdirs))
- LIBDIRS := $(filter $(LIBDIRS), $(subdirs))
- MODDIRS := $(filter $(MODDIRS), $(subdirs))
--EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS), $(subdirs))
-+EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS) patches, $(subdirs))
- MODUSERS := $(filter $(MODUSERS), $(subdirs))
- SBINUSERS := $(filter $(SBINUSERS), $(subdirs))
-
---
-1.7.10.4
-
diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb
index 19bbf03..9937944 100644
--- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb
+++ b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb
@@ -16,16 +16,14 @@
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/traceroute/"
SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \
- file://filter-out-the-patches-from-subdirs.patch \
"
-
SRC_URI[md5sum] = "84d329d67abc3fb83fc8cb12aeaddaba"
SRC_URI[sha256sum] = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6"
EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}"
+LTOEXTRA += "-flto-partition=none"
do_compile() {
- export LDFLAGS="${TARGET_LDFLAGS} -L${S}/libsupp"
oe_runmake "env=yes"
}
diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch
new file mode 100644
index 0000000..7168a35
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-init-script.patch
@@ -0,0 +1,78 @@
+From 26614b6578056ec30b95013592e308bf24d924c2 Mon Sep 17 00:00:00 2001
+From: Beniamin Sandu <beniaminsandu@gmail.com>
+Date: Fri, 20 Nov 2020 23:00:20 +0200
+Subject: [PATCH] contrib: add yocto compatible init script
+
+Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
+---
+ contrib/unbound.init | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/contrib/unbound.init b/contrib/unbound.init
+index c5bb52bb..4eba752b 100644
+--- a/contrib/unbound.init
++++ b/contrib/unbound.init
+@@ -19,11 +19,11 @@
+ ### END INIT INFO
+
+ # Source function library.
+-. /etc/rc.d/init.d/functions
++. /etc/init.d/functions
+
+ exec="/usr/sbin/unbound"
+ prog="unbound"
+-config="/var/unbound/unbound.conf"
++config="/etc/unbound/unbound.conf"
+ pidfile="/var/unbound/unbound.pid"
+ rootdir="/var/unbound"
+
+@@ -54,14 +54,14 @@ start() {
+ [ -e ${rootdir}/dev/log ] || touch ${rootdir}/dev/log
+ mount --bind -n /dev/log ${rootdir}/dev/log >/dev/null 2>&1;
+ fi;
+- if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/urandom' /proc/mounts; then
++ if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/random' /proc/mounts; then
+ [ -d ${rootdir}/dev ] || mkdir -p ${rootdir}/dev ;
+- [ -e ${rootdir}/dev/urandom ] || touch ${rootdir}/dev/urandom
+- mount --bind -n /dev/urandom ${rootdir}/dev/urandom >/dev/null 2>&1;
++ [ -e ${rootdir}/dev/random ] || touch ${rootdir}/dev/random
++ mount --bind -n /dev/random ${rootdir}/dev/random >/dev/null 2>&1;
+ fi;
+
+ # if not running, start it up here
+- daemon $exec
++ daemonize $exec
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+@@ -71,15 +71,15 @@ start() {
+ stop() {
+ echo -n $"Stopping $prog: "
+ # stop it here, often "killproc $prog"
+- killproc -p $pidfile $prog
++ killproc $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/log' /proc/mounts; then
+ umount ${rootdir}/dev/log >/dev/null 2>&1
+ fi;
+- if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/urandom' /proc/mounts; then
+- umount ${rootdir}/dev/urandom >/dev/null 2>&1
++ if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/random' /proc/mounts; then
++ umount ${rootdir}/dev/random >/dev/null 2>&1
+ fi;
+ return $retval
+ }
+@@ -99,7 +99,7 @@ force_reload() {
+
+ rh_status() {
+ # run checks to determine if the service is running or use generic status
+- status -p $pidfile $prog
++ status $prog
+ }
+
+ rh_status_q() {
+--
+2.25.1
+
diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-startup-scripts.patch b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-startup-scripts.patch
deleted file mode 100644
index 46f6a7b..0000000
--- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound/0001-contrib-add-yocto-compatible-startup-scripts.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 186ac39de8eb9aedcf3d87cdbe389d10cde03d66 Mon Sep 17 00:00:00 2001
-From: Beniamin Sandu <beniaminsandu@gmail.com>
-Date: Tue, 16 Jul 2019 19:59:23 +0300
-Subject: [PATCH] contrib: add yocto compatible startup scripts
-
-Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
----
- contrib/unbound.init | 10 +++++-----
- contrib/unbound.service.in | 4 ++--
- 2 files changed, 7 insertions(+), 7 deletions(-)
- mode change 100644 => 100755 contrib/unbound.init
-
-diff --git a/contrib/unbound.init b/contrib/unbound.init
-old mode 100644
-new mode 100755
-index cccadecc..4eba752b
---- a/contrib/unbound.init
-+++ b/contrib/unbound.init
-@@ -19,11 +19,11 @@
- ### END INIT INFO
-
- # Source function library.
--. /etc/rc.d/init.d/functions
-+. /etc/init.d/functions
-
- exec="/usr/sbin/unbound"
- prog="unbound"
--config="/var/unbound/unbound.conf"
-+config="/etc/unbound/unbound.conf"
- pidfile="/var/unbound/unbound.pid"
- rootdir="/var/unbound"
-
-@@ -61,7 +61,7 @@ start() {
- fi;
-
- # if not running, start it up here
-- daemon $exec
-+ daemonize $exec
- retval=$?
- echo
- [ $retval -eq 0 ] && touch $lockfile
-@@ -71,7 +71,7 @@ start() {
- stop() {
- echo -n $"Stopping $prog: "
- # stop it here, often "killproc $prog"
-- killproc -p $pidfile $prog
-+ killproc $prog
- retval=$?
- echo
- [ $retval -eq 0 ] && rm -f $lockfile
-@@ -99,7 +99,7 @@ force_reload() {
-
- rh_status() {
- # run checks to determine if the service is running or use generic status
-- status -p $pidfile $prog
-+ status $prog
- }
-
- rh_status_q() {
-diff --git a/contrib/unbound.service.in b/contrib/unbound.service.in
-index 95976dd9..0e7f79a9 100644
---- a/contrib/unbound.service.in
-+++ b/contrib/unbound.service.in
-@@ -10,9 +10,9 @@ WantedBy=multi-user.target
-
- [Service]
- ExecReload=/bin/kill -HUP $MAINPID
--ExecStart=@UNBOUND_SBIN_DIR@/unbound
-+ExecStart=@UNBOUND_SBIN_DIR@/unbound -d
- NotifyAccess=main
--Type=notify
-+Type=simple
- CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_SYS_RESOURCE
- MemoryDenyWriteExecute=true
- NoNewPrivileges=true
---
-2.17.1
-
diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.4.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.12.0.bb
similarity index 92%
rename from meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.4.bb
rename to meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.12.0.bb
index 6200214..6fc1631 100644
--- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.4.bb
+++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.12.0.bb
@@ -10,9 +10,9 @@
LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06"
SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master \
- file://0001-contrib-add-yocto-compatible-startup-scripts.patch \
+ file://0001-contrib-add-yocto-compatible-init-script.patch \
"
-SRCREV="b60c4a472c856f0a98120b7259e991b3a6507eb5"
+SRCREV="52b04806f4236c37acd10179ab465a54adc7e86a"
inherit autotools pkgconfig systemd update-rc.d
diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf
index a964a99..9b3f287 100644
--- a/meta-openembedded/meta-oe/conf/layer.conf
+++ b/meta-openembedded/meta-oe/conf/layer.conf
@@ -37,7 +37,7 @@
LAYERDEPENDS_openembedded-layer = "core"
-LAYERSERIES_COMPAT_openembedded-layer = "gatesgarth"
+LAYERSERIES_COMPAT_openembedded-layer = "gatesgarth hardknott"
LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/bacnet.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/bacnet.json
new file mode 100644
index 0000000..e36a216
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/bacnet.json
@@ -0,0 +1,58 @@
+{
+ "general": {
+ "objectName": "TB_gateway",
+ "address": "192.168.188.181:1052",
+ "objectIdentifier": 599,
+ "maxApduLengthAccepted": 1024,
+ "segmentationSupported": "segmentedBoth",
+ "vendorIdentifier": 15
+ },
+ "devices": [
+ {
+ "deviceName": "BACnet Device ${objectName}",
+ "deviceType": "default",
+ "address": "192.168.188.181:10520",
+ "pollPeriod": 10000,
+ "attributes": [
+ {
+ "key": "temperature",
+ "type": "string",
+ "objectId": "analogOutput:1",
+ "propertyId": "presentValue"
+ }
+ ],
+ "timeseries": [
+ {
+ "key": "state",
+ "type": "bool",
+ "objectId": "binaryValue:1",
+ "propertyId": "presentValue"
+ }
+ ],
+ "attributeUpdates": [
+ {
+ "key": "brightness",
+ "requestType": "writeProperty",
+ "objectId": "analogOutput:1",
+ "propertyId": "presentValue"
+ }
+ ],
+ "serverSideRpc": [
+ {
+ "method": "set_state",
+ "requestType": "writeProperty",
+ "requestTimeout": 10000,
+ "objectId": "binaryOutput:1",
+ "propertyId": "presentValue"
+ },
+ {
+ "method": "get_state",
+ "requestType": "readProperty",
+ "requestTimeout": 10000,
+ "objectId": "binaryOutput:1",
+ "propertyId": "presentValue"
+ }
+ ]
+ }
+ ]
+ }
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/ble.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/ble.json
new file mode 100755
index 0000000..2a5da3f
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/ble.json
@@ -0,0 +1,53 @@
+{
+ "name": "BLE Connector",
+ "rescanIntervalSeconds": 100,
+ "checkIntervalSeconds": 100,
+ "scanTimeSeconds": 5,
+ "passiveScanMode": true,
+ "devices": [
+ {
+ "name": "Temperature and humidity sensor",
+ "MACAddress": "4C:65:A8:DF:85:C0",
+ "addrType": "public",
+ "telemetry": [
+ {
+ "key": "temperature",
+ "method": "notify",
+ "characteristicUUID": "226CAA55-6476-4566-7562-66734470666D",
+ "byteFrom": 2,
+ "byteTo": 6
+ },
+ {
+ "key": "humidity",
+ "method": "notify",
+ "characteristicUUID": "226CAA55-6476-4566-7562-66734470666D",
+ "byteFrom": 9,
+ "byteTo": 13
+ }
+ ],
+ "attributes": [
+ {
+ "key": "name",
+ "characteristicUUID": "00002A00-0000-1000-8000-00805F9B34FB",
+ "method": "read",
+ "byteFrom": 0,
+ "byteTo": -1
+ }
+ ],
+ "attributeUpdates": [
+ {
+ "attributeOnThingsBoard": "sharedName",
+ "characteristicUUID": "00002A00-0000-1000-8000-00805F9B34FB"
+ }
+ ],
+ "serverSideRpc": [
+ {
+ "methodRPC": "rpcMethod1",
+ "withResponse": true,
+ "characteristicUUID": "00002A00-0000-1000-8000-00805F9B34FB",
+ "methodProcessing": "read"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/can.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/can.json
new file mode 100644
index 0000000..b5cec00
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/can.json
@@ -0,0 +1,89 @@
+{
+ "interface": "socketcan",
+ "channel": "vcan0",
+ "backend": {
+ "fd": true
+ },
+ "reconnectPeriod": 5,
+ "devices": [
+ {
+ "name": "Car",
+ "sendDataOnlyOnChange": false,
+ "enableUnknownRpc": true,
+ "strictEval": false,
+ "attributes": [
+ {
+ "key": "isDriverDoorOpened",
+ "nodeId": 41,
+ "command": "2:2:big:8717",
+ "value": "4:1:int",
+ "expression": "bool(value & 0b00000100)",
+ "polling": {
+ "type": "once",
+ "dataInHex": "AB CD AB CD"
+ }
+ }
+ ],
+ "timeseries": [
+ {
+ "key": "rpm",
+ "nodeId": 1918,
+ "isExtendedId": true,
+ "command": "2:2:big:48059",
+ "value": "4:2:big:int",
+ "expression": "value / 4",
+ "polling": {
+ "type": "always",
+ "period": 5,
+ "dataInHex": "aaaa bbbb aaaa bbbb"
+ }
+ },
+ {
+ "key": "milliage",
+ "nodeId": 1918,
+ "isExtendedId": true,
+ "value": "4:2:little:int",
+ "expression": "value * 10",
+ "polling": {
+ "type": "always",
+ "period": 30,
+ "dataInHex": "aa bb cc dd ee ff aa bb"
+ }
+ }
+ ],
+ "attributeUpdates": [
+ {
+ "attributeOnThingsBoard": "softwareVersion",
+ "nodeId": 64,
+ "isExtendedId": true,
+ "dataLength": 4,
+ "dataExpression": "value + 5",
+ "dataByteorder": "little"
+ }
+ ],
+ "serverSideRpc": [
+ {
+ "method": "sendSameData",
+ "nodeId": 4,
+ "isExtendedId": true,
+ "isFd": true,
+ "bitrateSwitch": true,
+ "dataInHex": "aa bb cc dd ee ff aa bb aa bb cc d ee ff"
+ },
+ {
+ "method": "setLightLevel",
+ "nodeId": 5,
+ "dataLength": 2,
+ "dataByteorder": "little",
+ "dataBefore": "00AA"
+ },
+ {
+ "method": "setSpeed",
+ "nodeId": 16,
+ "dataAfter": "0102",
+ "dataExpression": "userSpeed if maxAllowedSpeed > userSpeed else maxAllowedSpeed"
+ }
+ ]
+ }
+ ]
+ }
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/custom_serial.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/custom_serial.json
new file mode 100755
index 0000000..0aee5cb
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/custom_serial.json
@@ -0,0 +1,33 @@
+{
+ "name": "Custom serial connector",
+ "devices": [
+ {
+ "name": "CustomSerialDevice1",
+ "type": "default",
+ "port": "/dev/ttyUSB0",
+ "baudrate": 9600,
+ "converter": "CustomSerialUplinkConverter",
+ "telemetry": [
+ {
+ "type": "byte",
+ "key": "humidity",
+ "untilDelimiter": "\r"
+ }
+ ],
+ "attributes":[
+ {
+ "key": "SerialNumber",
+ "type": "string",
+ "fromByte": 4,
+ "toByte": -1
+ }
+ ],
+ "attributeUpdates": [
+ {
+ "attributeOnThingsBoard": "attr1",
+ "stringToDevice": "value = ${attr1}\n"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/logs.conf b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/logs.conf
new file mode 100755
index 0000000..d66c2b8
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/logs.conf
@@ -0,0 +1,77 @@
+[loggers]
+keys=root, service, connector, converter, tb_connection, storage, extension
+[handlers]
+keys=consoleHandler, serviceHandler, connectorHandler, converterHandler, tb_connectionHandler, storageHandler, extensionHandler
+[formatters]
+keys=LogFormatter
+[logger_root]
+level=ERROR
+handlers=consoleHandler
+[logger_connector]
+level=INFO
+handlers=connectorHandler
+formatter=LogFormatter
+qualname=connector
+[logger_storage]
+level=INFO
+handlers=storageHandler
+formatter=LogFormatter
+qualname=storage
+[logger_tb_connection]
+level=INFO
+handlers=tb_connectionHandler
+formatter=LogFormatter
+qualname=tb_connection
+[logger_service]
+level=INFO
+handlers=serviceHandler
+formatter=LogFormatter
+qualname=service
+[logger_converter]
+level=INFO
+handlers=converterHandler
+formatter=LogFormatter
+qualname=converter
+[logger_extension]
+level=INFO
+handlers=connectorHandler
+formatter=LogFormatter
+qualname=extension
+[handler_consoleHandler]
+class=StreamHandler
+level=INFO
+formatter=LogFormatter
+args=(sys.stdout,)
+[handler_connectorHandler]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=LogFormatter
+args=("./logs/connector.log", "d", 1, 7,)
+[handler_storageHandler]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=LogFormatter
+args=("./logs/storage.log", "d", 1, 7,)
+[handler_serviceHandler]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=LogFormatter
+args=("./logs/service.log", "d", 1, 7,)
+[handler_converterHandler]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=LogFormatter
+args=("./logs/converter.log", "d", 1, 3,)
+[handler_extensionHandler]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=LogFormatter
+args=("./logs/extension.log", "d", 1, 3,)
+[handler_tb_connectionHandler]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=LogFormatter
+args=("./logs/tb_connection.log", "d", 1, 3,)
+[formatter_LogFormatter]
+format="%(asctime)s - %(levelname)s - [%(filename)s] - %(module)s - %(lineno)d - %(message)s"
+datefmt="%Y-%m-%d %H:%M:%S"
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus.json
new file mode 100755
index 0000000..479d8aa
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus.json
@@ -0,0 +1,169 @@
+{
+ "server": {
+ "type": "tcp",
+ "host": "127.0.0.1",
+ "port": 5020,
+ "timeout": 35,
+ "method": "socket",
+ "byteOrder": "BIG",
+ "devices": [
+ {
+ "unitId": 1,
+ "deviceName": "Temp Sensor",
+ "attributesPollPeriod": 5000,
+ "timeseriesPollPeriod": 5000,
+ "sendDataOnlyOnChange": true,
+ "attributes": [
+ {
+ "tag": "string_read",
+ "type": "string",
+ "functionCode": 4,
+ "objectsCount": 4,
+ "address": 1
+ },
+ {
+ "tag": "bits_read",
+ "type": "bits",
+ "functionCode": 4,
+ "objectsCount": 1,
+ "address": 5
+ },
+ {
+ "tag": "8int_read",
+ "type": "8int",
+ "functionCode": 4,
+ "objectsCount": 1,
+ "address": 6
+ },
+ {
+ "tag": "16int_read",
+ "type": "16int",
+ "functionCode": 4,
+ "objectsCount": 1,
+ "address": 7
+ },
+ {
+ "tag": "32int_read_divider",
+ "type": "32int",
+ "functionCode": 4,
+ "objectsCount": 2,
+ "address": 8,
+ "divider": 10
+ },
+ {
+ "tag": "8int_read_multiplier",
+ "type": "8int",
+ "functionCode": 4,
+ "objectsCount": 1,
+ "address": 10,
+ "multiplier": 10
+ },
+ {
+ "tag": "32int_read",
+ "type": "32int",
+ "functionCode": 4,
+ "objectsCount": 2,
+ "address": 11
+ },
+ {
+ "tag": "64int_read",
+ "type": "64int",
+ "functionCode": 4,
+ "objectsCount": 4,
+ "address": 13
+ }
+ ],
+ "timeseries": [
+ {
+ "tag": "8uint_read",
+ "type": "8uint",
+ "functionCode": 4,
+ "objectsCount": 1,
+ "address": 17
+ },
+ {
+ "tag": "16uint_read",
+ "type": "16uint",
+ "functionCode": 4,
+ "objectsCount": 2,
+ "address": 18
+ },
+ {
+ "tag": "32uint_read",
+ "type": "32uint",
+ "functionCode": 4,
+ "objectsCount": 4,
+ "address": 20
+ },
+ {
+ "tag": "64uint_read",
+ "type": "64uint",
+ "functionCode": 4,
+ "objectsCount": 1,
+ "address": 24
+ },
+ {
+ "tag": "16float_read",
+ "type": "16float",
+ "functionCode": 4,
+ "objectsCount": 1,
+ "address": 25
+ },
+ {
+ "tag": "32float_read",
+ "type": "32float",
+ "functionCode": 4,
+ "objectsCount": 2,
+ "address": 26
+ },
+ {
+ "tag": "64float_read",
+ "type": "64float",
+ "functionCode": 4,
+ "objectsCount": 4,
+ "address": 28
+ }
+ ],
+ "attributeUpdates": [
+ {
+ "tag": "shared_attribute_write",
+ "type": "32int",
+ "functionCode": 6,
+ "objectsCount": 2,
+ "address": 29
+ }
+ ],
+ "rpc": [
+ {
+ "tag": "setValue",
+ "type": "bits",
+ "functionCode": 5,
+ "objectsCount": 1,
+ "address": 31
+ },
+ {
+ "tag": "getValue",
+ "type": "bits",
+ "functionCode": 1,
+ "objectsCount": 1,
+ "address": 31
+ },
+ {
+ "tag": "setCPUFanSpeed",
+ "type": "32int",
+ "functionCode": 16,
+ "objectsCount": 2,
+ "address": 33
+ },
+ {
+ "tag":"getCPULoad",
+ "type": "32int",
+ "functionCode": 4,
+ "objectsCount": 2,
+ "address": 35
+ }
+ ]
+ }
+ ]
+ }
+}
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus_serial.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus_serial.json
new file mode 100755
index 0000000..19b38e3
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus_serial.json
@@ -0,0 +1,29 @@
+{
+ "server": {
+ "name": "Modbus Default Server",
+ "type": "serial",
+ "method": "rtu",
+ "port": "/dev/ttyUSB0",
+ "baudrate": 19200,
+ "timeout": 35,
+ "devices": [
+ {
+ "unitId": 1,
+ "deviceName": "Temp Sensor",
+ "attributesPollPeriod": 5000,
+ "timeseriesPollPeriod": 5000,
+ "sendDataOnlyOnChange": true,
+ "attributes": [
+ {
+ "byteOrder": "BIG",
+ "tag": "test",
+ "type": "long",
+ "functionCode": 4,
+ "registerCount": 1,
+ "address": 4
+ }
+ ]
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/mqtt.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/mqtt.json
new file mode 100755
index 0000000..6b78a7c
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/mqtt.json
@@ -0,0 +1,132 @@
+{
+ "broker": {
+ "name":"Default Local Broker",
+ "host":"127.0.0.1",
+ "port":1883,
+ "clientId": "ThingsBoard_gateway",
+ "security": {
+ "type": "basic",
+ "username": "user",
+ "password": "password"
+ }
+ },
+ "mapping": [
+ {
+ "topicFilter": "/sensor/data",
+ "converter": {
+ "type": "json",
+ "deviceNameJsonExpression": "${serialNumber}",
+ "deviceTypeJsonExpression": "${sensorType}",
+ "timeout": 60000,
+ "attributes": [
+ {
+ "type": "string",
+ "key": "model",
+ "value": "${sensorModel}"
+ },
+ {
+ "type": "string",
+ "key": "${sensorModel}",
+ "value": "on"
+ }
+ ],
+ "timeseries": [
+ {
+ "type": "double",
+ "key": "temperature",
+ "value": "${temp}"
+ },
+ {
+ "type": "double",
+ "key": "humidity",
+ "value": "${hum}"
+ }
+ ]
+ }
+ },
+ {
+ "topicFilter": "/sensor/+/data",
+ "converter": {
+ "type": "json",
+ "deviceNameTopicExpression": "(?<=sensor\/)(.*?)(?=\/data)",
+ "deviceTypeTopicExpression": "Thermometer",
+ "timeout": 60000,
+ "attributes": [
+ {
+ "type": "string",
+ "key": "model",
+ "value": "${sensorModel}"
+ }
+ ],
+ "timeseries": [
+ {
+ "type": "double",
+ "key": "temperature",
+ "value": "${temp}"
+ },
+ {
+ "type": "double",
+ "key": "humidity",
+ "value": "${hum}"
+ }
+ ]
+ }
+ },
+ {
+ "topicFilter": "/custom/sensors/+",
+ "converter": {
+ "type": "custom",
+ "extension": "CustomMqttUplinkConverter",
+ "extension-config": {
+ "temperatureBytes" : 2,
+ "humidityBytes" : 2,
+ "batteryLevelBytes" : 1
+ }
+ }
+ }
+ ],
+ "connectRequests": [
+ {
+ "topicFilter": "sensor/connect",
+ "deviceNameJsonExpression": "${SerialNumber}"
+ },
+ {
+ "topicFilter": "sensor/+/connect",
+ "deviceNameTopicExpression": "(?<=sensor\/)(.*?)(?=\/connect)"
+ }
+ ],
+ "disconnectRequests": [
+ {
+ "topicFilter": "sensor/disconnect",
+ "deviceNameJsonExpression": "${SerialNumber}"
+ },
+ {
+ "topicFilter": "sensor/+/disconnect",
+ "deviceNameTopicExpression": "(?<=sensor\/)(.*?)(?=\/disconnect)"
+ }
+ ],
+ "attributeUpdates": [
+ {
+ "deviceNameFilter": "SmartMeter.*",
+ "attributeFilter": "uploadFrequency",
+ "topicExpression": "sensor/${deviceName}/${attributeKey}",
+ "valueExpression": "{\"${attributeKey}\":\"${attributeValue}\"}"
+ }
+ ],
+ "serverSideRpc": [
+ {
+ "deviceNameFilter": ".*",
+ "methodFilter": "echo",
+ "requestTopicExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
+ "responseTopicExpression": "sensor/${deviceName}/response/${methodName}/${requestId}",
+ "responseTimeout": 10000,
+ "valueExpression": "${params}"
+ },
+ {
+ "deviceNameFilter": ".*",
+ "methodFilter": "no-reply",
+ "requestTopicExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
+ "valueExpression": "${params}"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/odbc.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/odbc.json
new file mode 100644
index 0000000..c93992a
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/odbc.json
@@ -0,0 +1,54 @@
+{
+ "connection": {
+ "str": "Driver={PostgreSQL};Server=localhost;Port=5432;Database=thingsboard;Uid=postgres;Pwd=postgres;",
+ "attributes": {
+ "autocommit": true,
+ "timeout": 0
+ },
+ "encoding": "utf-8",
+ "decoding": {
+ "char": "utf-8",
+ "wchar": "utf-8",
+ "metadata": "utf-16le"
+ },
+ "reconnect": true,
+ "reconnectPeriod": 60
+ },
+ "pyodbc": {
+ "pooling": false
+ },
+ "polling": {
+ "query": "SELECT bool_v, str_v, dbl_v, long_v, entity_id, ts FROM ts_kv WHERE ts > ? ORDER BY ts ASC LIMIT 10",
+ "period": 10,
+ "iterator": {
+ "column": "ts",
+ "query": "SELECT MIN(ts) - 1 FROM ts_kv",
+ "persistent": false
+ }
+ },
+ "mapping": {
+ "device": {
+ "type": "postgres",
+ "name": "'ODBC ' + entity_id"
+ },
+ "sendDataOnlyOnChange": false,
+ "attributes": "*",
+ "timeseries": [
+ {
+ "name": "value",
+ "value": "[i for i in [str_v, long_v, dbl_v,bool_v] if i is not None][0]"
+ }
+ ]
+ },
+ "serverSideRpc": {
+ "enableUnknownRpc": false,
+ "overrideRpcConfig": true,
+ "methods": [
+ "procedureOne",
+ {
+ "name": "procedureTwo",
+ "args": [ "One", 2, 3.0 ]
+ }
+ ]
+ }
+ }
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/opcua.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/opcua.json
new file mode 100755
index 0000000..1deed7d
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/opcua.json
@@ -0,0 +1,49 @@
+{
+ "server": {
+ "name": "OPC-UA Default Server",
+ "url": "localhost:4840/freeopcua/server/",
+ "timeoutInMillis": 5000,
+ "scanPeriodInMillis": 5000,
+ "disableSubscriptions":false,
+ "subCheckPeriodInMillis": 100,
+ "showMap": false,
+ "security": "Basic128Rsa15",
+ "identity": {
+ "type": "anonymous"
+ },
+ "mapping": [
+ {
+ "deviceNodePattern": "Root\\.Objects\\.Device1",
+ "deviceNamePattern": "Device ${Root\\.Objects\\.Device1\\.serialNumber}",
+ "attributes": [
+ {
+ "key": "temperature °C",
+ "path": "${ns=2;i=5}"
+ }
+ ],
+ "timeseries": [
+ {
+ "key": "humidity",
+ "path": "${Root\\.Objects\\.Device1\\.TemperatureAndHumiditySensor\\.Humidity}"
+ },
+ {
+ "key": "batteryLevel",
+ "path": "${Battery\\.batteryLevel}"
+ }
+ ],
+ "rpc_methods": [
+ {
+ "method": "multiply",
+ "arguments": [2, 4]
+ }
+ ],
+ "attributes_updates": [
+ {
+ "attributeOnThingsBoard": "deviceName",
+ "attributeOnDevice": "Root\\.Objects\\.Device1\\.serialNumber"
+ }
+ ]
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/request.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/request.json
new file mode 100644
index 0000000..43237a7
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/request.json
@@ -0,0 +1,146 @@
+"job": "leader"
+},
+"allowRedirects": true,
+"timeout": 0.5,
+"scanPeriod": 5,
+"converter": {
+ "type": "json",
+ "deviceNameJsonExpression": "SD8500",
+ "deviceTypeJsonExpression": "SD",
+ "attributes": [
+ {
+ "key": "serialNumber",
+ "type": "string",
+ "value": "${serial}"
+ }
+ ],
+ "telemetry": [
+ {
+ "key": "Maintainer",
+ "type": "string",
+ "value": "${Developer}"
+ }
+ ]
+}
+},
+{
+"url": "get_info",
+"httpMethod": "GET",
+"httpHeaders": {
+ "ACCEPT": "application/json"
+},
+"allowRedirects": true,
+"timeout": 0.5,
+"scanPeriod": 100,
+"converter": {
+ "type": "custom",
+ "deviceNameJsonExpression": "SD8500",
+ "deviceTypeJsonExpression": "SD",
+ "extension": "CustomRequestUplinkConverter",
+ "extension-config": [
+ {
+ "key": "Totaliser",
+ "type": "float",
+ "fromByte": 0,
+ "toByte": 4,
+ "byteorder": "big",
+ "signed": true,
+ "multiplier": 1
+ },
+ {
+ "key": "Flow",
+ "type": "int",
+ "fromByte": 4,
+ "toByte": 6,
+ "byteorder": "big",
+ "signed": true,
+ "multiplier": 0.01
+ },
+ {
+ "key": "Temperature",
+ "type": "int",
+ "fromByte": 8,
+ "toByte": 10,
+ "byteorder": "big",
+ "signed": true,
+ "multiplier": 0.01
+ },
+ {
+ "key": "Pressure",
+ "type": "int",
+ "fromByte": 12,
+ "toByte": 14,
+ "byteorder": "big",
+ "signed": true,
+ "multiplier": 0.01
+ },
+ {
+ "key": "deviceStatus",
+ "type": "int",
+ "byteAddress": 15,
+ "fromBit": 4,
+ "toBit": 8,
+ "byteorder": "big",
+ "signed": false
+ },
+ {
+ "key": "OUT2",
+ "type": "int",
+ "byteAddress": 15,
+ "fromBit": 1,
+ "toBit": 2,
+ "byteorder": "big"
+ },
+ {
+ "key": "OUT1",
+ "type": "int",
+ "byteAddress": 15,
+ "fromBit": 0,
+ "toBit": 1,
+ "byteorder": "big"
+ }
+ ]
+}
+}
+],
+"attributeUpdates": [
+{
+ "httpMethod": "POST",
+ "httpHeaders": {
+ "CONTENT-TYPE": "application/json"
+ },
+ "timeout": 0.5,
+ "tries": 3,
+ "allowRedirects": true,
+ "deviceNameFilter": "SD.*",
+ "attributeFilter": "send_data",
+ "requestUrlExpression": "sensor/${deviceName}/${attributeKey}",
+ "valueExpression": "{\"${attributeKey}\":\"${attributeValue}\"}"
+}
+],
+"serverSideRpc": [
+{
+"deviceNameFilter": ".*",
+"methodFilter": "echo",
+"requestUrlExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
+"responseTimeout": 1,
+"httpMethod": "GET",
+"valueExpression": "${params}",
+"timeout": 0.5,
+"tries": 3,
+"httpHeaders": {
+ "Content-Type": "application/json"
+}
+},
+{
+"deviceNameFilter": ".*",
+"methodFilter": "no-reply",
+"requestUrlExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
+"httpMethod": "POST",
+"valueExpression": "${params}",
+"httpHeaders": {
+ "Content-Type": "application/json"
+}
+}
+]
+}
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/rest.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/rest.json
new file mode 100644
index 0000000..be6c6ff
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/rest.json
@@ -0,0 +1,152 @@
+{
+ "host": "127.0.0.1",
+ "port": "5000",
+ "mapping":[
+ {
+ "endpoint": "/device1",
+ "HTTPMethods": [
+ "POST"
+ ],
+ "security":
+ {
+ "type": "basic",
+ "username": "user",
+ "password": "passwd"
+ },
+ "converter": {
+ "type": "json",
+ "deviceNameExpression": "Device ${name}",
+ "deviceTypeExpression": "default",
+ "attributes": [
+ {
+ "type": "string",
+ "key": "model",
+ "value": "${sensorModel}"
+ }
+ ],
+ "timeseries": [
+ {
+ "type": "double",
+ "key": "${sensorModel}",
+ "value": "${temp}"
+ },
+ {
+ "type": "double",
+ "key": "humidity",
+ "value": "${hum}"
+ }
+ ]
+ }
+ },
+ {
+ "endpoint": "/anon1",
+ "HTTPMethods": [
+ "GET",
+ "POST"
+ ],
+ "security":
+ {
+ "type": "anonymous"
+ },
+ "converter": {
+ "type": "json",
+ "deviceNameExpression": "Device 2",
+ "deviceTypeExpression": "default",
+ "attributes": [
+ {
+ "type": "string",
+ "key": "model",
+ "value": "Model2"
+ }
+ ],
+ "timeseries": [
+ {
+ "type": "double",
+ "key": "temperature",
+ "value": "${temp}"
+ },
+ {
+ "type": "double",
+ "key": "humidity",
+ "value": "${hum}"
+ }
+ ]
+ }
+ },
+ {
+ "endpoint": "/anon2",
+ "HTTPMethods": [
+ "POST"
+ ],
+ "security":
+ {
+ "type": "anonymous"
+ },
+ "converter": {
+ "type": "custom",
+ "deviceNameExpression": "SuperAnonDevice",
+ "deviceTypeExpression": "default",
+ "extension": "CustomRestUplinkConverter",
+ "extension-config": [
+ {
+ "key": "Totaliser",
+ "datatype": "float",
+ "fromByte": 0,
+ "toByte": 4,
+ "byteorder": "big",
+ "signed": true,
+ "multiplier": 1
+ }]
+ }
+ }
+ ],
+ "attributeUpdates": [
+ {
+ "HTTPMethod": "POST",
+ "SSLVerify": false,
+ "httpHeaders": {
+ "CONTENT-TYPE": "application/json"
+ },
+ "security": {
+ "type": "basic",
+ "username": "user",
+ "password": "passwd"
+ },
+ "timeout": 0.5,
+ "tries": 3,
+ "allowRedirects": true,
+ "deviceNameFilter": ".*REST$",
+ "attributeFilter": "data",
+ "requestUrlExpression": "sensor/${deviceName}/${attributeKey}",
+ "valueExpression": "{\"${attributeKey}\":\"${attributeValue}\"}"
+ }
+ ],
+ "serverSideRpc": [
+ {
+ "deviceNameFilter": ".*",
+ "methodFilter": "echo",
+ "requestUrlExpression": "http://127.0.0.1:5001/${deviceName}",
+ "responseTimeout": 1,
+ "HTTPMethod": "GET",
+ "valueExpression": "${params}",
+ "timeout": 0.5,
+ "tries": 3,
+ "httpHeaders": {
+ "Content-Type": "application/json"
+ },
+ "security": {
+ "type": "anonymous"
+ }
+ },
+ {
+ "deviceNameFilter": ".*",
+ "methodFilter": "no-reply",
+ "requestUrlExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
+ "HTTPMethod": "POST",
+ "valueExpression": "${params}",
+ "httpHeaders": {
+ "Content-Type": "application/json"
+ }
+ }
+ ]
+ }
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/snmp.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/snmp.json
new file mode 100644
index 0000000..b4ddb42
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/snmp.json
@@ -0,0 +1,138 @@
+{
+ "devices": [
+ {
+ "deviceName": "SNMP router",
+ "deviceType": "snmp",
+ "ip": "snmp.live.gambitcommunications.com",
+ "port": 161,
+ "pollPeriod": 5000,
+ "community": "public",
+ "attributes": [
+ {
+ "key": "ReceivedFromGet",
+ "method": "get",
+ "oid": "1.3.6.1.2.1.1.1.0",
+ "timeout": 6
+ },
+ {
+ "key": "ReceivedFromMultiGet",
+ "method": "multiget",
+ "oid": [
+ "1.3.6.1.2.1.1.1.0",
+ "1.3.6.1.2.1.1.2.0"
+ ],
+ "timeout": 6
+ },
+ {
+ "key": "ReceivedFromGetNext",
+ "method": "getnext",
+ "oid": "1.3.6.1.2.1.1.1.0",
+ "timeout": 6
+ },
+ {
+ "key": "ReceivedFromMultiWalk",
+ "method": "multiwalk",
+ "oid": [
+ "1.3.6.1.2.1.1.1.0",
+ "1.3.6.0.1.2.1"
+ ]
+ },
+ {
+ "key": "ReceivedFromBulkWalk",
+ "method": "bulkwalk",
+ "oid": [
+ "1.3.6.1.2.1.1.1.0",
+ "1.3.6.1.2.1.1.2.0"
+ ]
+ },
+ {
+ "key": "ReceivedFromBulkGet",
+ "method": "bulkget",
+ "scalarOid": [
+ "1.3.6.1.2.1.1.1.0",
+ "1.3.6.1.2.1.1.2.0"
+ ],
+ "repeatingOid": [
+ "1.3.6.1.2.1.1.1.0",
+ "1.3.6.1.2.1.1.2.0"
+ ],
+ "maxListSize": 10
+ }
+ ],
+ "telemetry": [
+ {
+ "key": "ReceivedFromWalk",
+ "community": "private",
+ "method": "walk",
+ "oid": "1.3.6.1.2.1.1.1.0"
+ },
+ {
+ "key": "ReceivedFromTable",
+ "method": "table",
+ "oid": "1.3.6.1.2.1.1"
+ }
+ ],
+ "attributeUpdateRequests": [
+ {
+ "attributeFilter": "dataToSet",
+ "method": "set",
+ "oid": "1.3.6.1.2.1.1.1.0"
+ },
+ {
+ "attributeFilter": "dataToMultiSet",
+ "method": "multiset",
+ "mappings": {
+ "1.2.3": "10",
+ "2.3.4": "${attribute}"
+ }
+ }
+ ],
+ "serverSideRpcRequests": [
+ {
+ "requestFilter": "setData",
+ "method": "set",
+ "oid": "1.3.6.1.2.1.1.1.0"
+ },
+ {
+ "requestFilter": "multiSetData",
+ "method": "multiset"
+ },
+ {
+ "requestFilter": "getData",
+ "method": "get",
+ "oid": "1.3.6.1.2.1.1.1.0"
+ },
+ {
+ "requestFilter": "runBulkWalk",
+ "method": "bulkwalk",
+ "oid": [
+ "1.3.6.1.2.1.1.1.0",
+ "1.3.6.1.2.1.1.2.0"
+ ]
+ }
+ ]
+ },
+ {
+ "deviceName": "SNMP router",
+ "deviceType": "snmp",
+ "ip": "127.0.0.1",
+ "pollPeriod": 5000,
+ "community": "public",
+ "converter": "CustomSNMPConverter",
+ "attributes": [
+ {
+ "key": "ReceivedFromGetWithCustomConverter",
+ "method": "get",
+ "oid": "1.3.6.1.2.1.1.1.0"
+ }
+ ],
+ "telemetry": [
+ {
+ "key": "ReceivedFromTableWithCustomConverter",
+ "method": "table",
+ "oid": "1.3.6.1.2.1.1.1.0"
+ }
+ ]
+ }
+ ]
+ }
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/tb_gateway.yaml b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/tb_gateway.yaml
new file mode 100755
index 0000000..e3eb8f1
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/tb_gateway.yaml
@@ -0,0 +1,66 @@
+thingsboard:
+ host: demo.thingsboard.io
+ port: 1883
+ remoteConfiguration: false
+ security:
+ accessToken: PUT_YOUR_GW_ACCESS_TOKEN_HERE
+storage:
+ type: memory
+ read_records_count: 100
+ max_records_count: 100000
+# type: file
+# data_folder_path: ./data/
+# max_file_count: 10
+# max_read_records_count: 10
+# max_records_per_file: 10000
+connectors:
+ -
+ name: MQTT Broker Connector
+ type: mqtt
+ configuration: mqtt.json
+
+# -
+# name: Modbus Connector
+# type: modbus
+# configuration: modbus.json
+#
+# -
+# name: Modbus Connector
+# type: modbus
+# configuration: modbus_serial.json
+#
+# -
+# name: OPC-UA Connector
+# type: opcua
+# configuration: opcua.json
+#
+# -
+# name: BLE Connector
+# type: ble
+# configuration: ble.json
+#
+# -
+# name: REQUEST Connector
+# type: request
+# configuration: request.json
+#
+# -
+# name: CAN Connector
+# type: can
+# configuration: can.json
+#
+# -
+# name: BACnet Connector
+# type: bacnet
+# configuration: bacnet.json
+#
+# -
+# name: ODBC Connector
+# type: odbc
+# configuration: odbc.json
+#
+# -
+# name: Custom Serial Connector
+# type: serial
+# configuration: custom_serial.json
+# class: CustomSerialConnector
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/thingsboard-gateway.service b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/thingsboard-gateway.service
new file mode 100644
index 0000000..5dd352a
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/thingsboard-gateway.service
@@ -0,0 +1,13 @@
+[Unit]
+Description = Systemd service for Thingsboard Gateway
+After = network.target
+
+[Service]
+ExecStart = /usr/bin/python3 /usr/bin/thingsboard-gateway
+ExecStop = /bin/kill -INT $MAINPID
+ExecReload = /bin/kill -TERM $MAINPID
+Restart = always
+Type = simple
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.5.2.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.5.2.bb
new file mode 100644
index 0000000..2f0ef16
--- /dev/null
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.5.2.bb
@@ -0,0 +1,68 @@
+SUMMARY = "Open-source IoT platform for data collection, processing, visualization, and device management"
+DESCRIPTION = "\
+The Thingsboard IoT Gateway is an open-source solution that allows you \
+to integrate devices connected to legacy and third-party systems with Thingsboard."
+HOMEPAGE = "https://thingsboard.io/"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+SRC_URI[md5sum] = "469c8b5cd1c16c20ef40f0a97a3a0fda"
+SRC_URI[sha256sum] = "b328f4e315c3541ac80a4931974a34a81afe4d1f382f48e8604669a55816c0d7"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "thingsboard-gateway"
+
+RDEPENDS_${PN} += " python3-jsonpath-rw \
+ python3-regex \
+ python3-paho-mqtt \
+ python3-pyyaml \
+ python3-simplejson \
+ python3-requests \
+ python3-pip \
+ python3-pyrsistent \
+"
+
+SRC_URI += "file://bacnet.json \
+ file://ble.json \
+ file://can.json \
+ file://custom_serial.json \
+ file://modbus.json \
+ file://modbus_serial.json \
+ file://mqtt.json \
+ file://opcua.json \
+ file://odbc.json \
+ file://request.json \
+ file://rest.json \
+ file://snmp.json \
+ file://tb_gateway.yaml \
+ file://logs.conf \
+ file://thingsboard-gateway.service \
+ "
+
+
+inherit systemd
+
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "thingsboard-gateway.service"
+
+FILES_${PN} += "/etc \
+ /lib \
+ /usr \
+"
+
+do_install_append(){
+
+ install -d ${D}${sysconfdir}/thingsboard-gateway/config
+
+ for file in $(find ${WORKDIR} -maxdepth 1 -type f -name *.json); do
+ install -m 0644 "$file" ${D}${sysconfdir}/thingsboard-gateway/config
+ done
+
+ install -m 0644 ${WORKDIR}/tb_gateway.yaml ${D}${sysconfdir}/thingsboard-gateway/config
+ install -m 0644 ${WORKDIR}/logs.conf ${D}${sysconfdir}/thingsboard-gateway/config
+
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/thingsboard-gateway.service ${D}${systemd_system_unitdir}/thingsboard-gateway.service
+}
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.22.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.24.bb
similarity index 96%
rename from meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.22.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.24.bb
index b50ed9f..1a42fd4 100644
--- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.22.bb
+++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.24.bb
@@ -22,7 +22,7 @@
PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}"
PACKAGECONFIG[numa] = ",--disable-numa,numactl"
-SRCREV = "477b6753ad068983d49fea0abc91fab82da9bad0"
+SRCREV = "45d3aa1f57be23db180f8db3d133e8094370f35c"
SRC_URI = "git://git.kernel.dk/fio.git \
"
diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb
similarity index 94%
rename from meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb
rename to meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb
index a18b71a..2f5e25c 100644
--- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb
+++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb
@@ -8,7 +8,7 @@
PV .= "+git${SRCPV}"
SRC_URI = "git://github.com/linux-nvme/nvme-cli.git"
-SRCREV = "949d0aea730136d04af1fb9e0efd4427c20dee6d"
+SRCREV = "f0e9569df9289d6ee55ba2c23615cc7c73a9b088"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb
similarity index 96%
rename from meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.1.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb
index 6164c82..29bcb48 100644
--- a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.1.bb
+++ b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb
@@ -14,7 +14,7 @@
HOMEPAGE = "http://web.mit.edu/Kerberos/"
SECTION = "console/network"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=aff541e7261f1926ac6a2a9a7bbab839"
+LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=dd4d0ad4c5e98abb58aa0d312f276791"
DEPENDS = "bison-native ncurses util-linux e2fsprogs e2fsprogs-native openssl"
inherit autotools-brokensep binconfig perlnative systemd update-rc.d
@@ -31,8 +31,8 @@
file://krb5-kdc.service \
file://krb5-admin-server.service \
"
-SRC_URI[md5sum] = "417d654c72526ac51466e7fe84608878"
-SRC_URI[sha256sum] = "3706d7ec2eaa773e0e32d3a87bf742ebaecae7d064e190443a3acddfd8afb181"
+SRC_URI[md5sum] = "aa4337fffa3b61f22dbd0167f708818f"
+SRC_URI[sha256sum] = "1a4bba94df92f6d39a197a10687653e8bfbc9a2076e129f6eb92766974f86134"
CVE_PRODUCT = "kerberos"
CVE_VERSION = "5-${PV}"
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb
index 3ee6955..e0d3bef 100644
--- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb
+++ b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb
@@ -19,6 +19,7 @@
PACKAGECONFIG_remove_mipsarch = "instrumentation"
PACKAGECONFIG_remove_powerpc = "instrumentation"
+PACKAGECONFIG_remove_riscv32 = "instrumentation"
PACKAGECONFIG[instrumentation] = "--enable-instrumentation,--disable-instrumentation,"
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb
similarity index 94%
rename from meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.2.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb
index d5fe9bf..609932e 100644
--- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.2.bb
+++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb
@@ -12,7 +12,7 @@
DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native"
SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-SRC_URI[sha256sum] = "5fb5553aecd6eb9d6d8ecd130a24f3461e5f93c5f91a0e4ae0508b5228e8b0be"
+SRC_URI[sha256sum] = "fe1a26ba51b4bda7abd09ad4dadedd87d8b8154809fc9d88e94f75fdfff19295"
S = "${WORKDIR}/ModemManager-${PV}"
PACKAGECONFIG ??= "mbim qmi \
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.7.bb
similarity index 94%
rename from meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.6.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.7.bb
index 8e35575..151228b 100644
--- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.6.bb
+++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.7.bb
@@ -13,7 +13,7 @@
SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http"
-SRCREV = "e4c3757524a272c086e369cda5a56b8f766a401a"
+SRCREV = "e047e25d34d53b4b265649144a3cac3b01eee76c"
DEPENDS = "openssl"
diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.3.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.6.bb
similarity index 77%
rename from meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.3.bb
rename to meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.6.bb
index fc4f5d6..7471308 100644
--- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.3.bb
+++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.6.bb
@@ -6,8 +6,8 @@
DEPENDS = "mm-common"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.0/libsigc++-${PV}.tar.xz"
-SRC_URI[md5sum] = "8dca4559e732f47710370baa8bc2e66f"
-SRC_URI[sha256sum] = "e4f4866a894bdbe053e4fb22ccc6bc4b6851fd31a4746fdd20b2cf6e87c6edb6"
+SRC_URI[md5sum] = "8cc0c1df6b7d9c466555f4a2963ab06a"
+SRC_URI[sha256sum] = "b70edcf4611651c54a426e109b17196e1fa17da090592a5000e2d134c03ac5ce"
S = "${WORKDIR}/libsigc++-${PV}"
diff --git a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2/0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2/0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch
new file mode 100644
index 0000000..65df09b
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2/0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch
@@ -0,0 +1,27 @@
+From 01a3a35631ba3996f7e912def66b4053a4f21df9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 3 Nov 2020 10:52:17 -0800
+Subject: [PATCH] Fix arguments in GLib.DBusSignalCallback for Vala 0.50
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/main.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.vala b/src/main.vala
+index 6d7132b0..b3183217 100644
+--- a/src/main.vala
++++ b/src/main.vala
+@@ -403,7 +403,7 @@ class Commands : Object
+ return false;
+ }
+
+- public void signalHandler( GLib.DBusConnection conn, string sender, string path, string iface, string name, Variant params )
++ public void signalHandler( GLib.DBusConnection conn, string? sender, string path, string iface, string name, Variant params )
+ {
+ var line = "[SIGNAL] %s.%s %s %s\n%s".printf(
+ iface,
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb
index 82f2cf8..71ab4d4 100644
--- a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb
+++ b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb
@@ -6,7 +6,9 @@
PV = "2.3.3+git${SRCPV}"
-SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http"
+SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http \
+ file://0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch \
+ "
SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb
index 937b350..36355dd 100644
--- a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb
+++ b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb
@@ -7,8 +7,8 @@
SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https"
-PV = "2.2.12+git${SRCPV}"
-SRCREV = "a9e57b199ff1e8d03fa3e5c53c5544de3dc72fe6"
+PV = "2.2.13+git${SRCPV}"
+SRCREV = "3b7ded60ebb7e1afddcbae6f82ac8645b276e358"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb
index a4f2924..0e29324 100644
--- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb
+++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb
@@ -6,8 +6,8 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-PV = "2.0.11+git${SRCPV}"
-SRCREV = "432b551429b362a877ed9b647b7114022b332be0"
+PV = "2.0.12+git${SRCPV}"
+SRCREV = "524f5ca96c3b9775f9d1debbdbcc2666bcce5c07"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 4d86ef9..e62b1eb 100644
--- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -192,6 +192,7 @@
libsodium \
pkcs11-helper \
"
+RDEPENDS_packagegroup-meta-oe-crypto_remove_riscv32 = "botan"
RDEPENDS_packagegroup-meta-oe-dbs ="\
leveldb \
@@ -226,6 +227,7 @@
${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany-plugins geany", "", d)} \
lemon \
flatbuffers \
+ heaptrack \
libubox \
ltrace \
lua \
@@ -281,7 +283,7 @@
xerces-c-samples \
xmlrpc-c \
yasm \
- json-schema-validator \
+ json-schema-validator \
"
RDEPENDS_packagegroup-meta-oe-devtools_append_x86 = " cpuid msr-tools pmtools"
RDEPENDS_packagegroup-meta-oe-devtools_append_x86-64 = " cpuid msr-tools pcimem pmtools"
@@ -297,8 +299,8 @@
RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc = "android-tools breakpad lshw luajit uftrace"
RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64 = "android-tools lshw luajit uftrace"
RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64le = "android-tools lshw luajit uftrace"
-RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv64 = "breakpad concurrencykit lshw ltrace luajit nodejs ply uftrace"
-RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv32 = "breakpad concurrencykit lshw ltrace luajit nodejs ply uftrace"
+RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv64 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace"
+RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv32 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace"
RDEPENDS_packagegroup-meta-oe-devtools_remove_aarch64 = "${@bb.utils.contains("TUNE_FEATURES", "crypto", "", "abseil-cpp", d)} concurrencykit"
RDEPENDS_packagegroup-meta-oe-devtools_remove_x86-64 = "${@bb.utils.contains("TUNE_FEATURES", "corei7", "", "abseil-cpp", d)}"
RDEPENDS_packagegroup-meta-oe-devtools_remove_x86 = "ply"
@@ -613,7 +615,10 @@
RDEPENDS_packagegroup-meta-oe-multimedia ="\
alsa-oss \
${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faad2", "", d)} \
- cdrkit \
+ dirsplit \
+ genisoimage \
+ icedax \
+ wodim \
id3lib \
audiofile \
a2jmidid \
@@ -935,6 +940,7 @@
RDEPENDS_packagegroup-meta-oe-fortran-packages = "\
lapack \
octave \
+ suitesparse \
"
# library-only or headers-only packages
# They wont be built as part of images but might be interesting to include
@@ -943,9 +949,8 @@
# opencl-headers sdbus-c++-libsystemd boost-url nlohmann-fifo sqlite-orm
# nlohmann-json exprtk liblightmodbus p8platform gnome-doc-utils-stub
# glm ttf-mplus xbitmaps ceres-solver cli11 fftw gnulib libeigen ade
-# spdlog span-lite uthash websocketpp catch2 properties-cpp
+# spdlog span-lite uthash websocketpp catch2 properties-cpp cpp-netlib
# rsyslog conflicts with syslog-ng so its not included here
EXCLUDE_FROM_WORLD = "1"
-
diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch
deleted file mode 100644
index faabc59..0000000
--- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9e5b1420b89813ee3c58c2b792077fa8bb71f327 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 21 May 2020 13:53:27 -0700
-Subject: [PATCH] Tackle SIGEMT and SIGSTKFLT is not glibc specific
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/portability.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/portability.c b/lib/portability.c
-index 294141c6..1c7ebc12 100644
---- a/lib/portability.c
-+++ b/lib/portability.c
-@@ -430,8 +430,11 @@ static const struct signame signames[] = {
- // Non-POSIX signals that cause termination
- SIGNIFY(PROF), SIGNIFY(IO),
- #ifdef __linux__
--# if !defined(__GLIBC__) && !defined(__mips__)
-+# ifdef SIGSTKFLT
- SIGNIFY(STKFLT),
-+# endif
-+# ifdef SIGEMT
-+ SIGNIFY(EMT),
- # endif
- SIGNIFY(POLL), SIGNIFY(PWR),
- #elif defined(__APPLE__)
---
-2.26.2
-
diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch
deleted file mode 100644
index 7ab9593..0000000
--- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-glibc on mips is missing SIGSTKFLT
-
-Do not therefore assume it being available linuxwide
-
-Fixes
-| lib/portability.c:433:3: error: use of undeclared identifier 'SIGSTKFLT'
-| SIGNIFY(STKFLT), SIGNIFY(POLL), SIGNIFY(PWR),
-| ^
-
-Upstream-Status: Submitted [https://github.com/landley/toybox/pull/195]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/lib/portability.c
-+++ b/lib/portability.c
-@@ -430,7 +430,10 @@ static const struct signame signames[] =
- // Non-POSIX signals that cause termination
- SIGNIFY(PROF), SIGNIFY(IO),
- #ifdef __linux__
-- SIGNIFY(STKFLT), SIGNIFY(POLL), SIGNIFY(PWR),
-+# if !defined(__GLIBC__) && !defined(__mips__)
-+ SIGNIFY(STKFLT),
-+# endif
-+ SIGNIFY(POLL), SIGNIFY(PWR),
- #elif defined(__APPLE__)
- SIGNIFY(EMT), SIGNIFY(INFO),
- #endif
diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.4.bb
similarity index 94%
rename from meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb
rename to meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.4.bb
index 1513255..cc98b9e 100644
--- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb
+++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.4.bb
@@ -8,10 +8,8 @@
inherit cml1 update-alternatives
SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
- file://mips-no-STKFLT.patch \
- file://0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch \
"
-SRC_URI[sha256sum] = "eab28fd29d19d4e61ef09704e5871940e6f35fd35a3bb1285e41f204504b5c01"
+SRC_URI[sha256sum] = "cb2a565a8d30015d08d73628795dca51a85b99b149aeabbbecd9e8dbdbd8fddc"
SECTION = "base"
diff --git a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb
index 42e89f6..13b2c66 100644
--- a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb
+++ b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb
@@ -49,3 +49,5 @@
FILES_${PN}-python3 = "${libdir}/python3"
RDEPENDS_${PN}-python3 += "python3"
+
+COMPATIBLE_HOST_riscv32 = "null"
diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
new file mode 100644
index 0000000..9d9f63e
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
@@ -0,0 +1,36 @@
+From 771dd6aa45dd0bbbb7d7c7a7b116e1b5666fbd7a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 15 Nov 2020 18:05:48 -0800
+Subject: [PATCH] Disable use of __NR_io_getevents when not defined
+
+Architectures like riscv32 do not define this syscall, therefore return
+ENOSYS on such architectures
+
+Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/100]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/internal.h | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+--- a/lib/internal.h
++++ b/lib/internal.h
+@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_
+ return syscall(__NR_io_submit, ctx, n, iocb);
+ }
+
+-static inline int io_getevents(aio_context_t ctx, long min, long max,
+- struct io_event *events, struct timespec *timeout)
++static inline int io_getevents(__attribute__((unused)) aio_context_t ctx,
++ __attribute__((unused)) long min,
++ __attribute__((unused)) long max,
++ __attribute__((unused)) struct io_event *events,
++ __attribute__((unused)) struct timespec *timeout)
+ {
++#ifdef __NR_io_getevents
+ return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
++#else
++ return -ENOSYS;
++#endif
+ }
+
+ /************************************************************
diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.0.bb b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb
similarity index 81%
rename from meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.0.bb
rename to meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb
index b478e4c..e76fba0 100644
--- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.0.bb
+++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb
@@ -6,8 +6,10 @@
DEPENDS = "libtool"
S = "${WORKDIR}/git"
-SRCREV = "8397f0f7c45264a3b9aff5a1f9119df25eeb4c60"
-SRC_URI = "git://github.com/smuellerDD/libkcapi.git"
+SRCREV = "d41284525ec8960e9a828979cfe269012b7df8db"
+SRC_URI = "git://github.com/smuellerDD/libkcapi.git \
+ file://0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch \
+ "
inherit autotools
diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb
similarity index 94%
rename from meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb
rename to meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb
index 9b6e7cc..a7365f1 100644
--- a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb
+++ b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb
@@ -18,8 +18,8 @@
SRC_URI = "git://github.com/OpenSC/${BPN}.git"
S = "${WORKDIR}/git"
-# v1.26
-SRCREV = "c7a0cfa08ddc75d963a835d3588170af0e5f1115"
+# v1.27
+SRCREV = "564a582d600c7eec7b8e303a22b575fd52622174"
UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
index 7c92bba..e3ce297 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -19,6 +19,7 @@
file://clang_version_header_conflict.patch \
file://fix-arm-atomic.patch \
file://0001-Fix-library-LZ4-lookup.patch \
+ file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \
"
SRC_URI[sha256sum] = "ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4"
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch
new file mode 100644
index 0000000..0a2eed4
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch
@@ -0,0 +1,37 @@
+From d611f78198dee64bb6a05933d200b544e2510b76 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 14 Nov 2020 14:37:13 -0800
+Subject: [PATCH] innobase: Define __NR_futex if it does not exist
+
+__NR_futex is not defines by newer architectures e.g. arc, riscv32 as
+they only have 64bit variant of time_t. Glibc defines SYS_futex interface based
+on
+__NR_futex, since this is used in applications, such applications start
+to fail to build for these newer architectures. This patch defines a
+fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps
+working
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ storage/innobase/log/log0sync.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/innobase/log/log0sync.cc b/storage/innobase/log/log0sync.cc
+index 7799e605..4fab8f74 100644
+--- a/storage/innobase/log/log0sync.cc
++++ b/storage/innobase/log/log0sync.cc
+@@ -66,6 +66,9 @@ Note that if write operation is very fast, a) or b) can be fine as alternative.
+ #ifdef __linux__
+ #include <linux/futex.h>
+ #include <sys/syscall.h>
++#if !defined(SYS_futex) && defined(SYS_futex_time64)
++# define SYS_futex SYS_futex_time64
++#endif
+ #endif
+
+ #include <atomic>
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc
index 090e16f..a1665ab 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc
+++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc
@@ -36,7 +36,7 @@
# LDFLAGS for shared libraries
export LDFLAGS_SL = "${LDFLAGS}"
-inherit autotools pkgconfig perlnative python3native useradd update-rc.d systemd gettext cpan-base
+inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext cpan-base
CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6"
diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch
new file mode 100644
index 0000000..aa291da
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch
@@ -0,0 +1,47 @@
+From ddcc8a9f7e0f0bfee96f2f0a0c10f21f9fa9b05d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 15 Nov 2020 15:02:28 -0800
+Subject: [PATCH] folly: Use SYS_futex for syscall
+
+glibc defines SYS_futex and on newer 32bit CPUs like RISCV-32, arc there
+is no 32bit time_t therefore define SYS_futex in terms of SYS_futex_time64
+
+Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7676]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ third-party/folly/folly/detail/Futex.cpp | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/third-party/folly/folly/detail/Futex.cpp b/third-party/folly/folly/detail/Futex.cpp
+index 62d6ea2b2..a914a8c73 100644
+--- a/third-party/folly/folly/detail/Futex.cpp
++++ b/third-party/folly/folly/detail/Futex.cpp
+@@ -48,9 +48,15 @@ namespace {
+ #define FUTEX_CLOCK_REALTIME 256
+ #endif
+
++/// Newer 32bit CPUs eg. RISCV-32 are defaulting to 64bit time_t from get go and
++/// therefore do not define __NR_futex
++#if !defined(SYS_futex) && defined(SYS_futex_time64)
++# define SYS_futex SYS_futex_time64
++#endif
++
+ int nativeFutexWake(const void* addr, int count, uint32_t wakeMask) {
+ long rv = syscall(
+- __NR_futex,
++ SYS_futex,
+ addr, /* addr1 */
+ FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG, /* op */
+ count, /* val */
+@@ -112,7 +118,7 @@ FutexResult nativeFutexWaitImpl(
+ // Unlike FUTEX_WAIT, FUTEX_WAIT_BITSET requires an absolute timeout
+ // value - http://locklessinc.com/articles/futex_cheat_sheet/
+ long rv = syscall(
+- __NR_futex,
++ SYS_futex,
+ addr, /* addr1 */
+ op, /* op */
+ expected, /* val */
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
index 7ebc5ab..117a16b 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
+++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
@@ -6,13 +6,14 @@
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
-SRCREV = "48bfca38f6f175435052a59791922a1a453d9609"
-SRCBRANCH = "6.11.fb"
-PV = "6.11.4"
+SRCREV = "f3e33549c151f30ac4eb7c22356c6d0331f37652"
+SRCBRANCH = "6.12.fb"
+PV = "6.12.7"
SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \
file://0001-cmake-Add-check-for-atomic-support.patch \
file://0001-cmake-Use-exported-target-for-bz2.patch \
+ file://0001-folly-Use-SYS_futex-for-syscall.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch
new file mode 100644
index 0000000..43da4a9
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch
@@ -0,0 +1,38 @@
+From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 15 Nov 2020 12:10:28 -0800
+Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t
+
+mutex code uses SYS_futex, which it expects from system C library.
+in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex)
+rv32 is using 64bit time_t from get go unlike other 32bit architectures
+in glibc, therefore it wont have NR_futex defined but just NR_futex_time64
+this aliases it to NR_futex so that SYS_futex is then defined for rv32
+
+Upstream-Status: Submitted [https://github.com/capnproto/capnproto/pull/1103]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ c++/src/kj/mutex.c++ | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++
+index c81cead7..e1594b11 100644
+--- a/c++/src/kj/mutex.c++
++++ b/c++/src/kj/mutex.c++
+@@ -39,7 +39,13 @@
+
+ #ifndef SYS_futex
+ // Missing on Android/Bionic.
++#ifdef __NR_futex
+ #define SYS_futex __NR_futex
++#elif defined(SYS_futex_time64)
++#define SYS_futex SYS_futex_time64
++#else
++#error "Need working SYS_futex"
++#endif
+ #endif
+
+ #ifndef FUTEX_WAIT_PRIVATE
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb
index 71f94ba..54e9dae 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb
@@ -5,7 +5,9 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9"
-SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV}"
+SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV} \
+ file://0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch;patchdir=../ \
+ "
SRCREV = "57a4ca5af5a7f55b768a9d9d6655250bffb1257f"
S = "${WORKDIR}/git/c++"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.13.bb b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb
similarity index 90%
rename from meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.13.bb
rename to meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb
index e617482..0e33275 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.13.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb
@@ -6,7 +6,7 @@
LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0"
SRC_URI = "git://github.com/DaveGamble/cJSON.git"
-SRCREV = "39853e5148dad8dc5d32ea2b00943cf4a0c6f120"
+SRCREV = "d2735278ed1c2e4556f53a7a782063b31331dbf7"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.84.bb b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.88.bb
similarity index 79%
rename from meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.84.bb
rename to meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.88.bb
index 3e46c72..b6a4ae7 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.84.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.88.bb
@@ -6,8 +6,8 @@
LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2"
SRC_URI = "https://github.com/AlDanial/cloc/releases/download/${PV}/${BP}.tar.gz"
-SRC_URI[md5sum] = "a52f3843825377cfa4e4b3b30a567ab4"
-SRC_URI[sha256sum] = "c3f0a6bd2319110418ccb3e55a7a1b6d0edfd7528bfd2ae5d530938abe90f254"
+SRC_URI[md5sum] = "9f12f29c824ef61c5eaba6cf2dd6e183"
+SRC_URI[sha256sum] = "e4e30f083bf4e4a5efbe29efa0f6cefa223ba4e841ad1337653ad1f52702dc6f"
UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
index 2a42093..887b2a4 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
@@ -4,10 +4,10 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master "
-SRCREV = "95f3c6ab36840fb1e0f4935f34dbf8f708b7780c"
+SRCREV = "6d3fab9b9559b6a483fe668e39c29126cdbb58d8"
PV = "1.2"
-SRC_URI_append_class-target = "file://oe-remote.repo.sample"
+SRC_URI_append_class-target = " file://oe-remote.repo.sample"
inherit distutils3-base
diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb
index 752562e..c25ce36 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb
@@ -62,6 +62,6 @@
BBCLASSEXTEND = "native nativesdk"
-SYSROOT_DIRS_BLACKLIST_append_class-target = "${baselib}/cmake/grpc"
+SYSROOT_DIRS_BLACKLIST_append_class-target = " ${baselib}/cmake/grpc"
FILES_${PN}-dev += "${bindir}"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-libheaptrack-Replace-__pid_t-with-pid_t.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-libheaptrack-Replace-__pid_t-with-pid_t.patch
new file mode 100644
index 0000000..9681086
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-libheaptrack-Replace-__pid_t-with-pid_t.patch
@@ -0,0 +1,26 @@
+From 18671cd6028f996c138c6eb4282caf313f3fc605 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 23 Nov 2020 15:25:18 -0800
+Subject: [PATCH] libheaptrack: Replace __pid_t with pid_t
+
+__pid_t is for internal libc use
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/track/libheaptrack.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/track/libheaptrack.cpp b/src/track/libheaptrack.cpp
+index e138bce..4120ecd 100644
+--- a/src/track/libheaptrack.cpp
++++ b/src/track/libheaptrack.cpp
+@@ -79,7 +79,7 @@ chrono::milliseconds elapsedTime()
+ return chrono::duration_cast<chrono::milliseconds>(clock::now() - startTime());
+ }
+
+-__pid_t gettid()
++pid_t gettid()
+ {
+ return syscall(SYS_gettid);
+ }
diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch
new file mode 100644
index 0000000..5fa802c
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch
@@ -0,0 +1,38 @@
+From 8ebcf5f2dd27dbeb6c81e9c40a5d17916cb243e6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 23 Nov 2020 15:26:31 -0800
+Subject: [PATCH] heaptrack_inject: Include dlfcn.h for dlopen/dlclose
+
+Do not use __WORDSIZE which is for libc internal use
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/track/heaptrack_inject.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/track/heaptrack_inject.cpp b/src/track/heaptrack_inject.cpp
+index 325d87e..fb1c154 100644
+--- a/src/track/heaptrack_inject.cpp
++++ b/src/track/heaptrack_inject.cpp
+@@ -28,6 +28,7 @@
+ #include <link.h>
+ #include <malloc.h>
+ #include <unistd.h>
++#include <dlfcn.h>
+
+ #include <sys/mman.h>
+
+@@ -39,9 +40,10 @@
+ * @brief Experimental support for symbol overloading after runtime injection.
+ */
+
+-#if __WORDSIZE == 64
++#include <limits.h>
++#if ULONG_MAX == 0xffffffffffffffff
+ #define ELF_R_SYM(i) ELF64_R_SYM(i)
+-#elif __WORDSIZE == 32
++#elif ULONG_MAX == 0xffffffff
+ #define ELF_R_SYM(i) ELF32_R_SYM(i)
+ #else
+ #error unsupported word size
diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch
new file mode 100644
index 0000000..c3c852e
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch
@@ -0,0 +1,118 @@
+From b8435c6523d9377f04d5e21629f3dc68b8865016 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 23 Nov 2020 15:31:45 -0800
+Subject: [PATCH] heaptrack_preload: Make noexcept attribute conditional
+
+musl does not define these functions with noexcept and hence compiler
+complains about them
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/track/heaptrack_preload.cpp | 26 ++++++++++++++++----------
+ 1 file changed, 16 insertions(+), 10 deletions(-)
+
+diff --git a/src/track/heaptrack_preload.cpp b/src/track/heaptrack_preload.cpp
+index 63110ce..ee85331 100644
+--- a/src/track/heaptrack_preload.cpp
++++ b/src/track/heaptrack_preload.cpp
+@@ -171,11 +171,17 @@ void init()
+ }
+ }
+
++#ifdef __GLIBC__
++#define NOEXECPT noexcept
++#else
++#define NOEXECPT
++#endif
++
+ extern "C" {
+
+ /// TODO: memalign, pvalloc, ...?
+
+-void* malloc(size_t size) noexcept
++void* malloc(size_t size) NOEXECPT
+ {
+ if (!hooks::malloc) {
+ hooks::init();
+@@ -186,7 +192,7 @@ void* malloc(size_t size) noexcept
+ return ptr;
+ }
+
+-void free(void* ptr) noexcept
++void free(void* ptr) NOEXECPT
+ {
+ if (!hooks::free) {
+ hooks::init();
+@@ -204,7 +210,7 @@ void free(void* ptr) noexcept
+ hooks::free(ptr);
+ }
+
+-void* realloc(void* ptr, size_t size) noexcept
++void* realloc(void* ptr, size_t size) NOEXECPT
+ {
+ if (!hooks::realloc) {
+ hooks::init();
+@@ -219,7 +225,7 @@ void* realloc(void* ptr, size_t size) noexcept
+ return ret;
+ }
+
+-void* calloc(size_t num, size_t size) noexcept
++void* calloc(size_t num, size_t size) NOEXECPT
+ {
+ if (!hooks::calloc) {
+ hooks::init();
+@@ -235,7 +241,7 @@ void* calloc(size_t num, size_t size) noexcept
+ }
+
+ #if HAVE_CFREE
+-void cfree(void* ptr) noexcept
++void cfree(void* ptr) NOEXECPT
+ {
+ if (!hooks::cfree) {
+ hooks::init();
+@@ -252,7 +258,7 @@ void cfree(void* ptr) noexcept
+ }
+ #endif
+
+-int posix_memalign(void** memptr, size_t alignment, size_t size) noexcept
++int posix_memalign(void** memptr, size_t alignment, size_t size) NOEXECPT
+ {
+ if (!hooks::posix_memalign) {
+ hooks::init();
+@@ -268,7 +274,7 @@ int posix_memalign(void** memptr, size_t alignment, size_t size) noexcept
+ }
+
+ #if HAVE_ALIGNED_ALLOC
+-void* aligned_alloc(size_t alignment, size_t size) noexcept
++void* aligned_alloc(size_t alignment, size_t size) NOEXECPT
+ {
+ if (!hooks::aligned_alloc) {
+ hooks::init();
+@@ -285,7 +291,7 @@ void* aligned_alloc(size_t alignment, size_t size) noexcept
+ #endif
+
+ #if HAVE_VALLOC
+-void* valloc(size_t size) noexcept
++void* valloc(size_t size) NOEXECPT
+ {
+ if (!hooks::valloc) {
+ hooks::init();
+@@ -301,7 +307,7 @@ void* valloc(size_t size) noexcept
+ }
+ #endif
+
+-void* dlopen(const char* filename, int flag) noexcept
++void* dlopen(const char* filename, int flag) NOEXECPT
+ {
+ if (!hooks::dlopen) {
+ hooks::init();
+@@ -316,7 +322,7 @@ void* dlopen(const char* filename, int flag) noexcept
+ return ret;
+ }
+
+-int dlclose(void* handle) noexcept
++int dlclose(void* handle) NOEXECPT
+ {
+ if (!hooks::dlclose) {
+ hooks::init();
diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0004-backtrace-Always-include-stdint.h.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0004-backtrace-Always-include-stdint.h.patch
new file mode 100644
index 0000000..3db03cf
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0004-backtrace-Always-include-stdint.h.patch
@@ -0,0 +1,42 @@
+From 200f71ea8c0756594ac7e079ccc686d9a20cea5c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 23 Nov 2020 15:32:58 -0800
+Subject: [PATCH] backtrace: Always include stdint.h
+
+in OE we will always have system headers which supports C99/stdint.h
+
+Upstream-Status: Inappropriate [Unless upstream drops legacy]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ 3rdparty/libbacktrace/backtrace.h | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/3rdparty/libbacktrace/backtrace.h b/3rdparty/libbacktrace/backtrace.h
+index 14863cf..d0ac38f 100644
+--- a/3rdparty/libbacktrace/backtrace.h
++++ b/3rdparty/libbacktrace/backtrace.h
+@@ -36,24 +36,8 @@ POSSIBILITY OF SUCH DAMAGE. */
+ #include <stddef.h>
+ #include <stdio.h>
+
+-/* We want to get a definition for uintptr_t, but we still care about
+- systems that don't have <stdint.h>. */
+-#if defined(__GLIBC__) && __GLIBC__ >= 2
+-
+-#include <stdint.h>
+-
+-#elif defined(HAVE_STDINT_H)
+-
+ #include <stdint.h>
+
+-#else
+-
+-/* Systems that don't have <stdint.h> must provide gstdint.h, e.g.,
+- from GCC_HEADER_STDINT in configure.ac. */
+-#include "gstdint.h"
+-
+-#endif
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb
new file mode 100644
index 0000000..f2235af
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Heap memory profiler for Linux"
+DESCRIPTION = "Heaptrack traces all memory allocations and annotates these \
+events with stack traces. Dedicated analysis tools then allow you to interpret \
+the heap memory profile to find hotspots to reduce memory, leaks, allocation \
+hotspots and temporary allocations"
+HOMEPAGE = "https://phabricator.kde.org/source/heaptrack/"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = "zlib boost libunwind elfutils"
+
+SRC_URI = "git://github.com/KDE/heaptrack.git;protocol=https \
+ file://0001-libheaptrack-Replace-__pid_t-with-pid_t.patch \
+ file://0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch \
+ file://0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch \
+ file://0004-backtrace-Always-include-stdint.h.patch \
+ "
+
+SRCREV = "bc9e3744bcc47de978673d1e382f4125a1ab5fa8"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+EXTRA_OECMAKE += "-DHEAPTRACK_BUILD_GUI=OFF"
+
+# libunwind is not yet ported to RISCV
+COMPATIBLE_HOST_riscv32 = "null"
+COMPATIBLE_HOST_riscv64 = "null"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb
index 7d84ea6..60c33d6 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb
@@ -31,7 +31,7 @@
PACKAGECONFIG[readline] = ",,readline"
UCLIBC_PATCHES += "file://uclibc-pthread.patch"
-SRC_URI_append_libc-uclibc = "${UCLIBC_PATCHES}"
+SRC_URI_append_libc-uclibc = " ${UCLIBC_PATCHES}"
TARGET_CC_ARCH += " -fPIC ${LDFLAGS}"
EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}'"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch
new file mode 100644
index 0000000..6fee052
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch
@@ -0,0 +1,43 @@
+From 8c0e4b7907eb577b1e5214f9a7bc75d5c3263b0a Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Sat, 14 Nov 2020 22:55:30 -0700
+Subject: [PATCH] Fix build under GCC -fno-common.
+
+Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/11]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/modules.h | 4 ++--
+ src/main.c | 3 +++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/include/modules.h b/include/modules.h
+index 70c1960..e77ec58 100644
+--- a/include/modules.h
++++ b/include/modules.h
+@@ -28,7 +28,7 @@ struct mod_passwd {
+ link_t link;
+ };
+
+-list_t passwd_mods;
+-list_t group_mods;
++extern list_t passwd_mods;
++extern list_t group_mods;
+
+ #endif
+diff --git a/src/main.c b/src/main.c
+index c1a78bb..808ef74 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -18,6 +18,9 @@
+ #include "parse.h"
+ #include "util.h"
+
++list_t passwd_mods;
++list_t group_mods;
++
+ static void *get_dll(const char *service)
+ {
+ char *path;
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch
new file mode 100644
index 0000000..691aa3d
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch
@@ -0,0 +1,29 @@
+From 4d09032741475c4e9d3de62c8187597f3f72f934 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 22 Nov 2020 12:32:01 -0800
+Subject: [PATCH] configure: Check for flex if lex is not found
+
+lex is already checked by this time, therefore check should be to find
+flex
+Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/12]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 256824a..4c94568 100755
+--- a/configure
++++ b/configure
+@@ -249,7 +249,7 @@ printf "checking for lex... "
+ trylex ${CROSS_COMPILE}lex
+ trylex lex
+ trylex ${CROSS_COMPILE}flex
+-trylex lex
++trylex flex
+ printf "%s\n" "$LEX"
+ test -n "$LEX" || echo "$0: cannot find lex. Will try to use pre-provided source."
+
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
index 374f944..83125a1 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
@@ -7,12 +7,15 @@
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9bf479a145bcaff8489e743da58afeee"
SECTION = "utils"
+DEPENDS += "flex-native bison-native flex bison"
+
PV = "1.0.2"
-CFLAGS += "-fcommon"
-
-SRCREV = "8f278675e1b6a3a02c8ee1b8ca000f80570dc5d6"
-SRC_URI = "git://github.com/pikhq/musl-nscd"
+SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4"
+SRC_URI = "git://github.com/pikhq/musl-nscd \
+ file://0001-Fix-build-under-GCC-fno-common.patch \
+ file://0001-configure-Check-for-flex-if-lex-is-not-found.patch \
+ "
UPSTREAM_CHECK_COMMITS = "1"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.3.bb
similarity index 86%
rename from meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.3.bb
index 2e3da7d..ed1a719 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.3.bb
@@ -5,7 +5,7 @@
DEPENDS = "protobuf-native"
SRC_URI = "git://github.com/nanopb/nanopb.git"
-SRCREV = "70f0de9877b1ce12abc0229d5df84db6349fcbfc"
+SRCREV = "1466e6f953835b191a7f5acf0c06c941d4cd33d9"
S = "${WORKDIR}/git"
@@ -27,4 +27,3 @@
BBCLASSEXTEND = "native nativesdk"
-PNBLACKLIST[nanopb] ?= "Needs forward porting to use python3"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch
new file mode 100644
index 0000000..a23f1c2
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch
@@ -0,0 +1,53 @@
+From be8d3cd6eab4b8f9849133060abb1aba4400276b Mon Sep 17 00:00:00 2001
+From: Amy Huang <akhuang@google.com>
+Date: Thu, 23 Apr 2020 11:25:53 -0700
+Subject: [PATCH] Remove use of register r7 because llvm now issues an error
+ when "r7" is used (starting in commit d85b3877)
+
+Bug: chromium:1073270
+Change-Id: I7ec8112f170b98d2edaf92bc9341e738f8de07a3
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2163435
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#67371}
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Backport [https://chromium.googlesource.com/v8/v8/+/00604cd2806b5d26bef592dd19989a234bd07a4b%5E%21/]
+ deps/v8/src/codegen/arm/cpu-arm.cc | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/deps/v8/src/codegen/arm/cpu-arm.cc b/deps/v8/src/codegen/arm/cpu-arm.cc
+index 868f360..654d68f 100644
+--- a/deps/v8/src/codegen/arm/cpu-arm.cc
++++ b/deps/v8/src/codegen/arm/cpu-arm.cc
+@@ -30,18 +30,6 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start, size_t size) {
+ register uint32_t end asm("r1") = beg + size;
+ register uint32_t flg asm("r2") = 0;
+
+-#ifdef __clang__
+- // This variant of the asm avoids a constant pool entry, which can be
+- // problematic when LTO'ing. It is also slightly shorter.
+- register uint32_t scno asm("r7") = __ARM_NR_cacheflush;
+-
+- asm volatile("svc 0\n"
+- :
+- : "r"(beg), "r"(end), "r"(flg), "r"(scno)
+- : "memory");
+-#else
+- // Use a different variant of the asm with GCC because some versions doesn't
+- // support r7 as an asm input.
+ asm volatile(
+ // This assembly works for both ARM and Thumb targets.
+
+@@ -59,7 +47,6 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start, size_t size) {
+ : "r"(beg), "r"(end), "r"(flg), [scno] "i"(__ARM_NR_cacheflush)
+ : "memory");
+ #endif
+-#endif
+ #endif // !USE_SIMULATOR
+ }
+
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb
similarity index 97%
rename from meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb
rename to meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb
index 8a9f32b..9d15586 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb
@@ -21,11 +21,12 @@
file://0004-v8-don-t-override-ARM-CFLAGS.patch \
file://big-endian.patch \
file://mips-warnings.patch \
+ file://0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch \
"
SRC_URI_append_class-target = " \
file://0002-Using-native-binaries.patch \
"
-SRC_URI[sha256sum] = "71158026579487422fd13cc2553b34cddb76519098aa6030faab52f88c6e0d0e"
+SRC_URI[sha256sum] = "3b671c45c493f96d7e018c15110cdbafa4478e5e5cfc9e6eec83cea9e6b551e1"
S = "${WORKDIR}/node-v${PV}"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.15.bb
similarity index 73%
rename from meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb
rename to meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.15.bb
index 1ab21d1..7b1a8a63 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.15.bb
@@ -5,8 +5,8 @@
SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz"
-SRC_URI[md5sum] = "70bcec4b1b19838ed209fb96a13f3e89"
-SRC_URI[sha256sum] = "51f3e4e311128bdb2c6a15f02c51376cb852ccf9df9bebe8dfbb5f9561eb95b5"
+SRC_URI[md5sum] = "060103c6d6e4d9833fa7715860f2923b"
+SRC_URI[sha256sum] = "43f9cc0f87620bbb159e0890e196b23a8e6419cbd04224c10f3dcee948f6b51a"
S = "${WORKDIR}/IO-Tty-${PV}"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb
index abd8b16..1da5607 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb
@@ -155,7 +155,6 @@
# fixme
do_install_append_class-target() {
install -d ${D}${sysconfdir}/
- rm -rf ${D}/${TMPDIR}
rm -rf ${D}/.registry
rm -rf ${D}/.channels
rm -rf ${D}/.[a-z]*
@@ -179,14 +178,6 @@
${D}${systemd_unitdir}/system/php-fpm.service
fi
- TMP=`dirname ${D}/${TMPDIR}`
- while test ${TMP} != ${D}; do
- if [ -d ${TMP} ]; then
- rmdir ${TMP}
- fi
- TMP=`dirname ${TMP}`;
- done
-
if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/apache2/modules.d
install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}
diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.13.0.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb
similarity index 97%
rename from meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.13.0.1.bb
rename to meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb
index 8c349db..31e3bcc 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.13.0.1.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb
@@ -10,7 +10,7 @@
DEPENDS = "zlib"
DEPENDS_append_class-target = " protobuf-native"
-SRCREV = "d1eca4e4b421cd2997495c4b4e65cea6be4e9b8a"
+SRCREV = "2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10"
SRC_URI = "git://github.com/protocolbuffers/protobuf.git \
file://run-ptest \
diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch
new file mode 100644
index 0000000..c955b5f
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch
@@ -0,0 +1,43 @@
+From 83628b471a1a79dae50bb158fca9448b668dd3a6 Mon Sep 17 00:00:00 2001
+From: Gregory Anders <greg@gpanders.com>
+Date: Wed, 21 Oct 2020 10:43:16 -0600
+Subject: [PATCH] Preserve CXXFLAGS from environment in Mongoose
+
+This allows CXXFLAGS set in the environment to also be used in the CMake
+build process, instead of overwriting them. This is useful in a cross
+compile context where the CXXFLAGS variable might contain necessary
+flags for cross compiling.
+---
+ Mongoose/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Mongoose/CMakeLists.txt b/Mongoose/CMakeLists.txt
+index 7e134ab..91a7f70 100644
+--- a/Mongoose/CMakeLists.txt
++++ b/Mongoose/CMakeLists.txt
+@@ -321,14 +321,14 @@ add_test(Unit_Test_EdgeSep ./tests/mongoose_unit_test_edgesep)
+ message(STATUS "CMAKE_CXX_COMPILER: " ${BoldBlue} ${CMAKE_CXX_COMPILER_ID} ${ColourReset})
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
+ # using Clang
+- SET(CMAKE_CXX_FLAGS "-O3 -fwrapv")
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fwrapv")
+ # Debug flags for Clang
+ SET(CMAKE_CXX_FLAGS_DEBUG "--coverage -g -fwrapv")
+ SET(CMAKE_C_FLAGS_DEBUG "--coverage -g")
+ SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "--coverage -g")
+ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ # using GCC
+- SET(CMAKE_CXX_FLAGS "-O3 -fwrapv")
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fwrapv")
+ # Debug flags for GCC
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.6")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+@@ -339,7 +339,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage")
+ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+ # using Intel C++
+- SET(CMAKE_CXX_FLAGS "-O3 -no-prec-div -xHOST -ipo -fwrapv")
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -no-prec-div -xHOST -ipo -fwrapv")
+ # Debug flags for Intel
+ SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -fwrapv")
+ SET(CMAKE_C_FLAGS_DEBUG "-g -O0 -Wall")
diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch
new file mode 100644
index 0000000..190eaf1
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch
@@ -0,0 +1,22 @@
+From 31175fb408a4f5e85e39a9aabd4a29f9d9c1fe25 Mon Sep 17 00:00:00 2001
+From: Gregory Anders <greg@gpanders.com>
+Date: Wed, 21 Oct 2020 15:26:52 -0600
+Subject: [PATCH] Preserve links when installing libmetis
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 7631955..57fd022 100644
+--- a/Makefile
++++ b/Makefile
+@@ -76,7 +76,7 @@ ifeq (,$(MY_METIS_LIB))
+ @mkdir -p $(INSTALL_LIB)
+ @mkdir -p $(INSTALL_INCLUDE)
+ @mkdir -p $(INSTALL_DOC)
+- - $(CP) lib/libmetis.* $(INSTALL_LIB)
++ - $(CP) -d lib/libmetis.* $(INSTALL_LIB)
+ - $(CP) metis-5.1.0/manual/manual.pdf $(INSTALL_DOC)/METIS_manual.pdf
+ - $(CP) metis-5.1.0/README.txt $(INSTALL_DOC)/METIS_README.txt
+ # the following is needed only on the Mac, so *.dylib is hardcoded:
diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch
new file mode 100644
index 0000000..dee6039
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch
@@ -0,0 +1,49 @@
+From 11ab355fdda93b762fcc07ac3f7c6ab1be0a5f5a Mon Sep 17 00:00:00 2001
+From: Gregory Anders <greg@gpanders.com>
+Date: Wed, 21 Oct 2020 15:27:07 -0600
+Subject: [PATCH] Add version information to libmetis
+
+---
+ metis-5.1.0/Makefile | 8 ++++----
+ metis-5.1.0/libmetis/CMakeLists.txt | 1 +
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/metis-5.1.0/Makefile b/metis-5.1.0/Makefile
+index 9cc03b9..c445d85 100644
+--- a/metis-5.1.0/Makefile
++++ b/metis-5.1.0/Makefile
+@@ -18,8 +18,11 @@ systype = $(shell uname -s)
+
+ BUILDDIR = build/$(systype)-$(cputype)
+
++VERNUM=5.1.0
++PKGNAME=metis-$(VERNUM)
++
+ # Process configuration options.
+-CONFIG_FLAGS =
++CONFIG_FLAGS = -DMETIS_VERSION=$(VERNUM)
+ ifeq ($(gklib_path), not-set)
+ gklib_path = GKlib
+ endif
+@@ -52,9 +55,6 @@ ifneq ($(cc), not-set)
+ CONFIG_FLAGS += -DCMAKE_C_COMPILER=$(cc)
+ endif
+
+-VERNUM=5.1.0
+-PKGNAME=metis-$(VERNUM)
+-
+ JOBS ?= 1
+
+ define run-config
+diff --git a/metis-5.1.0/libmetis/CMakeLists.txt b/metis-5.1.0/libmetis/CMakeLists.txt
+index 120e94d..11bde87 100644
+--- a/metis-5.1.0/libmetis/CMakeLists.txt
++++ b/metis-5.1.0/libmetis/CMakeLists.txt
+@@ -4,6 +4,7 @@ include_directories(.)
+ file(GLOB metis_sources *.c)
+ # Build libmetis.
+ add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources})
++set_target_properties(metis PROPERTIES VERSION ${METIS_VERSION})
+ if(UNIX)
+ target_link_libraries(metis m)
+ endif()
diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb
new file mode 100644
index 0000000..9ccf2d0
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb
@@ -0,0 +1,80 @@
+LICENSE = "GPLv2 & GPLv3 & BSD-3-Clause & LGPL-2.0 & Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f9f2b9d61cb769a67c4cd079e1166de7"
+SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https \
+ file://0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch \
+ file://0002-Preserve-links-when-installing-libmetis.patch \
+ file://0003-Add-version-information-to-libmetis.patch \
+ "
+
+SRC_URI[md5sum] = "c414679bbc9432a3def01b31ad921140"
+SRC_URI[sha256sum] = "06726e471fbaa55f792578f9b4ab282ea9d008cf39ddcc3b42b73400acddef40"
+
+SRCREV = "v${PV}"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "cmake-native lapack gmp mpfr chrpath-native"
+
+PROVIDES = "mongoose graphblas"
+RPROVIDES_${PN} = "mongoose graphblas"
+
+# The values of $CC, $CXX, and $LD that Bitbake uses have spaces in them which
+# causes problems when the SuiteSparse Makefiles try to pass these values on
+# the command line. To get around this problem, set these variables to only the
+# program name and prepend the rest of the value onto the corresponding FLAGS
+# variable.
+CFLAGS_prepend := "${@" ".join(d.getVar('CC', True).split()[1:])} "
+export CC := "${@d.getVar('CC', True).split()[0]}"
+
+CXXFLAGS_prepend := "${@" ".join(d.getVar('CXX', True).split()[1:])} "
+export CXX := "${@d.getVar('CXX', True).split()[0]}"
+
+LDFLAGS_prepend := "${@" ".join(d.getVar('LD', True).split()[1:])} "
+export LD := "${@d.getVar('LD', True).split()[0]}"
+
+export CMAKE_OPTIONS = " \
+ -DCMAKE_INSTALL_PREFIX=${D}${prefix} \
+ -DCMAKE_INSTALL_LIBDIR=${baselib} \
+"
+
+do_compile () {
+ oe_runmake library
+}
+
+do_install () {
+ oe_runmake prefix=${D}${prefix} INSTALL=${D}${prefix} install
+
+ # Remove runtime paths from shared libraries
+ for file in ${D}${libdir}/*.so.*; do
+ if [ ! -L "$file" ]; then
+ chrpath -d "$file"
+ fi
+ done
+}
+
+FILES_${PN} += " \
+ ${libdir}/libmongoose.so.* \
+ ${libdir}/libgraphblas.so.* \
+ ${libdir}/libmetis.so.* \
+ ${libdir}/libsuitesparseconfig.so.* \
+ ${libdir}/libamd.so.* \
+ ${libdir}/libbtf.so.* \
+ ${libdir}/libcamd.so.* \
+ ${libdir}/libccolamd.so.* \
+ ${libdir}/libcolamd.so.* \
+ ${libdir}/libcholmod.so.* \
+ ${libdir}/libcxsparse.so.* \
+ ${libdir}/libldl.so.* \
+ ${libdir}/libklu.so.* \
+ ${libdir}/libumfpack.so.* \
+ ${libdir}/librbio.so.* \
+ ${libdir}/libspqr.so.* \
+ ${libdir}/libsliplu.so.* \
+ ${bindir}/mongoose \
+"
+
+FILES_${PN}-staticdev += "${libdir}/libmongoose.a"
+FILES_${PN}-dev += "${includedir} ${libdir}/*.so"
+
+EXCLUDE_FROM_WORLD = "1"
+
diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init
index 95f5f73..8341346 100644
--- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init
+++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init
@@ -47,11 +47,11 @@
. /etc/default/$NAME
fi
-if test "$ENABLE_COREFILES" == 1; then
+if test "$ENABLE_COREFILES" = 1; then
ulimit -c unlimited
fi
-if test "$USE_COLLECTDMON" == 1; then
+if test "$USE_COLLECTDMON" = 1; then
_PIDFILE="$COLLECTDMON_PIDFILE"
else
_PIDFILE="$PIDFILE"
@@ -96,7 +96,7 @@
return 2
fi
- if test "$USE_COLLECTDMON" == 1; then
+ if test "$USE_COLLECTDMON" = 1; then
start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \
--exec $COLLECTDMON_DAEMON -- -P "$_PIDFILE" -- -C "$CONFIGFILE" \
|| return 2
@@ -150,7 +150,7 @@
# 0 if the daemon is running
# 3 if the daemon is stopped
d_status(){
- if test "$USE_COLLECTDMON" == 1; then
+ if test "$USE_COLLECTDMON" = 1; then
status $COLLECTDMON_DAEMON
else
status $DAEMON
diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb
index b9e735f..f84a91a 100644
--- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb
@@ -56,7 +56,7 @@
${FPLAYOUT} \
--disable-perl --with-libperl=no --with-perl-bindings=no \
--with-libgcrypt=${STAGING_BINDIR_CROSS}/libgcrypt-config \
- --disable-notify_desktop \
+ --disable-notify_desktop --disable-werror \
"
do_install_append() {
diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb
index 4112688..bc4cd0c 100644
--- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb
@@ -26,6 +26,8 @@
INSANE_SKIP_${PN}-dev += "dev-elf"
+LTO = ""
+
# Use CMake 'Unix Makefiles' generator
OECMAKE_GENERATOR ?= "Unix Makefiles"
@@ -44,6 +46,7 @@
EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','',d)}"
EXTRA_OECMAKE_append_riscv64 = " -DFLB_DEPS='atomic'"
+EXTRA_OECMAKE_append_riscv32 = " -DFLB_DEPS='atomic'"
# Kafka Output plugin (disabled by default): note that when
# enabling Kafka output plugin, the backend library librdkafka
diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb
index 926d885..b2c4175 100644
--- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb
@@ -32,7 +32,7 @@
DEPENDS_class-native = "readline-native"
PACKAGECONFIG_class-native = ""
-SRC_URI_append_class-native = "file://0001-reduce-build-to-conversion-tools-for-native-build.patch"
+SRC_URI_append_class-native = " file://0001-reduce-build-to-conversion-tools-for-native-build.patch"
do_install_class-native() {
install -d ${D}${bindir}
diff --git a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
index 50dd74b..f2805a1 100644
--- a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
@@ -2,10 +2,10 @@
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
-PV = "2.3.5+git${SRCPV}"
+PV = "2.3.6+git${SRCPV}"
SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http"
-SRCREV = "c2d857091c0dfed05139ac07ea9b0f36ad259638"
+SRCREV = "bc1d4f6587a4a4829b5d55e3ca7ad584da6de545"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb
index 408fa8a..6ef5b4f 100644
--- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb
@@ -6,7 +6,7 @@
DEPENDS = "libxml2 glib-2.0 swig python3"
-inherit autotools pkgconfig python3native
+inherit autotools pkgconfig python3native python3targetconfig
SRCREV = "c5a30e9267068436a75b5d00fcbf95cb9c1f4dcd"
SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https"
diff --git a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb
index a081cb1..27fe0e2 100644
--- a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb
@@ -31,4 +31,4 @@
FILES_saidar = "${bindir}/saidar"
FILES_saidar-dbg = "${bindir}/.debug/saidar"
FILES_${PN}-mrtg = "${bindir}/statgrab-make-mrtg-config ${bindir}/statgrab-make-mrtg-index"
-RDEPENDS_${PN}-mrtg_append = "perl statgrab"
+RDEPENDS_${PN}-mrtg_append = " perl statgrab"
diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch
new file mode 100644
index 0000000..bc480d9
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch
@@ -0,0 +1,34 @@
+From 0eee3fb85dad084b6b42f7b219d8aa3a62620a27 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Wed, 28 Oct 2020 09:52:40 +0800
+Subject: [PATCH] civetweb/CMakeLists.txt: do not search gcc-ar and gcc-ranlib
+
+Do not search gcc-ar and gcc-ranlib. Specify GCC_AR and GCC_RANLIB in
+EXTRA_OECMAKE to avoid host contamination.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ thirdparty/civetweb-1.10/CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/thirdparty/civetweb-1.10/CMakeLists.txt b/thirdparty/civetweb-1.10/CMakeLists.txt
+index f559a04e..0689e3f6 100644
+--- a/thirdparty/civetweb-1.10/CMakeLists.txt
++++ b/thirdparty/civetweb-1.10/CMakeLists.txt
+@@ -246,11 +246,9 @@ set_property(CACHE CIVETWEB_CXX_STANDARD PROPERTY STRINGS auto c++14 c++11 c++98
+
+ # Configure the linker
+ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
+- find_program(GCC_AR gcc-ar)
+ if (GCC_AR)
+ set(CMAKE_AR ${GCC_AR})
+ endif()
+- find_program(GCC_RANLIB gcc-ranlib)
+ if (GCC_RANLIB)
+ set(CMAKE_RANLIB ${GCC_RANLIB})
+ endif()
+--
+2.17.1
+
diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
index 9113fa6..b3ea44c 100644
--- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
@@ -7,7 +7,7 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=f9534eb5f4ab800b573a37bffc62f3a7"
-DEPENDS = "virtual/crypt expat flex python3 bison-native libxml2"
+DEPENDS = "virtual/crypt expat flex python3 bison-native libxml2 nettle lz4"
RDEPENDS_${PN} = "python3-core"
SRCREV = "aa42957a2e227df41510047cece3cd606dc1cb6a"
@@ -27,6 +27,7 @@
file://0001-CMakeLists.txt-use-curl-local-source-tarball.patch \
file://0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch \
file://0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch \
+ file://0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch \
file://minifi.service \
file://systemd-volatile.conf \
file://sysvinit-volatile.conf \
@@ -52,20 +53,26 @@
EXTRA_OECMAKE += " \
-DHOST_SYS=${HOST_SYS} -DBUILD_SYS=${BUILD_SYS} \
-DSKIP_TESTS=ON \
+ -DGCC_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \
+ -DGCC_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \
"
EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib"
LDFLAGS_append_toolchain-clang = " -fuse-ld=lld"
+
+# RV lld errors out:
+# riscv64-yoe-linux-ld.lld: error: init.c:(.text+0x0): relocation R_RISCV_ALIGN requires unimplemented linker relaxation; recompile with -mno-relax
LDFLAGS_remove_riscv32 = "-fuse-ld=lld"
+LDFLAGS_remove_riscv64 = "-fuse-ld=lld"
# There are endian issues when communicating with the x86 nifi on the the mips and the ppc machines.
COMPATIBLE_MACHINE_mips = "(!.*mips).*"
COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
COMPATIBLE_MACHINE_powerpc = "(!.*ppc).*"
-TARGET_CFLAGS_append_riscv32 += "-fpic"
-TARGET_CXXFLAGS_append_riscv32 += "-fpic"
-TARGET_CFLAGS_append_riscv64 += "-fpic"
-TARGET_CXXFLAGS_append_riscv64 += "-fpic"
+TARGET_CFLAGS_append_riscv32 = " -fpic"
+TARGET_CXXFLAGS_append_riscv32 = " -fpic"
+TARGET_CFLAGS_append_riscv64 = " -fpic"
+TARGET_CXXFLAGS_append_riscv64 = " -fpic"
do_install[cleandirs] += "${WORKDIR}/minifi-install"
diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
index 8bd8e90..9b3289f 100644
--- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
@@ -5,8 +5,8 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd"
-SRCREV = "e15ce6fbc76148ba8835adc92196b0d0a3f245e7"
-PV = "2.1.0+git${SRCPV}"
+SRCREV = "7786c7ded5c9ce7773890d0e3dc27632898fc6b1"
+PV = "2.2.0+git${SRCPV}"
SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \
file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \
diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.6.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.8.bb
similarity index 98%
rename from meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.6.bb
rename to meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.8.bb
index 1e22d3a..4f0f719 100644
--- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.6.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.8.bb
@@ -25,7 +25,7 @@
gitsm://github.com/ostreedev/ostree \
file://run-ptest \
"
-SRCREV = "5d2183f63ef5ecf0e6e555c3214dd3fc17a8e5a1"
+SRCREV = "3e289b19345e30d2da193cd208e109f7d7aaa2a1"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)"
diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.1.2.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.1.bb
similarity index 88%
rename from meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.1.2.bb
rename to meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.1.bb
index e23733b..4059fd4 100644
--- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.1.2.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.1.bb
@@ -7,7 +7,7 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-SRCREV = "b08b36a9a91de00636e583307610f49af7876f50"
+SRCREV = "a9f9c301f8de1c181e6d45c573b5d1fe7b8200b1"
SRC_URI = "git://github.com/sewenew/redis-plus-plus"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/ilp32.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/ilp32.patch
new file mode 100644
index 0000000..48d01a1
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/ilp32.patch
@@ -0,0 +1,29 @@
+__ILP32__ is defined for all 32bit architectures with clang e.g.
+which is right but it is causing issues on non-x86 architectures
+where this condition becomes true and wrongly starts using this
+code, this issue is hidden with gcc becuase gcc does not define
+__ILP32__ for all 32bit architectures but for selected 64bit arches
+who choose to use 32bit ABI e.g. x32
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/debug.c
++++ b/src/debug.c
+@@ -944,7 +944,7 @@ static void *getMcontextEip(ucontext_t *
+ /* Linux */
+ #if defined(__riscv) && __riscv_xlen == 32
+ return (void*) uc->uc_mcontext.__gregs[REG_PC];
+- #elif defined(__i386__) || defined(__ILP32__)
++ #elif defined(__i386__) || (defined(__X86_64__) && defined(__ILP32__))
+ return (void*) uc->uc_mcontext.gregs[14]; /* Linux 32 */
+ #elif defined(__X86_64__) || defined(__x86_64__)
+ return (void*) uc->uc_mcontext.gregs[16]; /* Linux 64 */
+@@ -1125,7 +1125,7 @@ void logRegisters(ucontext_t *uc) {
+ );
+ logStackContent((void**)uc->uc_mcontext.__gregs[REG_SP]);
+ /* Linux x86 */
+- #elif defined(__i386__) || defined(__ILP32__)
++ #elif defined(__i386__) || ( defined(__X86_64__) && defined(__ILP32__))
+ serverLog(LL_WARNING,
+ "\n"
+ "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n"
diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb
index 5463328..14091b5 100644
--- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb
@@ -16,6 +16,7 @@
file://0001-src-Do-not-reset-FINAL_LIBS.patch \
file://GNU_SOURCE.patch \
file://riscv32.patch \
+ file://ilp32.patch \
"
SRC_URI[md5sum] = "70113b4b8ea7ee4c7e148be62b5d1e0b"
diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/python39.patch b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/python39.patch
new file mode 100644
index 0000000..f7115a1
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/python39.patch
@@ -0,0 +1,27 @@
+From 9b0ad5177bd692f7556a4756bdbd2da81d9c34ce Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Tue, 4 Aug 2020 09:19:44 +0200
+Subject: [PATCH] configure.ac: Add support for Python 3.9.
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f9958b3..2917cb3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary])
+ # first, since usually only that variant will add "-lpython3.8".
+ # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
+ SR_PKG_CHECK([python3], [SRD_PKGLIBS],
+- [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
++ [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
+ AS_IF([test "x$sr_have_python3" = xno],
+ [AC_MSG_ERROR([Cannot find Python 3 development headers.])])
+
+--
+2.24.0.rc2
+
diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb
index f9c1d1a..d78d277 100644
--- a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb
@@ -8,7 +8,8 @@
inherit autotools pkgconfig
-SRC_URI = "http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-${PV}.tar.gz"
+SRC_URI = "http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-${PV}.tar.gz \
+ file://python39.patch"
SRC_URI[md5sum] = "7ba4ed4ef1f06ae96979751e096c2821"
SRC_URI[sha256sum] = "c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0"
diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb
index e3ad04f..b449423 100644
--- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb
@@ -6,14 +6,15 @@
SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git"
-SRCREV = "da65fdfe0d1986625ee00af0b56ae17ec132e700"
+SRCREV = "856d0a662a02dd2dc0b83a7ad1de9fd120e82c4b"
-PV = "2020.02.04"
+PV = "2020.11.0"
S = "${WORKDIR}/git"
inherit autotools pkgconfig update-alternatives
-ALTERNATIVE_${PN} = "candump cansend"
+ALTERNATIVE_${PN} = "candump cansend cansequence"
ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump"
ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend"
+ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence"
diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
index aaa2653..8b13dae 100644
--- a/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
@@ -22,6 +22,7 @@
RDEPENDS_${PN} += "iproute2"
ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE_${PN} = "candump cansend"
+ALTERNATIVE_${PN} = "candump cansend cansequence"
ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump"
ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend"
+ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence"
diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.11.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
similarity index 65%
rename from meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.11.bb
rename to meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
index 0debe47..b7a7f6f 100644
--- a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.11.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
@@ -5,10 +5,14 @@
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1"
-SRCREV = "0ff01ae7e4d271a7b81241e7a7026bfcea0add3f"
+SRCREV = "077def398ad303043d73339112968e5112d8d7c8"
SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
+PACKAGECONFIG[no-error-log] = "--disable-error-log,--enable-error-log"
diff --git a/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1b.bb b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1c.bb
similarity index 83%
rename from meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1b.bb
rename to meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1c.bb
index f5078e9..7cac48e 100644
--- a/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1b.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1c.bb
@@ -8,8 +8,8 @@
DEPENDS = "ncurses libevent"
SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz"
-SRC_URI[md5sum] = "2cdacbf06ac4980d3f5312ad23b37f9b"
-SRC_URI[sha256sum] = "d93f351d50af05a75fe6681085670c786d9504a5da2608e481c47cf5e1486db9"
+SRC_URI[md5sum] = "7301d3fa12f35051edb185496766c745"
+SRC_URI[sha256sum] = "918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386"
UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases"
diff --git a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb
index 9d1bb7d..4ae13e7 100644
--- a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb
+++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb
@@ -13,4 +13,7 @@
SRC_URI[archive.sha256sum] = "abff194c7c4802fba2e233890d09dde8bf7170c3ad5e13000601c8d5b3c44717"
export ac_cv_have_iconv_detect_h="yes"
-do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}"
+
+do_configure_append () {
+ cp ${WORKDIR}/iconv-detect.h ${S}
+}
diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.4.bb
similarity index 94%
rename from meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb
rename to meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.4.bb
index 7ef2e53..9f4a763 100644
--- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb
+++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.4.bb
@@ -11,7 +11,7 @@
git://github.com/hughsie/libjcat.git \
file://run-ptest \
"
-SRCREV = "3c120a9132a36b100366cfe3d658ae31e6f4b7e9"
+SRCREV = "55872cea013755a170a581333077b23e322f388b"
S = "${WORKDIR}/git"
inherit gobject-introspection gtk-doc meson ptest-gnome vala
diff --git a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
index f7dc668..e11f7a6 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
+++ b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
@@ -22,6 +22,7 @@
file://fix-client-gfx_state-initialisation.patch \
file://fix-tslib-version-check.patch \
file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
+ file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \
"
S = "${WORKDIR}/DirectFB-${PV}"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch
new file mode 100644
index 0000000..db4417a
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch
@@ -0,0 +1,54 @@
+From 7df69c3a784ab2cc4770bdb366cf788cdb78099a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 15 Nov 2020 12:30:41 -0800
+Subject: [PATCH] os/linux: Fix build when __NR_futex is not available
+
+Newer architectures like riscv32 do not define __NR_futex intentionally
+since it uses 64bit time_t from very beginning, therefore only caters to
+futex_time64 syscall
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/direct/os/linux/glibc/system.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/lib/direct/os/linux/glibc/system.c b/lib/direct/os/linux/glibc/system.c
+index 373a711..d027a70 100644
+--- a/lib/direct/os/linux/glibc/system.c
++++ b/lib/direct/os/linux/glibc/system.c
+@@ -36,6 +36,7 @@
+
+ #include <errno.h>
+ #include <signal.h>
++#include <sys/syscall.h>
+ #include <unistd.h>
+
+ #include <linux/unistd.h>
+@@ -46,6 +47,10 @@
+ #include <direct/system.h>
+ #include <direct/util.h>
+
++#if !defined(SYS_futex) && defined(SYS_futex_time64)
++# define SYS_futex SYS_futex_time64
++#endif
++
+ D_LOG_DOMAIN( Direct_Futex, "Direct/Futex", "Direct Futex" );
+ D_LOG_DOMAIN( Direct_Trap, "Direct/Trap", "Direct Trap" );
+
+@@ -239,10 +244,9 @@ direct_futex( int *uaddr, int op, int val, const struct timespec *timeout, int *
+ }
+ #endif
+
+- ret = syscall( __NR_futex, uaddr, op, val, timeout, uaddr2, val3 );
++ ret = syscall( SYS_futex, uaddr, op, val, timeout, uaddr2, val3 );
+ if (ret < 0)
+ return errno2result( errno );
+
+ return DR_OK;
+ }
+-
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.3.bb b/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.4.bb
similarity index 89%
rename from meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.4.bb
index e3dff91..a1294b9 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.3.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.4.bb
@@ -6,7 +6,7 @@
DEPENDS = "libpng zlib"
SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https"
-SRCREV = "b179e2a42b8a5d72516b9c8d91713c9025cf6044"
+SRCREV = "74373aafc0b496e67642562d86eac6b858a31f24"
S = "${WORKDIR}/git"
inherit autotools-brokensep
diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
index 21bf1bc..6d1d441 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
+++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
@@ -11,7 +11,7 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -1676,7 +1676,7 @@ AC_ARG_ENABLE(tcl,
+@@ -1540,7 +1540,7 @@ AC_ARG_ENABLE(tcl,
[], [enable_tcl=yes])
if test "x$enable_tcl" != "xyes"; then
diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch
index eb51d03..76ff08f 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch
+++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch
@@ -13,12 +13,10 @@
lib/gvpr/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am
-index ac3c098..4914854 100644
--- a/lib/gvpr/Makefile.am
+++ b/lib/gvpr/Makefile.am
-@@ -57,7 +57,7 @@ endif
- mkdefs_SOURCES = mkdefs.c
+@@ -59,7 +59,7 @@ mkdefs$(EXEEXT):
+ $(HOSTCC) $(srcdir)/mkdefs.c -o mkdefs$(EXEEXT)
gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs$(EXEEXT)
- ./mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata
@@ -26,6 +24,3 @@
EXTRA_DIST = $(man_MANS) $(pdf_DATA) gprdata mkdefs.c gdefs.h trie.c gvprlib.vcxproj*
---
-2.20.1
-
diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch
index a9b0352..dd79510 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch
+++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch
@@ -18,8 +18,6 @@
plugin/pango/gvtextlayout_pango.c | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c
-index d620b29..b0da11c 100644
--- a/plugin/pango/gvtextlayout_pango.c
+++ b/plugin/pango/gvtextlayout_pango.c
@@ -15,6 +15,10 @@
@@ -33,6 +31,3 @@
#include "gvplugin_render.h"
#include "agxbuf.h"
#include "utils.h"
---
-2.22.0
-
diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb
similarity index 90%
rename from meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb
index aa5c0c8..bc46a11 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb
@@ -26,7 +26,8 @@
# get checksum errors. Fedora people seem to expect same so they use a versioned
# source - see https://src.fedoraproject.org/cgit/rpms/graphviz.git/tree/graphviz.spec
-SRC_URI = "https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PV}/graphviz-stable_release_${PV}.tar.gz \
+SRCREV = "771bc4dbff3e6f358fa75cdc7774a413ccacad51"
+SRC_URI = "https://www2.graphviz.org/Packages/stable/portable_source/${BP}.tar.gz \
file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \
"
# Use native mkdefs
@@ -38,10 +39,9 @@
file://0001-Use-native-mkdefs.patch \
file://graphviz-setup.sh \
"
-SRC_URI[md5sum] = "2acf30ca8e6cc8b001b0334db65fd072"
-SRC_URI[sha256sum] = "e6c3f8dbfde1c4523055403927bef29f97f9fc12715c1042b5dcf648a2c1c62a"
+SRC_URI[sha256sum] = "8e1b34763254935243ccdb83c6ce108f531876d7a5dfd443f255e6418b8ea313"
-S = "${WORKDIR}/${BPN}-stable_release_${PV}"
+EXTRA_OECONF_append = " PS2PDF=/bin/echo"
EXTRA_OECONF_class-target = "\
--with-expatincludedir=${STAGING_INCDIR} \
diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb
index ba94a83..15c40ee 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb
@@ -21,7 +21,7 @@
BBCLASSEXTEND = "nativesdk"
EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO"
-EXTRA_OECMAKE_append_toolchain-clang = "-DENABLE_WERROR=OFF"
+EXTRA_OECMAKE_append_toolchain-clang = " -DENABLE_WERROR=OFF"
do_configure_prepend () {
cd ${S}
diff --git a/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb b/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb
deleted file mode 100644
index 8e8388e..0000000
--- a/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "The SPIR-V Tools project provides an API and commands for \
-processing SPIR-V modules"
-DESCRIPTION = "The project includes an assembler, binary module parser, \
-disassembler, validator, and optimizer for SPIR-V."
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SECTION = "graphics"
-
-S = "${WORKDIR}/git"
-DEST_DIR = "${S}/external"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \
- git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \
- git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \
- git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \
- git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \
- file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch \
- file://0001-Avoid-pessimizing-std-move-3124.patch \
-"
-SRCREV_spirv-tools = "c413b982c316b14e784f50d941814fc737b55b4a"
-SRCREV_spirv-headers = "af64a9e826bf5bb5fcd2434dd71be1e41e922563"
-SRCREV_effcee = "cd25ec17e9382f99a895b9ef53ff3c277464d07d"
-SRCREV_re2 = "5bd613749fd530b576b890283bfb6bc6ea6246cb"
-SRCREV_googletest = "f2fb48c3b3d79a75a88a99fba6576b25d42ec528"
-
-inherit cmake python3native
-
-EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF"
-
-do_install_append() {
- install -d ${D}/${includedir}/spirv
- install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv
-}
-
-FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/*.so"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb
index 5e0076b..801bd05 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb
@@ -27,3 +27,5 @@
}
SECURITY_CFLAGS_riscv64 = "${SECURITY_NOPIE_CFLAGS}"
+LTO = ""
+
diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
index 2b5ebcc..7c36dfc 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
+++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
@@ -27,6 +27,10 @@
# vm tests need libhugetlbfs starting 5.8+ (https://lkml.org/lkml/2020/4/22/1654)
PACKAGECONFIG_remove_qemumips = "bpf vm"
+# riscv does not support libhugetlbfs yet
+PACKAGECONFIG_remove_riscv64 = "vm"
+PACKAGECONFIG_remove_riscv32 = "vm"
+
PACKAGECONFIG[bpf] = ",,elfutils libcap libcap-ng rsync-native,"
PACKAGECONFIG[firmware] = ",,libcap, bash"
PACKAGECONFIG[vm] = ",,libcap libhugetlbfs,libgcc bash"
diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch
deleted file mode 100644
index 49777bc..0000000
--- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 399f2c9a3acd5bd913e50a4dde52dee6527b297e Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Wed, 29 Jan 2020 13:37:13 +0800
-Subject: [PATCH] [PATCH] Remove duplicated variable definitions
-
-When building on Fedora 32 (with GCC 10), following error is observed:
-
-/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2010: multiple definition of
- `crash_reserved_mem_nr'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2010: first defined here
-/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2009: multiple definition of
- `crash_reserved_mem'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2009: first defined here
-/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1278: multiple definition of
- `parallel_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1278: first defined here
-/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1265: multiple definition of
- `splitting_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1265: first defined here
-...
-collect2: error: ld returned 1 exit status
-make: *** [Makefile:97: makedumpfile] Error 1
-
-These variables are wrongly defined multiple times. So remove the
-duplicated definitions.
-
-Upstream-Status: Backport [https://github.com/kraj/makedumpfile/commit/399f2c9a3acd5bd913e50a4dde52dee6527b297e]
-Signed-off-by: Kairui Song <kasong@redhat.com>
-Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
----
- makedumpfile.c | 8 ++++----
- makedumpfile.h | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/makedumpfile.c b/makedumpfile.c
-index e290fbd..ae7336a 100644
---- a/makedumpfile.c
-+++ b/makedumpfile.c
-@@ -10954,7 +10954,7 @@ check_param_for_reassembling_dumpfile(int argc, char *argv[])
- return FALSE;
-
- if ((info->splitting_info
-- = malloc(sizeof(splitting_info_t) * info->num_dumpfile))
-+ = malloc(sizeof(struct splitting_info) * info->num_dumpfile))
- == NULL) {
- MSG("Can't allocate memory for splitting_info.\n");
- return FALSE;
-@@ -11042,7 +11042,7 @@ check_param_for_creating_dumpfile(int argc, char *argv[])
- return FALSE;
- }
- if ((info->splitting_info
-- = malloc(sizeof(splitting_info_t) * info->num_dumpfile))
-+ = malloc(sizeof(struct splitting_info) * info->num_dumpfile))
- == NULL) {
- MSG("Can't allocate memory for splitting_info.\n");
- return FALSE;
-@@ -11077,13 +11077,13 @@ check_param_for_creating_dumpfile(int argc, char *argv[])
-
- if (info->num_threads) {
- if ((info->parallel_info =
-- malloc(sizeof(parallel_info_t) * info->num_threads))
-+ malloc(sizeof(struct parallel_info) * info->num_threads))
- == NULL) {
- MSG("Can't allocate memory for parallel_info.\n");
- return FALSE;
- }
-
-- memset(info->parallel_info, 0, sizeof(parallel_info_t)
-+ memset(info->parallel_info, 0, sizeof(struct parallel_info)
- * info->num_threads);
- }
-
-diff --git a/makedumpfile.h b/makedumpfile.h
-index 68d9691..7217407 100644
---- a/makedumpfile.h
-+++ b/makedumpfile.h
-@@ -1262,7 +1262,7 @@ struct splitting_info {
- mdf_pfn_t end_pfn;
- off_t offset_eraseinfo;
- unsigned long size_eraseinfo;
--} splitting_info_t;
-+};
-
- struct parallel_info {
- int fd_memory;
-@@ -1275,7 +1275,7 @@ struct parallel_info {
- #ifdef USELZO
- lzo_bytep wrkmem;
- #endif
--} parallel_info_t;
-+};
-
- struct ppc64_vmemmap {
- unsigned long phys;
-@@ -2006,8 +2006,8 @@ struct memory_range {
- };
-
- #define CRASH_RESERVED_MEM_NR 8
--struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR];
--int crash_reserved_mem_nr;
-+extern struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR];
-+extern int crash_reserved_mem_nr;
-
- unsigned long read_vmcoreinfo_symbol(char *str_symbol);
- int readmem(int type_addr, unsigned long long addr, void *bufptr, size_t size);
---
-2.28.0
-
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 ff093a7..270cc35 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,10 @@
Makefile | 45 +++++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 22 deletions(-)
-diff --git a/Makefile b/Makefile
-index 1fdb628..5dce589 100644
---- a/Makefile
-+++ b/Makefile
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
@@ -8,12 +8,6 @@ ifeq ($(strip $CC),)
CC = gcc
endif
@@ -81,12 +81,12 @@
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
OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
-@@ -52,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
+@@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
LIBS = -ldw -lbz2 -ldl -lelf -lz
ifneq ($(LINKTYPE), dynamic)
--LIBS := -static $(LIBS)
-+LIBS := $(LIBS)
+-LIBS := -static $(LIBS) -llzma
++LIBS := $(LIBS) -llzma
endif
ifeq ($(USELZO), on)
@@ -96,13 +96,16 @@
endif
ifeq ($(USESNAPPY), on)
- LIBS := -lsnappy $(LIBS)
+@@ -65,7 +66,7 @@ LIBS := -lsnappy $(LIBS)
+ ifneq ($(LINKTYPE), dynamic)
+ LIBS := $(LIBS) -lstdc++
+ endif
-CFLAGS += -DUSESNAPPY
+CFLAGS_COMMON += -DUSESNAPPY
endif
LIBS := -lpthread $(LIBS)
-@@ -87,14 +88,14 @@ LIBS := $(LIBS) $(call try-run,\
+@@ -90,14 +91,14 @@ LIBS := $(LIBS) $(call try-run,\
all: makedumpfile
$(OBJ_PART): $(SRC_PART)
@@ -119,7 +122,7 @@
echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8
grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8
mv temp.8 makedumpfile.8
-@@ -105,7 +106,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
+@@ -108,7 +109,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(
gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz
eppic_makedumpfile.so: extension_eppic.c
@@ -128,6 +131,3 @@
clean:
rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz
---
-2.21.0
-
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 1707df3..85d8833 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,11 +28,11 @@
arch/ppc64.c | 38 ++------------------------------------
1 file changed, 2 insertions(+), 36 deletions(-)
-diff --git a/arch/ppc64.c b/arch/ppc64.c
-index 9d8f252..6f4860f 100644
---- a/arch/ppc64.c
-+++ b/arch/ppc64.c
-@@ -462,48 +462,14 @@ ppc64_vtop_level4(unsigned long vaddr)
+Index: git/arch/ppc64.c
+===================================================================
+--- git.orig/arch/ppc64.c
++++ git/arch/ppc64.c
+@@ -462,44 +462,6 @@ ppc64_vtop_level4(unsigned long vaddr)
return paddr;
}
@@ -40,6 +40,13 @@
-set_ppc64_max_physmem_bits(void)
-{
- long array_len = ARRAY_LENGTH(mem_section);
+-
+- /* Check if we can get MAX_PHYSMEM_BITS from vmcoreinfo */
+- if (NUMBER(MAX_PHYSMEM_BITS) != NOT_FOUND_NUMBER) {
+- info->max_physmem_bits = NUMBER(MAX_PHYSMEM_BITS);
+- return TRUE;
+- }
+-
- /*
- * The older ppc64 kernels uses _MAX_PHYSMEM_BITS as 42 and the
- * newer kernels 3.7 onwards uses 46 bits.
@@ -67,10 +74,10 @@
-
- return FALSE;
-}
--
+
int
get_machdep_info_ppc64(void)
- {
+@@ -507,10 +469,8 @@ get_machdep_info_ppc64(void)
unsigned long vmlist, vmap_area_list, vmalloc_start;
info->section_size_bits = _SECTION_SIZE_BITS;
@@ -83,6 +90,3 @@
info->page_offset = __PAGE_OFFSET;
if (SYMBOL(_stext) == NOT_FOUND_SYMBOL) {
---
-2.21.0
-
diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb
similarity index 74%
rename from meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb
rename to meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb
index 165e192..4754651 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb
+++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb
@@ -5,12 +5,15 @@
images without extra uneeded information (zero pages, userspace programs, \
etc). \
"
-HOMEPAGE = "http://makedumpfile.sourceforge.net"
+HOMEPAGE = "https://github.com/makedumpfile/makedumpfile"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
LICENSE = "GPLv2.0"
-DEPENDS = "bzip2 zlib elfutils"
+SRCBRANCH ?= "master"
+SRCREV = "18e0cdba48feeccea2429b3b0b2691f4314d1062"
+
+DEPENDS = "bzip2 zlib elfutils xz"
RDEPENDS_${PN}-tools = "perl ${PN}"
# arm and aarch64 would compile but has never been tested upstream. mips would not compile.
@@ -21,16 +24,14 @@
FILES_${PN}-tools = "${bindir}/*.pl"
SRC_URI = "\
- ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \
+ git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH} \
file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \
- file://0001-PATCH-Remove-duplicated-variable-definitions.patch \
"
-SRC_URI[md5sum] = "808ef840ca49ca6bfde77c097cf429f5"
-SRC_URI[sha256sum] = "e702fbdf62b4cd829a76e46f3e24eb3fc7501918b85ebdcd8baef4f53d6ee2c8"
-UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/makedumpfile/files/makedumpfile/"
-UPSTREAM_CHECK_REGEX = "makedumpfile/(?P<pver>\d+(\.\d+)+)/"
+S = "${WORKDIR}/git"
+
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
SECTION = "base"
@@ -40,8 +41,13 @@
EXTRA_OEMAKE = "\
LINKTYPE=static \
TARGET=${TARGET_ARCH} \
+ ${PACKAGECONFIG_CONFARGS} \
"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[lzo] = "USELZO=on,USELZO=off,lzo"
+PACKAGECONFIG[snappy] = "USESNAPPY=on,USESNAPPY=off,snappy"
+
do_install () {
mkdir -p ${D}/usr/bin
install -m 755 ${S}/makedumpfile ${D}/usr/bin
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
index ebb95cf..3344821 100644
--- a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
+++ b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
@@ -18,8 +18,40 @@
inherit cmake
DEPENDS = "libcap file bzip2"
-RDEPENDS_${PN} = "perl"
+RDEPENDS_dirsplit = "perl"
+
+PACKAGES =+ "dirsplit genisoimage icedax wodim"
+
+FILES_dirsplit = " \
+ ${bindir}/dirsplit \
+"
+
+FILES_genisoimage = " \
+ ${bindir}/devdump \
+ ${bindir}/genisoimage \
+ ${bindir}/isodebug \
+ ${bindir}/isodump \
+ ${bindir}/isoinfo \
+ ${bindir}/isovfy \
+ ${bindir}/mkisofs \
+"
+
+FILES_icedax = " \
+ ${bindir}/cdda2mp3 \
+ ${bindir}/cdda2ogg \
+ ${bindir}/icedax \
+ ${bindir}/pitchplay \
+ ${bindir}/readmult \
+"
+
+FILES_wodim = " \
+ ${bindir}/readom \
+ ${bindir}/wodim \
+ ${sbindir}/netscsid \
+"
do_install_append() {
ln -sf ${bindir}/genisoimage ${D}${bindir}/mkisofs
}
+
+BBCLASSEXTEND = "native"
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch
new file mode 100644
index 0000000..dd1b7cc
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch
@@ -0,0 +1,62 @@
+From 83068f9b71aea16d1ad036fdcc326de1027b5585 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 15 Nov 2020 22:13:29 -0800
+Subject: [PATCH] Use SYS_futex instead of __NR_futex
+
+SYS_futex is expected from system C library.
+in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex)
+rv32 is using 64bit time_t from get go unlike other 32bit architectures
+in glibc, therefore it wont have NR_futex defined but just NR_futex_time64
+this aliases it to NR_futex so that SYS_futex is then defined for rv32
+
+Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/670]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ linux/JackLinuxFutex.cpp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/linux/JackLinuxFutex.cpp b/linux/JackLinuxFutex.cpp
+index deff006b..aef99cd2 100644
+--- a/linux/JackLinuxFutex.cpp
++++ b/linux/JackLinuxFutex.cpp
+@@ -29,6 +29,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #include <syscall.h>
+ #include <linux/futex.h>
+
++#if !defined(SYS_futex) && defined(SYS_futex_time64)
++#define SYS_futex SYS_futex_time64
++#endif
++
+ namespace Jack
+ {
+
+@@ -67,7 +71,7 @@ bool JackLinuxFutex::Signal()
+ if (! fFutex->internal) return true;
+ }
+
+- ::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0);
++ ::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0);
+ return true;
+ }
+
+@@ -94,7 +98,7 @@ bool JackLinuxFutex::Wait()
+ if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0))
+ return true;
+
+- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK)
++ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK)
+ return false;
+ }
+ }
+@@ -122,7 +126,7 @@ bool JackLinuxFutex::TimedWait(long usec)
+ if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0))
+ return true;
+
+- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK)
++ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK)
+ return false;
+ }
+ }
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch
index dda21a3..1bdc5ad 100644
--- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch
+++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch
@@ -1,4 +1,4 @@
-From 76b8a389268275cc13f3b4e61394d40b24ec56f1 Mon Sep 17 00:00:00 2001
+From f8cb818ca96fc2a45a04448a51f25a277ec183db Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 15 Jan 2020 20:21:58 -0800
Subject: [PATCH] example-clients: Use c++ compiler for jack_simdtests
@@ -12,22 +12,26 @@
Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/536]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- example-clients/wscript | 2 ++
- 1 file changed, 2 insertions(+)
+ example-clients/wscript | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
-diff --git a/example-clients/wscript b/example-clients/wscript
-index a8857aa7..df9435aa 100644
--- a/example-clients/wscript
+++ b/example-clients/wscript
-@@ -69,6 +69,8 @@ def build(bld):
-
- if bld.env['IS_MACOSX']:
- prog = bld(features='c cprogram', framework = ['Foundation'])
-+ elif example_program == 'jack_simdtests':
-+ prog = bld(features='cxx cxxprogram')
+@@ -49,10 +49,15 @@ def build(bld):
else:
- prog = bld(features='c cprogram')
+ use = ['clientlib']
+
++ if example_program == 'jack_simdtests':
++ ftrs = 'cxx cxxprogram'
++ else:
++ ftrs = 'c cprogram'
++
+ if bld.env['IS_MACOSX']:
+- prog = bld(features='c cprogram', framework = ['Foundation'])
++ prog = bld(features = ftrs, framework = ['Foundation'])
+ else:
+- prog = bld(features='c cprogram')
++ prog = bld(features = ftrs)
prog.includes = os_incdir + ['../common/jack', '../common']
---
-2.25.0
-
+ prog.source = example_program_source
+ prog.use = use
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.16.bb
similarity index 93%
rename from meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.16.bb
index e954341..c13d626 100644
--- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb
+++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.16.bb
@@ -16,8 +16,9 @@
SRC_URI = "git://github.com/jackaudio/jack2.git \
file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \
+ file://0001-Use-SYS_futex-instead-of-__NR_futex.patch \
"
-SRCREV = "b54a09bf7ef760d81fdb8544ad10e45575394624"
+SRCREV = "5b78c2ef158c2d9ffe09818a7dd80209ed251c5f"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200819.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20201105.bb
similarity index 96%
rename from meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200819.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20201105.bb
index c746b6e..59375c8 100644
--- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200819.bb
+++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20201105.bb
@@ -16,7 +16,7 @@
# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older
MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n"
-SRC_URI[sha256sum] = "af3af7f2510b0b45f38892c232abca2cee2ab36a62503e7085b47ed2c3c2c537"
+SRC_URI[sha256sum] = "89bdfba7fd215e16be2c9d46a797bf85c5f7f7c46b53dc8af2d1171a658da5b7"
S = "${WORKDIR}/live"
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
index 1a415c1..173b695 100644
--- a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
+++ b/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb
@@ -33,6 +33,7 @@
LDFLAGS_append_mipsarch = " -latomic"
LDFLAGS_append_x86 = " -latomic"
+LDFLAGS_append_riscv32 = " -latomic"
PACKAGES =+ "\
${PN}-spa-plugins \
diff --git a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb
index 03a10ce..b37441e 100644
--- a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb
+++ b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb
@@ -12,9 +12,10 @@
inherit meson pkgconfig gtk-doc gobject-introspection vala
-SRC_URI = "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/${PV}/geoclue-${PV}.tar"
+SRCREV = "555d676a91494b98ad0d52639590608a9594a8d3"
+SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1"
-SRC_URI[sha256sum] = "76494f1262fd90faea05116aface7f580b9b50f7c525bc86ccf33409cea95e8d"
+S = "${WORKDIR}/git"
# Without this line, package is declared a library and named libgeoclue*
AUTO_LIBNAME_PKGS = ""
diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb
index 6005080..5965b8d 100644
--- a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb
+++ b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb
@@ -21,6 +21,7 @@
EXTRA_OEMAKE_class-target = "LIBTOOL=${HOST_SYS}-libtool"
LDFLAGS_append_mipsarch = " -latomic"
+LDFLAGS_append_riscv32 = " -latomic"
S="${WORKDIR}/${BPN}-${PV}"
diff --git a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb
index 9d78c34..a83efe0 100644
--- a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb
+++ b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb
@@ -12,8 +12,8 @@
file://2ch_t.patch \
"
-SRC_URI_append_class-target = "file://target-helpers.patch"
-SRC_URI_append_class-native = "file://native-helpers.patch"
+SRC_URI_append_class-target = " file://target-helpers.patch"
+SRC_URI_append_class-native = " file://native-helpers.patch"
SRC_URI[md5sum] = "1f558ff7ed296787b55bb1c6cf131108"
SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547"
diff --git a/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb
new file mode 100644
index 0000000..472b72f
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Modern C++ network programming libraries."
+
+# This library provides general purpose network functionality such as
+# socket communication to agent libraries. It was designed to be merged
+# into boost at some point and follows similar header library approach
+# for most functionality.
+
+SECTION = "libs"
+LICENSE = "BSL-1.0 & MIT & Python-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
+
+SRC_URI = "\
+ git://github.com/cpp-netlib/cpp-netlib.git;protocol=https;branch=0.13-release \
+"
+SRC_URI[sha256sum] = "0b9255bb0668d89867a1f367d770f12d7038db4f5b6111774ef032f669cccad4"
+
+SRCREV = "ca95f04d140acf619892ee02a82e930dd91ff7d4"
+
+S = "${WORKDIR}/git"
+
+inherit cmake pkgconfig
+
+DEPENDS = "zlib boost openssl"
+
+EXTRA_OECMAKE_append = " -DCPP-NETLIB_BUILD_TESTS=OFF -DCPP-NETLIB_BUILD_EXAMPLES=OFF"
+
diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.1.2.bb
similarity index 90%
rename from meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb
rename to meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.1.2.bb
index d527311..70b39be 100644
--- a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb
+++ b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.1.2.bb
@@ -5,7 +5,7 @@
LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b"
SRC_URI += "git://github.com/fmtlib/fmt"
-SRCREV = "cd4af11efc9c622896a3e4cb599fa28668ca3d05"
+SRCREV = "cc09f1a6798c085c325569ef466bcdcffdc266d4"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-profile-handler-Specify-libc-specific-thread_id.patch b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-profile-handler-Specify-libc-specific-thread_id.patch
new file mode 100644
index 0000000..4029a69
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-profile-handler-Specify-libc-specific-thread_id.patch
@@ -0,0 +1,38 @@
+From 0a504852ed6e56620d1df26b503c4aa2b5b74760 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 31 Oct 2020 16:12:36 -0700
+Subject: [PATCH] profile-handler: Specify libc specific thread_id
+
+We need to know internal _sigev_un is glibc specific, add an else for
+musl case
+
+Fixes build issue
+../git/src/profile-handler.cc:275:8: error: no member named '_sigev_un' in 'sigevent'
+ sevp._sigev_un._tid = sys_gettid();
+ ~~~~ ^
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/profile-handler.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/profile-handler.cc b/src/profile-handler.cc
+index 7fdcb69..5867118 100644
+--- a/src/profile-handler.cc
++++ b/src/profile-handler.cc
+@@ -272,7 +272,11 @@ static void StartLinuxThreadTimer(int timer_type, int signal_number,
+ struct itimerspec its;
+ memset(&sevp, 0, sizeof(sevp));
+ sevp.sigev_notify = SIGEV_THREAD_ID;
++#ifdef __GLIBC__
+ sevp._sigev_un._tid = sys_gettid();
++#else
++ sevp.sigev_notify_thread_id = sys_gettid();
++#endif
+ sevp.sigev_signo = signal_number;
+ clockid_t clock = CLOCK_THREAD_CPUTIME_ID;
+ if (timer_type == ITIMER_REAL) {
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb
index 662777b4..d9b310b 100644
--- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb
+++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb
@@ -10,6 +10,7 @@
file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \
file://disable_libunwind_aarch64.patch \
file://sgidef.patch \
+ file://0001-profile-handler-Specify-libc-specific-thread_id.patch \
"
inherit autotools
diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb
index 5afc459..ef015dc 100644
--- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb
+++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb
@@ -11,6 +11,6 @@
inherit autotools pkgconfig
SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https"
-PV = "0.9.0"
-SRCREV = "7da5cc91fc0d2dbe4df4f08cd31f6ca1a262418f"
+PV = "0.10.0"
+SRCREV = "302d1f24018d5a4a480f92a72307616f88d97651"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb
index cc12a68..8564606 100644
--- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb
+++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb
@@ -5,8 +5,8 @@
LICENSE = "GPL-2.0+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
-PV = "0.340"
-SRCREV = "60d9f39b0542607fcc436e7aebf6b05a9ca674ff"
+PV = "0.341"
+SRCREV = "82fc979083e959a749ea5bb919aa6d7d61123ae0"
SRC_URI = "git://github.com/vcrhonek/${BPN}.git"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
index 70cb237..ac81fc7 100644
--- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
+++ b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
@@ -4,7 +4,8 @@
DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \
editing raster and vector image files. It can read and write over 200 image file formats."
LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=41b4fa9af60c88e61484b02c0561181a"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=41b4fa9af60c88e61484b02c0561181a \
+ file://NOTICE;md5=a2aa6e41f8a40700196a9ce301693e34"
# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool"
diff --git a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch
deleted file mode 100644
index 2c7cd99..0000000
--- a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 22bff509e2a0e5640994bc92ded62c383d99bc37 Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <pjtexier@koncepto.io>
-Date: Mon, 24 Feb 2020 21:44:45 +0100
-Subject: [PATCH] Makefile.am: add build rule for README
-
-Fixes:
-
-| configure.ac:17: installing 'config/config.sub'
-| configure.ac:16: installing 'config/install-sh'
-| configure.ac:16: installing 'config/missing'
-| Makefile.am: error: required file './README' not found
-| libinotifytools/src/Makefile.am: installing 'config/depcomp'
-
-Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/111]
-
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
----
- Makefile.am | 2 ++
- autogen.sh | 1 -
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 56e4531..d08c8fe 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4
-
- SUBDIRS = libinotifytools src man
-
-+README: README.md
-+
- dist-hook:
- # Automake official documentation states that dist-hook should assume files
- # are not writable.
-diff --git a/autogen.sh b/autogen.sh
-index 48eb21d..31572c2 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -1,4 +1,3 @@
- #!/bin/sh
-
--cp README.md README
- autoreconf --install "$@" || exit 1
---
-2.7.4
-
diff --git a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb
index f42abeb..8206590 100644
--- a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb
+++ b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb
@@ -5,12 +5,10 @@
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6"
-SRCREV = "cfa93aa19f81d85b63cd64da30c7499890d4c07d"
-PV = "3.20.2.2"
+SRCREV = "98e8dfa47eb6a6ba52e35de55d2de21b274a4af8"
+PV = "3.20.11.0"
-SRC_URI = "git://github.com/rvoicilas/${BPN} \
- file://0001-Makefile.am-add-build-rule-for-README.patch \
- "
+SRC_URI = "git://github.com/rvoicilas/${BPN}"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb b/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb
index c33c791..8479b27 100644
--- a/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb
+++ b/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb
@@ -9,7 +9,7 @@
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
"
-DEPENDS = "libusb1 python3"
+DEPENDS = "libusb1 python3 swig-native"
SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2"
SRC_URI[md5sum] = "0c09fb2bb19a57c839fa6845c6c780a2"
diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.5.bb
similarity index 88%
rename from meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb
rename to meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.5.bb
index 6433675..aec50e7 100644
--- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb
+++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.5.bb
@@ -5,8 +5,8 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de"
SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz"
-SRC_URI[md5sum] = "064c2627397e6641c52de09a26951112"
-SRC_URI[sha256sum] = "f1cda2789e6a13a92aefc012a76e5a7cc57a1b402d66f71df8719ee314b67699"
+SRC_URI[md5sum] = "0da9e11dcb0ac0149967b0c4d3ed9cfd"
+SRC_URI[sha256sum] = "a041b06907c956dd1c77836cccf4d392af29b9fe09c8ad18449a6da707b5ba2d"
inherit autotools pkgconfig python3native
diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch
deleted file mode 100644
index 41e64d7..0000000
--- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 76c23503ed1002d3aad0118795006fe2128006ae Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Sat, 21 Mar 2020 22:13:57 +0800
-Subject: [PATCH] generate-version-script: Don't hard-code the path of python3
-
-Python can be installed in different directories on different operating
-systems, so we can't hard-code the path of it. Instead, use meson to
-find it to avoid 'no such file or directory' error on the bad path.
-
-Upstream-Status: Backport [https://github.com/hughsie/libgusb/pull/36]
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- contrib/generate-version-script.py | 1 -
- gusb/meson.build | 4 ++++
- 2 files changed, 4 insertions(+), 1 deletion(-)
- mode change 100755 => 100644 contrib/generate-version-script.py
-
-diff --git a/contrib/generate-version-script.py b/contrib/generate-version-script.py
-old mode 100755
-new mode 100644
-index c4ee238ab0ab..0fe2b24e47e3
---- a/contrib/generate-version-script.py
-+++ b/contrib/generate-version-script.py
-@@ -1,4 +1,3 @@
--#!/usr/bin/python3
- # pylint: disable=invalid-name,missing-docstring
- #
- # Copyright (C) 2017 Richard Hughes <richard@hughsie.com>
-diff --git a/gusb/meson.build b/gusb/meson.build
-index 10a6f537a642..28ca3c63e595 100644
---- a/gusb/meson.build
-+++ b/gusb/meson.build
-@@ -142,6 +142,9 @@ libgusb_girtarget = gnome.generate_gir(gusb,
- libgusb_gir = libgusb_girtarget[0]
- libgusb_typelib = libgusb_girtarget[1]
-
-+pymod = import('python')
-+py_installation = pymod.find_installation('python3')
-+
- # Verify the map file is correct -- note we can't actually use the generated
- # file for two reasons:
- #
-@@ -154,6 +157,7 @@ mapfile_target = custom_target('gusb_mapfile',
- input: libgusb_girtarget[0],
- output: 'libgusb.ver',
- command: [
-+ py_installation,
- join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'),
- 'LIBGUSB',
- '@INPUT@',
---
-2.17.1
-
diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.5.bb
similarity index 69%
rename from meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb
rename to meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.5.bb
index bd88c8e..c4b0ff3 100644
--- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb
+++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.5.bb
@@ -7,7 +7,6 @@
inherit meson gobject-introspection gtk-doc gettext vala
SRC_URI = "git://github.com/hughsie/libgusb.git \
- file://0001-generate-version-script-Don-t-hard-code-the-path-of-.patch \
"
-SRCREV = "377917fed85476d615f72279d0c97bc391d0f191"
+SRCREV = "1f712812327091c42c62b1ab1148d738d1a22b51"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-support/libharu/libharu/0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch b/meta-openembedded/meta-oe/recipes-support/libharu/libharu/0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch
new file mode 100644
index 0000000..0947de1
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/libharu/libharu/0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch
@@ -0,0 +1,30 @@
+From 9341ac4f6ae38efe95dfd188105a9ea30941ccf6 Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@cn.fujitsu.com>
+Date: Wed, 18 Nov 2020 23:09:51 +0900
+Subject: [PATCH] Install static lib into var-libdir rather than hardcod lib.
+
+Lei Maohui <leimaohui@cn.fujitsu.com>
+
+Upstream-Status: Pending
+---
+ src/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 249916c..fb06ea3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -75,8 +75,8 @@ if(LIBHPDF_STATIC)
+ target_link_libraries(${LIBHPDF_NAME_STATIC} ${ADDITIONAL_LIBRARIES})
+ install(
+ TARGETS ${LIBHPDF_NAME_STATIC}
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin
+ )
+ if(WIN32 AND NOT CYGWIN)
+--
+2.25.1
+
diff --git a/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb
index 2d1a37c..8d30c1f 100644
--- a/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb
+++ b/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb
@@ -8,6 +8,7 @@
SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3 \
file://libharu-RELEASE_2_3_0_cmake.patch \
+ file://0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch \
"
SRCREV = "4ae1d5f4c84459f130bf1b1ef4c5c330af8eca5d"
diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest
index 2a7922f..c213b32 100644
--- a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest
+++ b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest
@@ -1,7 +1,8 @@
#!/bin/sh
ptestdir=$(dirname "$(readlink -f "$0")")
-for test in $(ls $ptestdir/tests)
+cd tests
+for test in $(ls)
do
- ./test-driver --test-name $test --log-file $test.log --trs-file $test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./tests/$test
+ ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test
done
diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb
index a1d8561..38f1626 100644
--- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb
+++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb
@@ -28,7 +28,9 @@
BBCLASSEXTEND = "native nativesdk"
-RDEPENDS_${PN}-ptest = "bash"
+# required for ptest on documentation
+RDEPENDS_${PN}-ptest = "man-db"
+RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-en-us"
do_compile_ptest() {
sed -i "/\$(MAKE) \$(AM_MAKEFLAGS) check-TESTS/d" tests/Makefile
@@ -40,4 +42,6 @@
install -m 0755 ${B}/tests/.libs/simple ${D}${PTEST_PATH}/tests/
install -m 0755 ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/
install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/
+ mkdir -p ${D}${PTEST_PATH}/docs
+ cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/
}
diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch
new file mode 100644
index 0000000..01c5ccd
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch
@@ -0,0 +1,35 @@
+From 0a9b12eda0f6e487398dad004121bdd1be792428 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 14 Nov 2020 16:18:44 -0800
+Subject: [PATCH] test: Fix build on 32bit architectures with 6bit time_t
+
+It uses SYS_futex, which it expects from system C library.
+in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex)
+rv32 is using 64bit time_t from get go unlike other 32bit architectures
+in glibc, therefore it wont have NR_futex defined but just NR_futex_time64
+this aliases it to NR_futex so that SYS_futex is then defined for rv32
+
+Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/237]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ test/35fa71a030ca-test.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/35fa71a030ca-test.c b/test/35fa71a030ca-test.c
+index 4ecf211..7f2124b 100644
+--- a/test/35fa71a030ca-test.c
++++ b/test/35fa71a030ca-test.c
+@@ -24,6 +24,10 @@
+
+ #include <linux/futex.h>
+
++#if !defined(SYS_futex) && defined(SYS_futex_time64)
++# define SYS_futex SYS_futex_time64
++#endif
++
+ static void sleep_ms(uint64_t ms)
+ {
+ usleep(ms * 1000);
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb
index 3a1eaef..e122a90 100644
--- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb
+++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb
@@ -9,7 +9,9 @@
LICENSE = "LGPLv2.1 | MIT"
LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=d51b5805e2a675685e6a66ca50904cf9"
-SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \
+ file://0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch \
+ "
SRCREV = "45f0735219a615ae848033c47c7e2d85d101d43e"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc
index 3c6c7ed..11ee7ca 100644
--- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -7,7 +7,7 @@
DEPENDS += "libaio"
-SRC_URI = "git://sourceware.org/git/lvm2.git \
+SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
file://lvm.conf \
file://0001-implement-libc-specific-reopen_stream.patch \
file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \
diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.59.bb
similarity index 98%
rename from meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb
rename to meta-openembedded/meta-oe/recipes-support/nss/nss_3.59.bb
index 5d9318a..eb9162b 100644
--- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb
+++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.59.bb
@@ -32,7 +32,7 @@
file://nss-fix-nsinstall-build.patch \
file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
"
-SRC_URI[sha256sum] = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382"
+SRC_URI[sha256sum] = "e6298174caa8527beacdc2858f77ed098d7047c1792846040e27e420fed0ce24"
UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch
deleted file mode 100644
index 78ffb22..0000000
--- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-rename test target as run-test
-
-Upstream-Statue: Pending
-
-test target not only compile the test files, but also run them, which is
-not suitable for cross-compile environment, so rename it as run-test.
-
-and define test target to compile the test files.
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
----
- Makefile.am | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b6db339..de176c4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -124,7 +124,9 @@ regress2: $(check_PROGRAMS)
- test_numademo: numademo
- ./numademo -t -e 10M
-
--test: all $(check_PROGRAMS) regress1 regress2 test_numademo
-+test: all $(check_PROGRAMS)
-+
-+run-test: all $(check_PROGRAMS) regress1 regress2 test_numademo
-
- TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir;
-
---
-1.9.1
-
diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch
deleted file mode 100644
index 9812ecc..0000000
--- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 59fd750a84bbe5874dec936d2bee9ef11a1b6505 Mon Sep 17 00:00:00 2001
-From: Li xin <lixin.fnst@cn.fujitsu.com>
-Date: Tue, 21 Jul 2015 02:01:22 +0900
-Subject: [PATCH] Fix the test output format
-
-Upstream-Status: Pending
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
-Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
----
- test/regress | 6 +++---
- test/regress2 | 11 +++++------
- 2 files changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/test/regress b/test/regress
-index 2ce1705..d086a47 100755
---- a/test/regress
-+++ b/test/regress
-@@ -74,6 +74,7 @@ probe_hardware()
- if [ $numnodes -lt 2 ] ; then
- echo "need at least two nodes with at least $NEEDPAGES each of"
- echo "free memory for mempolicy regression tests"
-+ echo "FAIL: numa regress"
- exit 77 # Skip test
- fi
- }
-@@ -207,10 +208,9 @@ main()
- rm A B
-
- if [ "$EXIT" = 0 ] ; then
-- echo '========SUCCESS'
-+ echo 'PASS: numactl regress'
- else
-- echo '========FAILURE'
-- exit 1
-+ echo 'FAIL: numactl regress'
- fi
- }
-
-diff --git a/test/regress2 b/test/regress2
-index aa6ea41..450c510 100755
---- a/test/regress2
-+++ b/test/regress2
-@@ -9,12 +9,11 @@ testdir=`dirname "$0"`
- export PATH=${builddir}:$PATH
-
- T() {
-- echo "$@"
-- if ! $VALGRIND "$@" ; then
-- echo $1 FAILED!!!!
-- exit 1
-- fi
-- echo
-+ if ! $VALGRIND "$@" 2>&1 1>/dev/null; then
-+ echo "FAIL: $1"
-+ else
-+ echo "PASS: $1"
-+ fi
- }
-
- # still broken
---
-1.8.4.2
-
diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Makefile b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Makefile
deleted file mode 100644
index 9a5134c..0000000
--- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-.PHONY: regress1 regress2
-
-regress1:
- cd test ; ./regress
-
-regress2:
- cd test ; ./regress2
diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/run-ptest b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/run-ptest
deleted file mode 100755
index 215f7c2..0000000
--- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/run-ptest
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-make regress1
-make regress2
-if numademo -t -e 10M; then
- echo "PASS: numademo"
-else
- echo "FAIL: numademo"
-fi
-
diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb
deleted file mode 100644
index 504fe03..0000000
--- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY = "Development package for building Applications that use numa"
-HOMEPAGE = "http://oss.sgi.com/projects/libnuma/"
-DESCRIPTION = "Simple NUMA policy support. It consists of a numactl program \
-to run other programs with a specific NUMA policy and a libnuma to do \
-allocations with NUMA policy in applications."
-LICENSE = "GPL-2.0 & LGPL-2.1"
-SECTION = "apps"
-
-inherit autotools-brokensep ptest
-
-LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb"
-
-SRCREV = "dd6de072c92c892a86e18c0fd0dfa1ba57a9a05d"
-PV = "2.0.14+git${SRCPV}"
-
-SRC_URI = "git://github.com/numactl/numactl \
- file://Fix-the-test-output-format.patch \
- file://Makefile \
- file://run-ptest \
- file://0001-define-run-test-target.patch \
-"
-
-S = "${WORKDIR}/git"
-
-# ARM does not currently support NUMA
-COMPATIBLE_HOST = "^((?!arm).*)$"
-
-LDFLAGS_append_riscv64 = " -latomic"
-LDFLAGS_append_riscv32 = " -latomic"
-
-do_install() {
- oe_runmake DESTDIR=${D} prefix=${D}/usr install
- #remove the empty man2 directory
- rm -r ${D}${mandir}/man2
-}
-
-do_compile_ptest() {
- oe_runmake test
-}
-
-do_install_ptest() {
- #install tests binaries
- local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \
- mynode nodemap node-parse pagesize prefered randmap realloc_test \
- tbitmap tshared"
-
- [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test
- for i in $test_binaries; do
- install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test
- done
-
- local test_scripts="checktopology checkaffinity printcpu regress regress2 \
- shmtest runltp bind_range"
- for i in $test_scripts; do
- install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test
- done
-
- install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/
- install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/
-}
-
-RDEPENDS_${PN}-ptest = "bash"
diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch
new file mode 100644
index 0000000..0226803
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch
@@ -0,0 +1,28 @@
+From 114af1ca23ff9bf2e521b2969e343e74cdd8eac1 Mon Sep 17 00:00:00 2001
+From: Jose Quaresma <quaresma.jose@gmail.com>
+Date: Sun, 1 Nov 2020 12:29:56 +0000
+Subject: [PATCH] samples: cmake: digits needs opencv_dnn module to build
+
+Intrudeced in commit 397ba2d9aafb5312e777ce2f886d7b568109e931:
+add OpenCV sample for digit and text recongnition, and provide multiple OCR models.
+https://github.com/opencv/opencv/commit/397ba2d9aafb5312e777ce2f886d7b568109e931
+
+Upstream-Status: Backport [https://github.com/opencv/opencv/commit/79a82013ad2af04269891ce15281c9fdc31d3f66]
+
+Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
+---
+ samples/cpp/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
+index 617629df2e..14ab6141df 100644
+--- a/samples/cpp/CMakeLists.txt
++++ b/samples/cpp/CMakeLists.txt
+@@ -14,6 +14,7 @@ set(OPENCV_CPP_SAMPLES_REQUIRED_DEPS
+ opencv_features2d
+ opencv_calib3d
+ opencv_stitching
++ opencv_dnn
+ ${OPENCV_MODULES_PUBLIC}
+ ${OpenCV_LIB_COMPONENTS})
+ ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.4.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.0.bb
similarity index 96%
rename from meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.4.0.bb
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.0.bb
index c83186d..b223334 100644
--- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.4.0.bb
+++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.0.bb
@@ -2,16 +2,16 @@
HOMEPAGE = "http://opencv.org/"
SECTION = "libs"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
ARM_INSTRUCTION_SET_armv4 = "arm"
ARM_INSTRUCTION_SET_armv5 = "arm"
DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
-SRCREV_opencv = "c3bb57afeaf030f10939204d48d7c2a3842f4293"
-SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b"
+SRCREV_opencv = "d5fd2f0155ffad366f9ac912dfd6d189a7a6a98e"
+SRCREV_contrib = "37315babf9984a5b6aa981644a20dd8df1a5ff02"
SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274"
SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
@@ -49,6 +49,7 @@
file://0001-Dont-use-isystem.patch \
file://download.patch \
file://0001-Make-ts-module-external.patch \
+ file://0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch \
"
SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib"
diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.51.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb
similarity index 98%
rename from meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.51.bb
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb
index d2c5746..4c0f179 100644
--- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.51.bb
+++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb
@@ -25,8 +25,8 @@
file://remove-user-host-pwd-from-version.patch \
"
-SRC_URI[md5sum] = "0d2025896cf1c17af7304ecc57ec9531"
-SRC_URI[sha256sum] = "f490775ea4c6506b7210ee55a102c8f4aacfe9d1c8eaa633c7316d33a714be62"
+SRC_URI[md5sum] = "82a7dcf7aeaf95fdad16017c0ed9983a"
+SRC_URI[sha256sum] = "25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0"
DEPENDS = "util-linux groff-native"
diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch
new file mode 100644
index 0000000..e6b673b
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch
@@ -0,0 +1,47 @@
+From 98d277655e411f56fba705c0bf2efc6562c23807 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 15 Nov 2020 11:37:33 -0800
+Subject: [PATCH] Add support of arch riscv32
+
+Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/3138]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Foundation/include/Poco/Platform.h | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h
+index 799db417e..b8506a248 100644
+--- a/Foundation/include/Poco/Platform.h
++++ b/Foundation/include/Poco/Platform.h
+@@ -135,6 +135,7 @@
+ #define POCO_ARCH_AARCH64 0x0f
+ #define POCO_ARCH_ARM64 0x0f // same as POCO_ARCH_AARCH64
+ #define POCO_ARCH_RISCV64 0x10
++#define POCO_ARCH_RISCV32 0x11
+
+
+ #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA)
+@@ -225,12 +226,16 @@
+ #elif defined(__AARCH64EB__)
+ #define POCO_ARCH POCO_ARCH_AARCH64
+ #define POCO_ARCH_BIG_ENDIAN 1
+-#elif defined(__riscv) && (__riscv_xlen == 64)
+- #define POCO_ARCH POCO_ARCH_RISCV64
+- #define POCO_ARCH_LITTLE_ENDIAN 1
++#elif defined(__riscv)
++ #if (__riscv_xlen == 64)
++ #define POCO_ARCH POCO_ARCH_RISCV64
++ #define POCO_ARCH_LITTLE_ENDIAN 1
++ #elif(__riscv_xlen == 32)
++ #define POCO_ARCH POCO_ARCH_RISCV32
++ #define POCO_ARCH_LITTLE_ENDIAN 1
++ #endif
+ #endif
+
+-
+ #if defined(__clang__)
+ #define POCO_COMPILER_CLANG
+ #elif defined(_MSC_VER)
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch
deleted file mode 100644
index f4a358f..0000000
--- a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fa079dfc5e1d22ea35762bf4c5b09999bdc5e731 Mon Sep 17 00:00:00 2001
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Wed, 22 Aug 2018 21:42:09 +0200
-Subject: [PATCH] Don't try to install non existing Encodings/testsuite/data
-
-Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/2437]
----
- Encodings/testsuite/CMakeLists.txt | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/Encodings/testsuite/CMakeLists.txt b/Encodings/testsuite/CMakeLists.txt
-index 7508e5522..79495ae02 100644
---- a/Encodings/testsuite/CMakeLists.txt
-+++ b/Encodings/testsuite/CMakeLists.txt
-@@ -19,12 +19,9 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE
- add_executable( ${TESTUNIT} ${TEST_SRCS} )
- if(ANDROID)
- add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-- COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/${TESTUNIT} -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake)
-+ COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Encodings-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake)
- else()
- add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all)
-- # The test is run in the build directory. So the test data is copied there too
-- add_custom_command(TARGET ${TESTUNIT} POST_BUILD
-- COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data )
- endif()
- #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
- target_link_libraries( ${TESTUNIT} PocoEncodings PocoFoundation CppUnit )
---
-2.18.0
-
diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch
deleted file mode 100644
index c0de32d..0000000
--- a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 589a5442a841b156a1890bc2d26e7a5103e2f672 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 1 Nov 2019 17:53:50 -0700
-Subject: [PATCH] riscv: Enable double operations when using double float abi
-
-Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/2825]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Foundation/src/utils.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h
-index 69cea1aca..ff7a5c9ce 100644
---- a/Foundation/src/utils.h
-+++ b/Foundation/src/utils.h
-@@ -63,7 +63,8 @@
- defined(__SH4__) || defined(__alpha__) || \
- defined(_MIPS_ARCH_MIPS32R2) || \
- defined(__AARCH64EL__) || \
-- defined(nios2) || defined(__nios2) || defined(__nios2__)
-+ defined(nios2) || defined(__nios2) || defined(__nios2__) || \
-+ (defined(__riscv) && defined(__riscv_float_abi_double))
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
---
-2.23.0
-
diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb
similarity index 83%
rename from meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb
rename to meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb
index fcd5219..48b31dd 100644
--- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb
+++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb
@@ -10,11 +10,10 @@
SRC_URI = " \
git://github.com/pocoproject/poco.git;branch=poco-${PV} \
- file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \
- file://0001-riscv-Enable-double-operations-when-using-double-flo.patch \
+ file://0001-Add-support-of-arch-riscv32.patch \
file://run-ptest \
"
-SRCREV = "b95393dcc3640807838e8323b4e600e54d2e8116"
+SRCREV = "a3d827d80eb7f3329c58e73eb2906cb7ba829019"
UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)"
@@ -25,16 +24,17 @@
# By default the most commonly used poco components are built
# Foundation is built anyway and doesn't need to be listed explicitly
# these don't have dependencies outside oe-core
-PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto Data DataSQLite Zip Encodings Redis"
+PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto JWT Data DataSQLite Zip Encodings Redis"
-PACKAGECONFIG[XML] = "-DENABLE_XML=ON -DEXPAT_LIBRARY:STRING=expat,-DENABLE_XML=OFF,expat"
+PACKAGECONFIG[XML] = "-DENABLE_XML=ON,-DENABLE_XML=OFF,expat"
PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF"
PACKAGECONFIG[MongoDB] = "-DENABLE_MONGODB=ON,-DENABLE_MONGODB=OFF"
PACKAGECONFIG[PDF] = "-DENABLE_PDF=ON,-DENABLE_PDF=OFF,zlib"
PACKAGECONFIG[Util] = "-DENABLE_UTIL=ON,-DENABLE_UTIL=OFF"
PACKAGECONFIG[Net] = "-DENABLE_NET=ON,-DENABLE_NET=OFF"
-PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_NETSSL=OFF,openssl"
-PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_CRYPTO=OFF,openssl"
+PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON,-DENABLE_NETSSL=OFF,openssl"
+PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON,-DENABLE_CRYPTO=OFF,openssl"
+PACKAGECONFIG[JWT] = "-DENABLE_JWT=ON,-DENABLE_JWT=OFF,openssl"
PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF"
PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3"
PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF"
@@ -53,7 +53,6 @@
PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF"
EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \
- -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \
-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}"
diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb
similarity index 80%
rename from meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb
rename to meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb
index eda3f7e..46e3351 100644
--- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb
+++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb
@@ -3,8 +3,8 @@
correctly render CJK and Cyrrilic."
HOMEPAGE = "https://poppler.freedesktop.org/"
LICENSE = "BSD & GPLv2 & GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4870b98343f0bbb25fa43b9d2ba59448 \
- file://COPYING.adobe;md5=63c6a8a9df204c00461fa5f163d8a663 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=96287d49ec274d9c3222b5f966c132fd \
+ file://COPYING.adobe;md5=a790726a74164c30b5de1ef93fd69e99 \
file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe \
"
@@ -18,8 +18,8 @@
${CMAP_RESOURCES_BASE}/Identity-H;name=idh \
${CMAP_RESOURCES_BASE}/Identity-V;name=idv"
-SRC_URI[md5sum] = "35cc7beba00aa174631466f06732be40"
-SRC_URI[sha256sum] = "1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012"
+SRC_URI[md5sum] = "a7f15fb2f26c60a7a92093cfdf2378d5"
+SRC_URI[sha256sum] = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30"
SRC_URI[idh.md5sum] = "009c93cf0141ab7bd6acb7eea14306cc"
SRC_URI[idh.sha256sum] = "ae702c203a82ea124e9b96590f821db6fbf8754e2c4547a9dba0e82f94739e95"
SRC_URI[idv.md5sum] = "2f32a45d43d001c26eeac6b878855fbf"
diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.11.0.bb
similarity index 95%
rename from meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb
rename to meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.11.0.bb
index 0f04b88..729923d 100644
--- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb
+++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.11.0.bb
@@ -7,7 +7,7 @@
file://0001-Do-not-overwrite-all-our-build-flags.patch \
file://basename-include.patch \
"
-SRC_URI[sha256sum] = "434ecbbb539c1a75955030a1c9b24c7b58200b7f68d2e4269e29acf2f8f13336"
+SRC_URI[sha256sum] = "021557074516492375c2bb4226a413aad431159e9177f9f14dff4159d2723b14"
DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb
similarity index 83%
rename from meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb
rename to meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb
index 661673d..3363570 100644
--- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb
+++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb
@@ -9,11 +9,11 @@
DEPENDS_append_libc-musl = " libexecinfo"
LDFLAGS_append_libc-musl = " -lexecinfo"
-SRC_URI = "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \
+SRCREV = "7ebc497062de66881b71bbe7f54dabfda0129ac2"
+SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https \
"
-SRC_URI[sha256sum] = "7614d447dc588403aff2ff97b253f46c5f03a6347d024618e84490b8ab4cd87b"
-S = "${WORKDIR}/Remmina-v${PV}"
+S = "${WORKDIR}/git"
inherit cmake features_check mime-xdg
REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_git.bb b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.8.1.bb
similarity index 86%
rename from meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_git.bb
rename to meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.8.1.bb
index 96ec829..6956f5f 100644
--- a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_git.bb
+++ b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.8.1.bb
@@ -4,7 +4,7 @@
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
SRC_URI += "git://github.com/martinmoene/span-lite"
-SRCREV = "e03d1166ccc8481d993dc02aae703966301a5e6e"
+SRCREV = "937262f25fb702592cbc5c772111a73a5e3c1e07"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb
index 9f89bac..3f82734 100644
--- a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb
+++ b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb
@@ -7,7 +7,7 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/jthornber/thin-provisioning-tools \
+SRC_URI = "git://github.com/jthornber/thin-provisioning-tools;branch=main \
file://0001-do-not-strip-pdata_tools-at-do_install.patch \
file://use-sh-on-path.patch \
"
diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb
similarity index 93%
rename from meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb
rename to meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb
index 93b0d6a..803016c 100644
--- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb
+++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb
@@ -21,8 +21,8 @@
file://run-ptest \
"
-SRC_URI[md5sum] = "b66ec21e0a0ac331afb4b1bc5c9ef966"
-SRC_URI[sha256sum] = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"
+SRC_URI[md5sum] = "182f5cbdfb8ddbac535c04470c170dc3"
+SRC_URI[sha256sum] = "9b10bc52cc31e4f76162e3975e50db26b71ab49c571d810b311ca626be5a0b26"
inherit autotools-brokensep ptest pkgconfig
diff --git a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.15.bb
similarity index 80%
rename from meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb
rename to meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.15.bb
index acd4914..41c4b76 100644
--- a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb
+++ b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.15.bb
@@ -9,8 +9,8 @@
file://remove-help2man.patch \
"
-SRC_URI[md5sum] = "c7d7eec93231c6878f255978d9747a73"
-SRC_URI[sha256sum] = "7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74"
+SRC_URI[md5sum] = "05efa90dfee1821ca018b0b2ef8f50a8"
+SRC_URI[sha256sum] = "39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e"
inherit autotools pkgconfig
diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb
index 5aee5ef..e4afa43 100644
--- a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb
+++ b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb
@@ -6,17 +6,19 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRCREV = "56eb3a183fc222120f86d0c54fd033992c30135e"
+SRCREV = "a4fc3dd7705c277e3a57432895e9852ea105dac9"
+PV .= "+git${SRCPV}"
SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git \
file://run-ptest \
- file://cmocka-uintptr_t.patch \
"
S = "${WORKDIR}/git"
inherit cmake ptest
-EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}"
+EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}"
+# Use -Wl,wrap linker flag, which does not work with LTO
+LTO = ""
do_install_append () {
install -d ${D}${datadir}/${BPN}/example
@@ -27,6 +29,7 @@
install -m 0755 ${B}/example/mock/chef_wrap/waiter_test_wrap ${D}/${datadir}/${BPN}/example/mock/chef_wrap
install -m 0755 ${B}/example/mock/uptime/uptime ${D}/${datadir}/${BPN}/example/mock/uptime
install -m 0755 ${B}/example/mock/uptime/test_uptime ${D}/${datadir}/${BPN}/example/mock/uptime
+ install -m 0644 ${B}/example/mock/uptime/libproc_uptime.so ${D}/${datadir}/${BPN}/example/mock/libproc_uptime.so
}
do_install_ptest () {
@@ -37,3 +40,4 @@
PACKAGE_BEFORE_PN += "${PN}-examples"
FILES_${PN}-examples = "${datadir}/${BPN}/example"
+INSANE_SKIP_${PN}-examples = "libdir"
diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch b/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch
deleted file mode 100644
index 8d3b73b..0000000
--- a/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5bd7b5d04435bd593349825973ce32290f5f604d Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 25 Jul 2018 09:55:25 +0800
-Subject: [PATCH] samba: cmocka.h: fix musl libc conflicting types error
-
-Fix build on qemumips64(el)
-
-taken from:
-[PATCH] libldb: fix musl libc conflicting types error
-
-/third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t'
- typedef unsigned int uintptr_t;
- ^~~~~~~~~
-use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined
-
-Upstream-Status: Pending
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-
-Taken from [PATCH] samba: cmocka.h: fix musl libc conflicting types error
-https://git.openembedded.org/meta-openembedded/commit/meta-networking/recipes-connectivity/samba?id=b758150d30a5fbdc47c465d0e9dca3a7e6d71f3c
-
-Signed-off-by: Armin Kuster <akuster808@gmail.com>
-
-This fix is not in cmocka, so pending pending??
-
-
-Index: git/include/cmocka.h
-===================================================================
---- git.orig/include/cmocka.h
-+++ git/include/cmocka.h
-@@ -116,7 +116,7 @@ typedef uintmax_t LargestIntegralType;
- ((LargestIntegralType)(value))
-
- /* Smallest integral type capable of holding a pointer. */
--#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
-+#if !defined(__DEFINED_uintptr_t)
- # if defined(_WIN32)
- /* WIN32 is an ILP32 platform */
- typedef unsigned int uintptr_t;
-@@ -140,9 +140,8 @@ typedef uintmax_t LargestIntegralType;
- # endif /* __WORDSIZE */
- # endif /* _WIN32 */
-
--# define _UINTPTR_T
--# define _UINTPTR_T_DEFINED
--#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
-+# define __DEFINED_uintptr_t
-+#endif /* !defined(__DEFINED_uintptr_t) */
-
- /* Perform an unsigned cast to uintptr_t. */
- #define cast_to_pointer_integral_type(value) \
diff --git a/meta-openembedded/meta-perl/conf/layer.conf b/meta-openembedded/meta-perl/conf/layer.conf
index f97527c..2209d3d 100644
--- a/meta-openembedded/meta-perl/conf/layer.conf
+++ b/meta-openembedded/meta-perl/conf/layer.conf
@@ -15,4 +15,4 @@
LAYERDEPENDS_perl-layer = "core openembedded-layer"
-LAYERSERIES_COMPAT_perl-layer = "gatesgarth"
+LAYERSERIES_COMPAT_perl-layer = "gatesgarth hardknott"
diff --git a/meta-openembedded/meta-python/conf/layer.conf b/meta-openembedded/meta-python/conf/layer.conf
index 47ab154..321d0da 100644
--- a/meta-openembedded/meta-python/conf/layer.conf
+++ b/meta-openembedded/meta-python/conf/layer.conf
@@ -14,6 +14,6 @@
LAYERDEPENDS_meta-python = "core (>= 12) openembedded-layer"
-LAYERSERIES_COMPAT_meta-python = "gatesgarth"
+LAYERSERIES_COMPAT_meta-python = "gatesgarth hardknott"
LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.17.bb b/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.17.bb
deleted file mode 100644
index 14eef96..0000000
--- a/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.17.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "A gevent based messagpack rpc library"
-DESCRIPTION = "mprpc is a fast implementation of the messagepack rpc protocol for python. \
-It is based on gevent for handling connections and enabling concurrent connections."
-HOMEPAGE = "https://github.com/studio-ousia/mprpc"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4ba825394aec026b5f94edca44426859"
-DEPENDS += "${PYTHON_PN}-gevent"
-RDEPENDS_${PN} += "${PYTHON_PN}-gevent ${PYTHON_PN}-msgpack ${PYTHON_PN}-gsocketpool"
-
-SRC_URI[md5sum] = "8d97961051422f3de315613434982d3b"
-SRC_URI[sha256sum] = "3589fd127482e291b1ec314d6f0e55cc13311c12932ace356d6178ea1ca28f6a"
-
-inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index 0f032e6..024503d 100644
--- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -425,6 +425,13 @@
python3-pycurl \
gyp \
python3-jsonref \
+ python3-transitions \
+ python3-dill \
+ python3-cerberus \
+ python3-cvxopt \
+ python3-sortedcontainers \
+ python3-hypothesis \
+ python3-jsonpath-rw \
"
RDEPENDS_packagegroup-meta-python3-extended = "\
@@ -444,7 +451,6 @@
python3-h2 \
python3-hpack \
python3-hyperframe \
- python3-mprpc \
python3-priority \
python3-pyconnman \
python3-pyro4 \
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools.inc
index 1a15c48..6675f90 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools.inc
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools.inc
@@ -2,7 +2,7 @@
HOMEPAGE = "http://www.grpc.io/"
SECTION = "devel/python"
-DEPENDS_append = "${PYTHON_PN}-grpcio"
+DEPENDS_append = " ${PYTHON_PN}-grpcio"
RDEPENDS_${PN} = "${PYTHON_PN}-grpcio"
LICENSE = "Apache-2.0"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto.inc
index 81c8164..797a035 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto.inc
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto.inc
@@ -25,7 +25,6 @@
${PYTHON_PN}-netserver \
${PYTHON_PN}-numbers \
${PYTHON_PN}-smtpd \
- ${PYTHON_PN}-typing \
${PYTHON_PN}-xmlrpc \
"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_0.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_0.6.0.bb
similarity index 71%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_0.5.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_0.6.0.bb
index 0559c01..89157b5 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_0.5.0.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_0.6.0.bb
@@ -4,8 +4,8 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
-SRC_URI[md5sum] = "2243eff06072115e8afe8907677ca51d"
-SRC_URI[sha256sum] = "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af"
+SRC_URI[md5sum] = "3b7ba03babd3d3a6101524469358843e"
+SRC_URI[sha256sum] = "e0281b157d3d5d59d803e3f4557dcc9a3dff28a4dd4829a9ff478adae50ca092"
PYPI_PACKAGE = "aiofiles"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.2.bb
similarity index 76%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.2.bb
index 8b5b1dd..6cd5a4c 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.1.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.2.bb
@@ -4,8 +4,8 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3bf3d48554bdca1ea7fdb48de378c2ca"
-SRC_URI[md5sum] = "ed78633cc420b29d3b61c7d877dc0901"
-SRC_URI[sha256sum] = "04f9d70f6c4d089be5068d7df6281e638f6820d4f1b1ec3dc012b0b43fa997d2"
+SRC_URI[md5sum] = "dcf770341241aa09340653a1562ca816"
+SRC_URI[sha256sum] = "c6da1af59841e6d43255d386a2c4bfb59c0a3b262bdb24325cc969d211be6070"
PYPI_PACKAGE = "aiohttp"
inherit setuptools3 pypi
@@ -16,6 +16,5 @@
${PYTHON_PN}-idna-ssl \
${PYTHON_PN}-misc \
${PYTHON_PN}-multidict \
- ${PYTHON_PN}-typing \
${PYTHON_PN}-yarl \
"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.6.0.bb
similarity index 66%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.5.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.6.0.bb
index 8e586ea..d31448d 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.5.2.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.6.0.bb
@@ -5,9 +5,9 @@
PYPI_PACKAGE = "ansi2html"
-SRC_URI[md5sum] = "52d6085ad1c5970082ea5305a26af981"
-SRC_URI[sha256sum] = "96ae85ae7b26b7da674d87de2870ba4d1964bca733ae4614587080b6358c3ba9"
+SRC_URI[sha256sum] = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"
inherit pypi setuptools3
+DEPENDS += "${PYTHON_PN}-setuptools-scm-native ${PYTHON_PN}-toml-native"
RDEPENDS_${PN} = "${PYTHON_PN}-six"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb
index a26835b..9f152a1 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb
@@ -9,7 +9,6 @@
DEPENDS += "python3-setuptools-scm-native"
RDEPENDS_${PN} += "\
- python3-typing \
python3-dynamic-dispatch \
python3-typeguard \
"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_1.9.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_1.10.1.bb
similarity index 66%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_1.9.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_1.10.1.bb
index 802a5b2..38e2662 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_1.9.2.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_1.10.1.bb
@@ -3,13 +3,15 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=33b8d1ba459a2fa4d801acfd1d1b7ceb"
-SRC_URI[md5sum] = "39667a626217c670bc634444be6e904a"
-SRC_URI[sha256sum] = "948ce06163a48a72c97f4fe79ad3d1c1330b6fec4f22ece182fb60ef60bd022b"
+SRC_URI[sha256sum] = "920d12cc762edb2eb56daae64a14c93e43dc181b481c88fc79314c0df6ee639e"
PYPI_PACKAGE = "Arpeggio"
inherit pypi setuptools3
# setup.py of Arpeggio needs this.
-DEPENDS += "${PYTHON_PN}-pytest-runner-native"
+DEPENDS += "\
+ ${PYTHON_PN}-pytest-runner-native \
+ ${PYTHON_PN}-wheel-native \
+"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites/run-ptest
deleted file mode 100644
index b63c4de..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites_1.4.0.bb
deleted file mode 100644
index 7edd410..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites_1.4.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Powerful Python library for atomic file writes"
-HOMEPAGE = "https://github.com/untitaker/python-atomicwrites"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=91cc36cfafeefb7863673bcfcb1d4da4"
-
-SRC_URI[md5sum] = "b5cc15c8f9f180a48665f9aacf91d817"
-SRC_URI[sha256sum] = "ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"
-
-inherit pypi setuptools3 ptest
-
-SRC_URI += " \
- file://run-ptest \
-"
-
-RDEPENDS_${PN}-ptest += " \
- ${PYTHON_PN}-pytest \
- ${PYTHON_PN}-unixadmin \
-"
-
-do_install_ptest() {
- install -d ${D}${PTEST_PATH}/tests
- cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
-
-RDEPENDS_${PN} = "${PYTHON_PN}-misc"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_20.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_20.2.0.bb
deleted file mode 100644
index c2a5b90..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_20.2.0.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Classes Without Boilerplate"
-HOMEPAGE = "http://www.attrs.org/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d4ab25949a73fe7d4fdee93bcbdbf8ff"
-
-SRC_URI[sha256sum] = "26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594"
-SRC_URI[md5sum] = "7be95e1b35e9385d71a0017a48217efc"
-
-inherit pypi setuptools3
-
-RDEPENDS_${PN}_class-target += " \
- ${PYTHON_PN}-crypt \
- ${PYTHON_PN}-ctypes \
-"
-RDEPENDS_${PN}_class-nativesdk += " \
- ${PYTHON_PN}-crypt \
- ${PYTHON_PN}-ctypes \
-"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.1.bb
similarity index 68%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.1.bb
index b085cf7..f54d54f 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.0.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.1.bb
@@ -3,8 +3,8 @@
LICENSE = "PSF"
LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d"
-SRC_URI[md5sum] = "08ddac722b139c1544087c4953a6335b"
-SRC_URI[sha256sum] = "ba157ddebddc723fe021fc80595b3c70924d69ee58286b62bfca21da48edfc9d"
+SRC_URI[md5sum] = "a082075dbae478fb53c69e25cc7f9cd6"
+SRC_URI[sha256sum] = "ab85b38365dd9956264226b30dababa02161ed49bb36c7ee82cc6545e07b1599"
inherit setuptools3 pypi
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.1.bb
similarity index 70%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.1.bb
index a253804..49b3197 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.0.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.1.bb
@@ -3,8 +3,7 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd"
-SRC_URI[md5sum] = "8eaf853c95e10ca4b6bca2fe5ff307c6"
-SRC_URI[sha256sum] = "2b13f2c3e76b49e8cd854f7a1da590bb73ecbc6cbfacc2d479eacf2b88282d5d"
+SRC_URI[sha256sum] = "4e7b8769c0f09fee403d0a5f637f8b575b191a79a92e140811aa109ce7461f0c"
PYPI_PACKAGE = "bitstruct"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.5.0.bb
similarity index 64%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.3.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.5.0.bb
index c79e51e..cb70ed3 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.3.0.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.5.0.bb
@@ -3,8 +3,7 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd"
-SRC_URI[md5sum] = "068514ac776e03ebaa8b2d02dd16fc77"
-SRC_URI[sha256sum] = "5e3a6f679ad3dcb31142e388e052187d5fc5bd481c4fc3b2791eaa1e681cca98"
+SRC_URI[sha256sum] = "ce26ab5d54762c314bedc35b407d498b8ae11069ab4d9251f8ac83f2956438f9"
PYPI_PACKAGE = "cantools"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cerberus_1.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cerberus_1.3.2.bb
new file mode 100644
index 0000000..61a76f5
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cerberus_1.3.2.bb
@@ -0,0 +1,11 @@
+# The PyPI package uses a capital letter so we have to specify this explicitly
+PYPI_PACKAGE = "Cerberus"
+
+inherit pypi setuptools3
+
+SUMMARY = "Lightweight, extensible schema and data validation tool for Python dictionaries."
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=48f8e9432d0dac5e0e7a18211a0bacdb"
+
+SRC_URI[md5sum] = "6e648b38b468617a06745d1e8a96c848"
+SRC_URI[sha256sum] = "302e6694f206dd85cb63f13fd5025b31ab6d38c99c50c6d769f8fa0b0f299589"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.6.20.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.11.8.bb
similarity index 79%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.6.20.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.11.8.bb
index 8174201..b680fad 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.6.20.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.11.8.bb
@@ -7,8 +7,8 @@
LICENSE = "ISC"
LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1"
-SRC_URI[md5sum] = "89525ece725d674d91b0c43007d2a47e"
-SRC_URI[sha256sum] = "5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3"
+SRC_URI[md5sum] = "b25267355218d11652c707e46accd059"
+SRC_URI[sha256sum] = "f05def092c44fbf25834a51509ef6e631dc19765ab8a57b4e7ab85531f0a9cf4"
inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.4.0.bb
similarity index 75%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.11.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.4.0.bb
index 3b2aa5b..dfe493b 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.11.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.4.0.bb
@@ -5,8 +5,8 @@
DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
-SRC_URI[md5sum] = "7e3dbe0aefa331e80f515d3c41cc3b8c"
-SRC_URI[sha256sum] = "826a288ee6d9c4ec1184e64e9566c09d3b73be8f4283c1898fa4332f1daf8dbf"
+SRC_URI[md5sum] = "520afccc1d46f833d117a23fab76ed8f"
+SRC_URI[sha256sum] = "e59fa932418603af4e046a96c8985812b05af8a73bfd9d7a386cd1b02c6ab687"
inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.6.2.bb
similarity index 65%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.4.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.6.2.bb
index 4a40ef3..e98d276 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.4.0.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.6.2.bb
@@ -7,5 +7,5 @@
PYPI_PACKAGE = "colorlog"
-SRC_URI[md5sum] = "0997566a87c6fdec0baa88055adc06c3"
-SRC_URI[sha256sum] = "0272c537469ab1e63b9915535874d15b671963c9325db0c4891a2aeff97ce3d1"
+SRC_URI[md5sum] = "72441753be8ec437af9e5bb89db344e7"
+SRC_URI[sha256sum] = "54e5f153419c22afc283c130c4201db19a3dbd83221a0f4657d5ee66234a2ea4"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.35.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.36.bb
similarity index 68%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.35.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.36.bb
index 388885c..b257149 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.35.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.36.bb
@@ -4,8 +4,8 @@
LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2"
PYPI_PACKAGE = "croniter"
-SRC_URI[md5sum] = "8bb1443b90123f96ad64d7fae26df342"
-SRC_URI[sha256sum] = "b9075573d9d18fdc4c67ad6741c4bfa4b446b1b1d7f03279757244c8a75abedf"
+SRC_URI[md5sum] = "1be5dd43ca26a66b5f981e41c74fd346"
+SRC_URI[sha256sum] = "9d3098e50f7edc7480470455d42f09c501fa1bb7e2fc113526ec6e90b068f32c"
inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.2.bb
similarity index 73%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.1.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.2.bb
index 9486fe2..2e7ed81 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.1.1.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.2.bb
@@ -4,8 +4,8 @@
LICENSE = "Apache-2.0 | BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
-SRC_URI[md5sum] = "fbc43f8b155b52f9ed163d3555ea5e83"
-SRC_URI[sha256sum] = "5529c516194122fec7db1682812e2314ddff4221fdf993169118f9c0d291e2f6"
+SRC_URI[md5sum] = "20976284d12ed99e31d38814be038ac1"
+SRC_URI[sha256sum] = "785f06ffd0bbc73bdd69d0b164d72a7a7827c7c3bbf79ae9a235d7126afd98e4"
PYPI_PACKAGE = "cryptography_vectors"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cvxopt_1.2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cvxopt_1.2.5.bb
new file mode 100644
index 0000000..ef06b56
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cvxopt_1.2.5.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Convex optimization package"
+HOMEPAGE = "http://cvxopt.org"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4905701d14049b3f8e4774c290aeee21"
+
+SRC_URI = "git://github.com/cvxopt/cvxopt;protocol=https"
+
+SRCREV = "5b59d87007bf6fdea464e14875543b35255b84b2"
+
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} += "lapack suitesparse"
+DEPENDS += "lapack suitesparse"
+
+inherit setuptools3
+
+export CVXOPT_BLAS_LIB_DIR = "${STAGING_LIBDIR}"
+export CVXOPT_SUITESPARSE_LIB_DIR = "${STAGING_LIBDIR}"
+export CVXOPT_SUITESPARSE_INC_DIR = "${STAGING_INCDIR}"
+
+EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_0.7.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_1.0.0.bb
similarity index 79%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_0.7.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_1.0.0.bb
index e468391..e3691dd 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_0.7.6.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_1.0.0.bb
@@ -3,8 +3,8 @@
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3d3ed25571191e7aa3f55d0a6efe0051"
-SRC_URI[md5sum] = "78b4bf317f9b844631562abad5ce040b"
-SRC_URI[sha256sum] = "e875efd8c57c85c2d02b238239878db59ff1971f5a823457fcc69e493bf6ebfa"
+SRC_URI[md5sum] = "24a06a429597239004d47e6b93991aaf"
+SRC_URI[sha256sum] = "159cc4e01a593706a15cd4e269a0b3345edf3aef8bf9278a57dac8adf5bf1e4a"
PYPI_PACKAGE = "dateparser"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.3.bb
new file mode 100644
index 0000000..bf26ba3
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.3.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Serialize all of python"
+HOMEPAGE = "https://pypi.org/project/dill/"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=90fee9f98d11d59df3f8aa813ff9a3de"
+
+SRC_URI[md5sum] = "99c878e2e4e924f3234c0efcbcff6abf"
+SRC_URI[sha256sum] = "efb7f6cb65dba7087c1e111bb5390291ba3616741f96840bfc75792a1a9b5ded"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE_EXT = "zip"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.1.0.bb
similarity index 67%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.0.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.1.0.bb
index 7e89fa6..9aaf714 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.0.3.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.1.0.bb
@@ -3,8 +3,8 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c985b6a9269e57a1073d5f142d68eb68"
-SRC_URI[md5sum] = "86fb97b0ff87cc5f1b31654ee0d341a1"
-SRC_URI[sha256sum] = "5f4bc2018d653a1d7bbdcdecce45ea12061bf8d3b5f0323b7a5402054a285c52"
+SRC_URI[md5sum] = "9ce87661369752c9ead63243b07eaf19"
+SRC_URI[sha256sum] = "bc7928df986dbc8a8d6e34c33b0da89d668cfa65e7fcc91298a6959a35076993"
PYPI_PACKAGE = "diskcache"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.3.bb
index 2bf4875..0ed5df1 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.3.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.3.bb
@@ -12,7 +12,6 @@
DEPENDS += "python3-setuptools-scm-native"
RDEPENDS_${PN} += "\
- python3-typing \
python3-typeguard \
"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.0.0.bb
deleted file mode 100644
index b0ecb9d..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.0.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SUMMARY = "Super-fast and clean conversions to numbers."
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f797665cf3d3e0fdc0d488f5200c6f55"
-
-PYPI_PACKAGE = "fastnumbers"
-SRC_URI[sha256sum] = "93ce2f9516fbf2bbf46c85e4abef783cc569e5fbbc665352efb9cdddbae517ec"
-
-inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.1.0.bb
new file mode 100644
index 0000000..5c913ff
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.1.0.bb
@@ -0,0 +1,10 @@
+SUMMARY = "Super-fast and clean conversions to numbers."
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6a96e5ad780a0eea866ecccec4463517"
+
+PYPI_PACKAGE = "fastnumbers"
+
+SRC_URI[sha256sum] = "7cc4f96981ccd3cf212b6ea7b84ef621620b62da8b454f420aa2e81c8529e68f"
+
+inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.8.bb
similarity index 70%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.8.bb
index 2bf9d07..6219d20 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.7.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.8.bb
@@ -3,8 +3,8 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=903f1792621a3b35ee546da75d139177"
-SRC_URI[md5sum] = "9e26fec7d5b64afab63d6d82faacc208"
-SRC_URI[sha256sum] = "86b3679de400b8068dfadf871ce063a7040ed5052d30cc323aed69430888b422"
+SRC_URI[md5sum] = "8745f3b576e5247310276f0ef5c32f65"
+SRC_URI[sha256sum] = "1285c428a5faf4c6aaac1e2ccb876383b4c7e087ef34ff7edb9f549a78cdebf1"
inherit pypi setuptools3
@@ -15,7 +15,6 @@
python3-json \
python3-logging \
python3-netclient \
- python3-typing \
"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.6.bb
similarity index 76%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.5.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.6.bb
index 5e8c8a3..58f5e56 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.5.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.6.bb
@@ -6,7 +6,7 @@
DEPENDS += "pkgconfig icu"
PYPI_PACKAGE = "PyICU"
-SRC_URI[sha256sum] = "a120b68c53f769f37bfb70b7e84ca12c3f4ab1e4df43e87a02dff05ae472cdbc"
+SRC_URI[sha256sum] = "a9a5bf6833360f8f69e9375b91c1a7dd6e0c9157a42aee5bb7d6891804d96371"
SRC_URI += "file://fix_host_include.patch"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_2.0.0.bb
deleted file mode 100644
index 325a41c..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_2.0.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Read metadata from Python packages"
-HOMEPAGE = "https://pypi.org/project/importlib-metadata/"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e88ae122f3925d8bde8319060f2ddb8e"
-
-inherit pypi setuptools3
-
-SRC_URI = "https://files.pythonhosted.org/packages/56/1f/74c3e29389d34feea2d62ba3de1169efea2566eb22e9546d379756860525/importlib_metadata-2.0.0.tar.gz"
-S = "${WORKDIR}/importlib_metadata-${PV}"
-SRC_URI[md5sum] = "3dd91821c930a3c3633e99a7025aa9c2"
-SRC_URI[sha256sum] = "77a540690e24b0305878c37ffd421785a6f7e53c8b5720d211b211de8d0e95da"
-
-DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
-RDEPENDS_${PN} += "${PYTHON_PN}-zipp ${PYTHON_PN}-pathlib2"
-RDEPENDS_${PN}_append_class-target = " python3-misc"
-RDEPENDS_${PN}_append_class-nativesdk = " python3-misc"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-iniconfig_1.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-iniconfig_1.1.1.bb
deleted file mode 100644
index af4291b..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-iniconfig_1.1.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SUMMARY = "A small and simple INI-file parser module"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9"
-
-SRC_URI[md5sum] = "0b7f3be87481211c183eae095bcea6f1"
-SRC_URI[sha256sum] = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"
-
-inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.18.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.19.0.bb
similarity index 83%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.18.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.19.0.bb
index 8ee9216..d3ce9f5 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.18.1.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.19.0.bb
@@ -6,8 +6,8 @@
PYPI_PACKAGE = "ipython"
-SRC_URI[md5sum] = "f2db1158dc40d70a31b6bbef86e74789"
-SRC_URI[sha256sum] = "a331e78086001931de9424940699691ad49dfb457cea31f5471eae7b78222d5e"
+SRC_URI[md5sum] = "33bdc8287c827aae23699751b0ed3f7a"
+SRC_URI[sha256sum] = "cbb2ef3d5961d44e6a963b9817d4ea4e1fa2eb589c371a470fed14d8d40cbd6a"
RDEPENDS_${PN} = "\
${PYTHON_PN}-setuptools \
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend
index 91814e6..9fe3584 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend
@@ -1,2 +1,13 @@
# Main recipe was moved to oe-core, but with ptest disabled
inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)}
+
+do_install_ptest() {
+ install -d ${D}${PTEST_PATH}/tests
+ cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
+
+RDEPENDS_${PN}-ptest += " \
+ ${PYTHON_PN}-pytest \
+ ${PYTHON_PN}-toml \
+ ${PYTHON_PN}-unixadmin \
+"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb
new file mode 100644
index 0000000..54e1b64
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A robust and significantly extended implementation of JSONPath for Python"
+HOMEPAGE = "https://github.com/kennknowles/python-jsonpath-rw"
+SECTION = "devel/python"
+LICENSE = "BSD+"
+LIC_FILES_CHKSUM = "file://README.rst;md5=02384665f821c394981e0dd1faec9a7d"
+
+SRC_URI[md5sum] = "3a807e05c2c12158fc6bb0a402fd5778"
+SRC_URI[sha256sum] = "05c471281c45ae113f6103d1268ec7a4831a2e96aa80de45edc89b11fac4fbec"
+
+inherit pypi setuptools3
+
+RDEPENDS_${PN} += " python3-decorator"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.3.bb
index 98db230..75a0926 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.3.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.3.bb
@@ -17,7 +17,6 @@
python3-logging \
python3-netclient \
python3-pkgutil \
- python3-typing \
"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.1.bb
similarity index 73%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.2.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.1.bb
index 94db611..be60dc2 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.2.0.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.1.bb
@@ -3,8 +3,8 @@
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://setup.py;endline=7;md5=e54bd74bd9d0a84ae3f8f6d21ada0ab4"
-SRC_URI[md5sum] = "9f53fabb361c04d76c5afc688652c814"
-SRC_URI[sha256sum] = "247800260cd38160c362d211dcaf4ed0f7816afb5efe56544748b21d6ad6d17f"
+SRC_URI[md5sum] = "81012578317ddcfa3daed806142f8fed"
+SRC_URI[sha256sum] = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248"
inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.53.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.54.bb
similarity index 79%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.53.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.54.bb
index 27b690f..b9b4069 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.53.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.54.bb
@@ -6,8 +6,8 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-SRC_URI[md5sum] = "d8f99adfb184f9def22539310f97ce80"
-SRC_URI[sha256sum] = "fb17fd4d8e491c79159f81aa06ebacb18673fce59dac96f4e9d2d2db27a2e374"
+SRC_URI[md5sum] = "bf2db4302dbed534ff322612f5f5a16e"
+SRC_URI[sha256sum] = "2a6298267586fcade84ce977736fc35102ef95d68975bc90ceaa06117d42d5a6"
inherit pypi setuptools3 python3native
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.17.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.0.1.bb
similarity index 75%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.17.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.0.1.bb
index 8301d7f..fad7432 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.17.3.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.0.1.bb
@@ -6,8 +6,7 @@
inherit pypi setuptools3
-SRC_URI[md5sum] = "c13303a123c32c1a8dc5bc089a920822"
-SRC_URI[sha256sum] = "1c928ad8e42af5fd395260176f89eb68a8af61911971f94124fabc9c6b550689"
+SRC_URI[sha256sum] = "a0bc18c03cfb293c9c1b1d8883c2ec7c29d167e4af99f795b5698c8a864332df"
CLEANBROKEN = "1"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.8.1.bb
similarity index 76%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.8.1.bb
index ae14aff..329cdb9 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.6.0.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.8.1.bb
@@ -8,8 +8,7 @@
inherit pypi setuptools3
-SRC_URI[md5sum] = "ff45a3067658434339da2586a97e526b"
-SRC_URI[sha256sum] = "dbd8ebce1c0b10feabb725b321d4a7f9f7353fe16878c8145ca332a173c193c9"
+SRC_URI[sha256sum] = "a9b445ecc686e9413ddac655544da21d801bbc6b94612736cf59283e6b92bcbb"
CLEANBROKEN = "1"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.3.bb
similarity index 68%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.3.bb
index d8d5304..990544c 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.2.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.3.bb
@@ -5,8 +5,8 @@
inherit pypi setuptools3
PYPI_PACKAGE = "Markdown"
-SRC_URI[md5sum] = "4bdebf1b5c64286c2214c99120da4292"
-SRC_URI[sha256sum] = "4b71fbd2db30c1dfb400f22b25f41cb823fc1db0aa8b7b67d120644f92cc1011"
+SRC_URI[md5sum] = "034e3bccfde211d44b4a7a69cb290ba0"
+SRC_URI[sha256sum] = "5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18"
BBCLASSEXTEND = "native"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend b/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend
index 91814e6..abfda60 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend
@@ -1,2 +1,12 @@
# Main recipe was moved to oe-core, but with ptest disabled
inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)}
+
+RDEPENDS_${PN}-ptest += " \
+ ${PYTHON_PN}-pytest \
+"
+
+do_install_ptest() {
+ install -d ${D}${PTEST_PATH}/tests
+ cp -f ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
+
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb
index a2e7074..3cfa3f3 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb
@@ -38,9 +38,12 @@
python3-pytz \
"
+ENABLELTO_toolchain-clang_riscv64 = "echo enable_lto = False >> ${S}/setup.cfg"
+ENABLELTO_toolchain-clang_riscv32 = "echo enable_lto = False >> ${S}/setup.cfg"
do_compile_prepend() {
echo [libs] > ${S}/setup.cfg
echo system_freetype = true >> ${S}/setup.cfg
+ ${ENABLELTO}
}
BBCLASSEXTEND = "native"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools/run-ptest
deleted file mode 100644
index 3385d68..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_8.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_8.5.0.bb
deleted file mode 100644
index e924b0f..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_8.5.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "More routines for operating on iterables, beyond itertools"
-HOMEPAGE = "https://github.com/erikrose/more-itertools"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3396ea30f9d21389d7857719816f83b5"
-
-SRC_URI[md5sum] = "2588b5a7042576b99574779582be9292"
-SRC_URI[sha256sum] = "6f83822ae94818eae2612063a5101a7311e68ae8002005b5e05f03fd74a86a20"
-
-inherit pypi setuptools3 ptest
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI += " \
- file://run-ptest \
-"
-
-RDEPENDS_${PN}-ptest += " \
- ${PYTHON_PN}-pytest \
-"
-
-do_install_ptest() {
- install -d ${D}${PTEST_PATH}/tests
- cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb
deleted file mode 100644
index c75707e..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Core utilities for Python packages"
-HOMEPAGE = "https://github.com/pypa/packaging"
-LICENSE = "Apache-2.0 & BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91"
-
-SRC_URI[md5sum] = "3208229da731c5d8e29d4d8941e75005"
-SRC_URI[sha256sum] = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"
-
-inherit pypi setuptools3
-
-BBCLASSEXTEND = "native"
-
-DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
-RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-pyparsing"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.4.bb
similarity index 82%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.4.bb
index da1ffd0..78730b4 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.3.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.4.bb
@@ -6,8 +6,8 @@
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c2a8f987b2ce77c368c6b3e1b5b10774"
-SRC_URI[md5sum] = "f10372d83a1c55cae217e8c05bf9bc5d"
-SRC_URI[sha256sum] = "babbeda2f83b0686c9ad38d93b10516e68cdcd5771007eb80a763e98aaf44613"
+SRC_URI[md5sum] = "594e6a429f297c77470e37d3510cccbb"
+SRC_URI[sha256sum] = "a979d0404b135c63954dea79e6246c45dd45371a88631cdbb4877d844e6de3b6"
inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.5.bb
deleted file mode 100644
index a022701..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.5.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Object-oriented filesystem paths"
-HOMEPAGE = "https://github.com/mcmtroffaes/pathlib2"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=042856c23a3e903b33bf361ea1cbe29a"
-
-SRC_URI[md5sum] = "f2bd0a363eb0f8fa0556f35c1d9e66fb"
-SRC_URI[sha256sum] = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"
-
-inherit pypi setuptools3
-
-RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-ctypes"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy/run-ptest
deleted file mode 100644
index b63c4de..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.13.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.13.1.bb
deleted file mode 100644
index d3e0365..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.13.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Plugin and hook calling mechanisms for python"
-HOMEPAGE = "https://github.com/pytest-dev/pluggy"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1c8206d16fd5cc02fa9b0bb98955e5c2"
-
-SRC_URI[md5sum] = "7f610e28b8b34487336b585a3dfb803d"
-SRC_URI[sha256sum] = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"
-
-DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
-RDEPENDS_${PN} += "${PYTHON_PN}-importlib-metadata \
- ${PYTHON_PN}-more-itertools \
-"
-
-inherit pypi ptest setuptools3
-
-SRC_URI += " \
- file://run-ptest \
-"
-
-RDEPENDS_${PN}-ptest += " \
- ${PYTHON_PN}-pytest \
-"
-
-do_install_ptest() {
- install -d ${D}${PTEST_PATH}/testing
- cp -rf ${S}/testing/* ${D}${PTEST_PATH}/testing/
-}
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_2.0.0.bb
similarity index 81%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_1.0.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_2.0.0.bb
index 79341b9..3563bfa 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_1.0.1.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_2.0.0.bb
@@ -3,8 +3,7 @@
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=c9a6829fcd174d9535b46211917c7671"
-SRC_URI[md5sum] = "b5bd0acec56ae7ccf5ac22d3f671c3a7"
-SRC_URI[sha256sum] = "6bb7f539903cb031fecb855b615cbcac8cd245ebc6fa51c6e23ab3386db89771"
+SRC_URI[sha256sum] = "e37acd91976fe6119172771520e58d1742c8479703489321dc1d9c85e7259922"
do_install_append() {
perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"`
@@ -36,5 +35,5 @@
"
do_install_ptest() {
- cp -f ${S}/prettytable_test.py ${D}${PTEST_PATH}/
+ cp -f ${S}/tests/test_prettytable.py ${D}${PTEST_PATH}/
}
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.9.0.bb
deleted file mode 100644
index 794ec2a..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.9.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE = "http://py.readthedocs.io/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9"
-
-SRC_URI[md5sum] = "b80db4e61eef724f49feb4d20b649e62"
-SRC_URI[sha256sum] = "9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"
-
-DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
-
-inherit pypi setuptools3
-
-BBCLASSEXTEND = "native nativesdk"
-
-RDEPENDS_${PN} += "${PYTHON_PN}-netclient"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.20.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.21.bb
similarity index 68%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.20.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.21.bb
index e09fec0..1b80770 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.20.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.21.bb
@@ -7,5 +7,5 @@
inherit pypi setuptools3
-SRC_URI[md5sum] = "7ebc843f015b54d849ac7632eda74e9b"
-SRC_URI[sha256sum] = "acaaa6f96de315dc99cac3da810156bf3829d1eb5c49180f00a4fdde82eabc76"
+SRC_URI[md5sum] = "c661939158d6a1acbcc2191bedc47751"
+SRC_URI[sha256sum] = "96e900d6af928a94c2a75b4935ddda44872c218121d0467c549ae19e7608a9a2"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb
index ab33953..049c3c3 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb
@@ -3,11 +3,12 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=ab173cade7965b411528464589a08382"
RDEPENDS_${PN} += "\
- ${PYTHON_PN}-threading \
+ ${PYTHON_PN}-ctypes \
${PYTHON_PN}-io \
${PYTHON_PN}-misc \
${PYTHON_PN}-shell \
${PYTHON_PN}-smtpd \
+ ${PYTHON_PN}-threading \
"
SRC_URI[md5sum] = "8e580fa1ff3971f94a6f81672b76c406"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb
index 2df30ae..2e1bff4 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb
@@ -10,8 +10,8 @@
SRC_URI += "file://0001-rule.py-fix-missing-comma.patch"
PYPI_PACKAGE = "pykwalify"
+
inherit setuptools3 pypi
-unset _PYTHON_SYSCONFIGDATA_NAME
RDEPENDS_${PN} = "\
${PYTHON_PN}-docopt \
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrad_2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrad_2.3.bb
deleted file mode 100644
index 3b38fb3..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrad_2.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SUMMARY = "RADIUS tools"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=debd8dc49cd9a7d58c7fffc771efed4f"
-
-PYPI_PACKAGE = "pyrad"
-SRC_URI[sha256sum] = "89c4d9b2cab1746c48dc0d93898d278e34a40acedf6f511aeaa748bcd4490295"
-
-inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb
new file mode 100644
index 0000000..86a95a4
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb
@@ -0,0 +1,9 @@
+SUMMARY = "RADIUS tools"
+SECTION = "devel/python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709"
+
+PYPI_PACKAGE = "pyrad"
+SRC_URI[sha256sum] = "057de4b7e89d8da57ba782c1bde45c63ebee720ae2c0b0a69beaff15c47e30d9"
+
+inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
deleted file mode 100644
index 8c5c172..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ff784f4803ab33f5e3389e40d038d52d1e211843 Mon Sep 17 00:00:00 2001
-From: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
-Date: Wed, 28 Aug 2019 16:12:27 +0900
-Subject: [PATCH] [PATCH] setup.py: remove the setup_requires for
- setuptools-scm
-
-The setup_requires argument forces the download of the egg file for setuptools-scm
-during the do_compile phase. This download is incompatible with the typical fetch
-and mirror structure. The only usage of scm is the generation of the _version.py
-file and in the release tarball it is already correctly created
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Derek Straka <derek@asterius.io>
-
-Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
-
-Rebase for pytest 6.1.0.
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
- setup.cfg | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.cfg b/setup.cfg
-index 60f6564..c4d1471 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -55,7 +55,6 @@ package_dir =
- =src
- setup_requires =
- setuptools>=40.0
-- setuptools-scm
- zip_safe = no
-
- [options.entry_points]
---
-2.17.1
-
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_6.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_6.1.0.bb
deleted file mode 100644
index 1da43c4..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_6.1.0.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "Simple powerful testing with python"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b"
-
-SRC_URI[sha256sum] = "d010e24666435b39a4cf48740b039885642b6c273a3f77be3e7e03554d2806b7"
-
-SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch "
-
-inherit update-alternatives pypi setuptools3
-
-RDEPENDS_${PN}_class-target += " \
- ${PYTHON_PN}-attrs \
- ${PYTHON_PN}-debugger \
- ${PYTHON_PN}-doctest \
- ${PYTHON_PN}-iniconfig \
- ${PYTHON_PN}-json \
- ${PYTHON_PN}-pluggy \
- ${PYTHON_PN}-py \
- ${PYTHON_PN}-setuptools \
- ${PYTHON_PN}-six \
- ${PYTHON_PN}-atomicwrites \
- ${PYTHON_PN}-importlib-metadata \
- ${PYTHON_PN}-pathlib2 \
- ${PYTHON_PN}-wcwidth \
- ${PYTHON_PN}-more-itertools \
- ${PYTHON_PN}-packaging \
-"
-
-ALTERNATIVE_${PN} += "py.test pytest"
-
-NATIVE_LINK_NAME[pytest] = "${bindir}/pytest"
-ALTERNATIVE_TARGET[pytest] = "${bindir}/pytest"
-
-ALTERNATIVE_LINK_NAME[py.test] = "${bindir}/py.test"
-ALTERNATIVE_TARGET[py.test] = "${bindir}/py.test"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.28.bb
similarity index 68%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.23.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.28.bb
index c8cbdd1..c3cddd8 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.23.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.28.bb
@@ -5,7 +5,7 @@
inherit pypi setuptools3
-SRC_URI[md5sum] = "13fb62a1b276623e38931f7217f080d8"
-SRC_URI[sha256sum] = "2278453c6a76280b38855a263198961938108ea2333ee145c5168c36b8e2b376"
+SRC_URI[md5sum] = "8150da7f676e73751b4e3c7b1ba79a34"
+SRC_URI[sha256sum] = "dd3e6547ecf842a29cf25123fbf8d2461c53c8d37aa20d87ecee130c89b7079b"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb
deleted file mode 100644
index 4ebbac6..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "the blessed package to manage your versions by scm tags"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489"
-
-SRC_URI[md5sum] = "e6c9fad17c90516d640868eb833d5150"
-SRC_URI[sha256sum] = "a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090a7faa8"
-
-PYPI_PACKAGE = "setuptools_scm"
-inherit pypi setuptools3
-
-RDEPENDS_${PN} = "\
- ${PYTHON_PN}-debugger \
- ${PYTHON_PN}-json \
- ${PYTHON_PN}-py \
- ${PYTHON_PN}-setuptools \
-"
-RDEPENDS_${PN}_class-native = "\
- ${PYTHON_PN}-setuptools-native \
-"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.1.bb
similarity index 78%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.1.bb
index 7724f4b..c7b50c2 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.0.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.14.1.bb
@@ -3,8 +3,8 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5317094292296f03405f59ae5f6544b6"
-SRC_URI[md5sum] = "4cbbcb85c081d78f4b0f00d634db9bb9"
-SRC_URI[sha256sum] = "05c7e520cdf70f70a7228a03b589da9f96c6e0d06fc487ab21fc62b26a592e59"
+SRC_URI[md5sum] = "50fc0a2953930ed8d0f6570835e88abf"
+SRC_URI[sha256sum] = "39aa9af22f6558a0c5d132881cf43e34828ca03e4ae11114852ca6a55c7c1d8e"
PYPI_PACKAGE = "sh"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-toml_0.10.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-toml_0.10.1.bb
deleted file mode 100644
index 00f38c6..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-toml_0.10.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SUMMARY = "Python Library for Tom's Obvious, Minimal Language"
-HOMEPAGE = "https://github.com/uiri/toml"
-LICENSE = "MIT"
-SECTION = "devel/python"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=16c77b2b1050d2f03cb9c2ed0edaf4f0"
-
-SRC_URI[md5sum] = "743131c431419fe42f854cff02ad3abe"
-SRC_URI[sha256sum] = "926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"
-
-inherit pypi setuptools3
-
-BBCLASSEXTEND = "native nativesdk"
-
-RDEPENDS_${PN} += " \
- ${PYTHON_PN}-misc \
-"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.1.bb
similarity index 83%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.0.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.1.bb
index db6b567..89ff715 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.0.4.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.1.bb
@@ -4,10 +4,10 @@
polling, WebSockets, and other applications that require a long-lived connection to each user."
HOMEPAGE = "http://www.tornadoweb.org/en/stable/"
LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI[md5sum] = "cf39425f3d7eba9a54287f3e795a2f23"
-SRC_URI[sha256sum] = "0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc"
+SRC_URI[md5sum] = "f324f5e7607798552359d6ab054c4321"
+SRC_URI[sha256sum] = "33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791"
inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.5.bb
new file mode 100644
index 0000000..7f88bc1
--- /dev/null
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.5.bb
@@ -0,0 +1,9 @@
+SUMMARY = "A lightweight, object-oriented Python state machine implementation with many extensions."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=de0a0876a688a4483bfafa764773ab39"
+
+inherit pypi setuptools3
+
+SRC_URI[sha256sum] = "e441c66a0c753d56c01c3e5e547f21dbe4a5569c939f12477475c5e81d79769b"
+
+RDEPENDS_${PN} += "python3-six"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.10.0.bb
index bd92216..cb5c372 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.10.0.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.10.0.bb
@@ -28,6 +28,4 @@
python3-setuptools-scm-native \
"
-RDEPENDS_${PN} += "python3-typing"
-
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.2.bb
similarity index 68%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.11.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.2.bb
index 980f4c5..fcd6709 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.11.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.2.bb
@@ -1,10 +1,9 @@
SUMMARY = "Python HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more"
HOMEPAGE = "https://github.com/shazow/urllib3"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=65715c2eb961313d71b297dd5a04f85e"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c"
-SRC_URI[md5sum] = "d47dd21a6e66a03c3633cac468ffd010"
-SRC_URI[sha256sum] = "8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2"
+SRC_URI[sha256sum] = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08"
inherit pypi setuptools3
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth/run-ptest
deleted file mode 100644
index b63c4de..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth_0.2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth_0.2.5.bb
deleted file mode 100644
index bb4aae2..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth_0.2.5.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "Library for building powerful interactive command lines in Python"
-DESCRIPTION = "Measures the displayed width of unicode strings in a terminal"
-HOMEPAGE = "https://github.com/jquast/wcwidth"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b15979c39a2543892fca8cd86b4b52cb"
-
-SRC_URI[md5sum] = "a07a75f99d316e14838ac760c831ea37"
-SRC_URI[sha256sum] = "c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"
-
-inherit pypi setuptools3 ptest
-
-SRC_URI += " \
- file://run-ptest \
-"
-
-RDEPENDS_${PN}-ptest += " \
- ${PYTHON_PN}-pytest \
-"
-
-do_install_ptest() {
- install -d ${D}${PTEST_PATH}/tests
- cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-webcolors_1.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-webcolors_1.11.1.bb
index b950d6f..e567e0b 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-webcolors_1.11.1.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-webcolors_1.11.1.bb
@@ -9,7 +9,6 @@
RDEPENDS_${PN}_class-target = "\
${PYTHON_PN}-stringold \
- ${PYTHON_PN}-typing \
"
SRC_URI += " \
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.3.bb
similarity index 79%
rename from meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.3.bb
index dbb5d23..01682a4 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.2.bb
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.3.bb
@@ -3,8 +3,7 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b334fc90d45983db318f54fd5bf6c90b"
-SRC_URI[md5sum] = "65c3346f694e37f45045f4e29a60d280"
-SRC_URI[sha256sum] = "c45b49b59a5724869899798e1bbd447ac486215269511d3b76b4c235a1b766b6"
+SRC_URI[sha256sum] = "8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10"
SRC_URI += " \
file://run-ptest \
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.4.0.bb
deleted file mode 100644
index 97523e8..0000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.4.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE = "https://github.com/jaraco/zipp"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6"
-
-SRC_URI[md5sum] = "ae81f228995578b840d76d1b7d87fede"
-SRC_URI[sha256sum] = "ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
-
-DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
-
-inherit pypi setuptools3
-
-DEPENDS += "${PYTHON_PN}-toml-native"
-
-RDEPENDS_${PN} += "${PYTHON_PN}-compression \
- ${PYTHON_PN}-math \
- ${PYTHON_PN}-more-itertools"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-webserver/conf/layer.conf b/meta-openembedded/meta-webserver/conf/layer.conf
index 9448998..d95d328 100644
--- a/meta-openembedded/meta-webserver/conf/layer.conf
+++ b/meta-openembedded/meta-webserver/conf/layer.conf
@@ -17,7 +17,7 @@
LAYERDEPENDS_webserver = "core openembedded-layer"
-LAYERSERIES_COMPAT_webserver = "gatesgarth"
+LAYERSERIES_COMPAT_webserver = "gatesgarth hardknott"
LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-openembedded/meta-xfce/conf/layer.conf b/meta-openembedded/meta-xfce/conf/layer.conf
index a71eb8f..5674ab5 100644
--- a/meta-openembedded/meta-xfce/conf/layer.conf
+++ b/meta-openembedded/meta-xfce/conf/layer.conf
@@ -19,7 +19,7 @@
LAYERDEPENDS_xfce-layer += "meta-python"
LAYERDEPENDS_xfce-layer += "networking-layer"
-LAYERSERIES_COMPAT_xfce-layer = "gatesgarth"
+LAYERSERIES_COMPAT_xfce-layer = "gatesgarth hardknott"
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\
openzone->gdk-pixbuf \
diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch
index 92a6e83..ae8bc52 100644
--- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch
+++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch
@@ -18,6 +18,7 @@
[1] https://bugzilla.xfce.org/attachment.cgi?id=8492
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
---
panel-plugin/xfce4-cpufreq-configure.c | 4 ++++
panel-plugin/xfce4-cpufreq-plugin.c | 13 +++++++++++--
@@ -109,13 +110,12 @@
+++ b/panel-plugin/xfce4-cpufreq-plugin.h
@@ -95,6 +95,8 @@ typedef struct
- CpuFreqPlugin *cpuFreq;
+ extern CpuFreqPlugin *cpuFreq;
+GtkCssProvider *currentProvider;
+
G_BEGIN_DECLS
void
---
+---
2.20.1
-
diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch
index d5238d0..95605f8 100644
--- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch
+++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch
@@ -5,26 +5,34 @@
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Refresh for xfce4-cpufreq-plugin 1.2.2.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+---
+ panel-plugin/xfce4-cpufreq-plugin.c | 1 +
+ panel-plugin/xfce4-cpufreq-plugin.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/panel-plugin/xfce4-cpufreq-plugin.c b/panel-plugin/xfce4-cpufreq-plugin.c
+index 1e33492..ce9e302 100644
--- a/panel-plugin/xfce4-cpufreq-plugin.c
+++ b/panel-plugin/xfce4-cpufreq-plugin.c
-@@ -37,7 +37,8 @@
- #include "xfce4-cpufreq-linux.h"
+@@ -38,6 +38,7 @@
#endif /* __linux__ */
--
-+CpuFreqPlugin *cpuFreq;
+ CpuFreqPlugin *cpuFreq;
+GtkCssProvider *currentProvider;
void
cpufreq_label_set_font (void)
+diff --git a/panel-plugin/xfce4-cpufreq-plugin.h b/panel-plugin/xfce4-cpufreq-plugin.h
+index 8cd0d33..7dbccef 100644
--- a/panel-plugin/xfce4-cpufreq-plugin.h
+++ b/panel-plugin/xfce4-cpufreq-plugin.h
-@@ -93,9 +93,9 @@ typedef struct
- gint timeoutHandle;
- } CpuFreqPlugin;
+@@ -95,7 +95,7 @@ typedef struct
--CpuFreqPlugin *cpuFreq;
-+extern CpuFreqPlugin *cpuFreq;
+ extern CpuFreqPlugin *cpuFreq;
-GtkCssProvider *currentProvider;
+extern GtkCssProvider *currentProvider;
diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.2.bb
similarity index 74%
rename from meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.2.bb
index 5dce51b..3b7b9ec 100644
--- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb
+++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.2.bb
@@ -5,8 +5,8 @@
inherit xfce-panel-plugin
-SRC_URI[md5sum] = "ccd8f0f7aef51bc4caf1049986d9614f"
-SRC_URI[sha256sum] = "c5e044c0dc401d2066f208a3df82a588b3e51ff01425f155d0a1d0f8fce8f5b5"
+SRC_URI[sha256sum] = "500f04b8d857c96da8c8c7a4eecba30a903d0fce6e35a05e674529e43b47e498"
+
SRC_URI += "file://0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch \
file://xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch \
"
diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.3.0.bb
similarity index 70%
rename from meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.3.0.bb
index c822414..c4172f4 100644
--- a/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb
+++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.3.0.bb
@@ -5,10 +5,9 @@
inherit xfce-panel-plugin
-DEPENDS += "gnutls libgcrypt"
+DEPENDS += "gnutls"
-SRC_URI[md5sum] = "7263114ec0f2987a3aff15afeeb45577"
-SRC_URI[sha256sum] = "624acc8229a8593c0dfeb28f883f4958119a715cc81cecdbaf29efc8ab1edcad"
+SRC_URI[sha256sum] = "20f91ebefd2880b27f421f773115b3740f67de2bf60feace3841bfd1a09cbe2e"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.2.bb
similarity index 71%
rename from meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.2.bb
index ad9b6e9..4045230 100644
--- a/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb
+++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.2.bb
@@ -7,7 +7,6 @@
DEPENDS += "libsoup-2.4 dbus-glib upower"
-SRC_URI[md5sum] = "203ad16e74d4823f6fb6e9a18bb7df55"
-SRC_URI[sha256sum] = "afb2af5f3effc2ea6181636ed0e82e6dafd556ec1b8478100802f85a5d167a89"
+SRC_URI[sha256sum] = "9017790b92953090c849b17b357b42fa8c562bf0e25af2fd2e5f53cfebc662c6"
FILES_${PN} += "${datadir}/xfce4/weather"
diff --git a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.9.bb b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.3.1.bb
similarity index 91%
rename from meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.9.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.3.1.bb
index d364c80..c9f2ddc 100644
--- a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.9.bb
+++ b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.3.1.bb
@@ -6,7 +6,7 @@
inherit xfce gtk-doc
-SRC_URI[sha256sum] = "6508906f03e5a6ae3f6503b71b056df47d336d5504f39df6ce0bb9c5248007b6"
+SRC_URI[sha256sum] = "e4a30f3c0656b5b29fcd4a2450293f20f283a95b7fb0754a947c55427784c454"
INSANE_SKIP_${PN} = "dev-so"