diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-08-22 00:13:29 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-09-01 03:32:10 +0300 |
commit | bffdb3e0d00e91bc943c2cc8d73cd5d0cd510fa5 (patch) | |
tree | dbf33bcb27a4006eb5a6494744d283e49edbea94 /meta-openembedded/meta-oe/recipes-extended | |
parent | f021ee9f72d43f6033e033ce244e542fb74c62db (diff) | |
download | openbmc-bffdb3e0d00e91bc943c2cc8d73cd5d0cd510fa5.tar.xz |
meta-openembedded: subtree update:76b83194b3..ae39f2e711
Adrian Bunk (3):
libpeas: gobject-introspection is mandatory and cannot be configured
gnome-settings-daemon: smartcard support is optional, and needs nss
gnome-settings-daemon: Remove duplicate outdated SRC_URI hashes
Alex Kiernan (1):
ostree: upgrade 2020.4 -> 2020.5
Andreas Müller (29):
xfce4-whiskermenu-plugin: upgrade 2.4.5 -> 2.4.6
xfwm4: upgrade 4.14.2 -> 4.14.3
xfce4-timer-plugin: upgrade 1.7.0 -> 1.7.1
gnome-desktop3: upgrade 3.36.3.1 -> 3.36.4
evolution-data-server: upgrade 3.36.3 -> 3.36.4
gnome-control-center: upgrade 3.36.3 -> 3.36.4
gtksourceview4: upgrade 4.6.0 -> 4.6.1
libnma: upgrade 1.8.28 -> 1.8.30
libgweather: upgrade 3.36.0 -> 3.36.1
evince: upgrade 3.36.5 -> 3.36.7
exiv2: upgrade 0.27.1 -> 0.27.3
poppler: upgrade 0.89.0 -> 0.90.1
live555: merge recipe with inc
live555: upgrade 20190828 -> 20200721
tumbler: upgrade 0.2.8 -> 0.2.9
xfwm4: upgrade 4.14.3 -> 4.14.4
geoclue: upgrade 2.5.3 -> 2.5.6
gnome-help.bbclass: remove double FILES_${PN}-help entry
gnome-calendar: initial add 3.36.2
imagemagick: upgrade 7.0.9_13 -> 7.0.10_25
libpeas: disable tests when introspection is not enabled/available
udisks2: upgrade 2.8.4+ -> 2.9.1
xfwm4: upgrade 4.14.4 -> 4.14.5
gnome-desktop3: upgrade 3.36.4 -> 3.36.5
file-roller: upgrade 3.36.2 -> 3.36.3
evolution-data-server: upgrade 3.36.4 -> 3.36.5
gnome-disk-utility: re-add 3.36.3
gdm: upgrade 3.36.2 -> 3.36.3
poppler: upgrade 0.90.1 -> 20.08.0
Andrey Konovalov (1):
libcamera: fix packaging and installation
Aníbal Limón (1):
meta-oe: opengl-es-cts install deqp test runners
Armin Kuster (2):
jsoncpp: add PE do to dunfell reverts
libpeas: this depends on gtk3+ add FEATURE CHECK
Arthur She (1):
xmlrpc-c: Upgrade 1.51.03 -> 1.54.02
Changqing Li (1):
mozjs: fix multilib conflict
Colin McAllister (6):
python3-paramiko: Added recipe
python3-lorem: Added recipe
python3-textparser: Added recipe
python3-jdatetime: Added recipe
python3-pynacl: Added recipe
autossh: Created recipe
Daniel Dragomir (1):
rasdaemon: update to 0.6.6 and fix SRC_URI broken link
Gianfranco (4):
dlt-daemon: update to 2.18.5
dlt-daemon: add new dlt-filetransfer PACKAGECONFIG option
dlt-daemon: fix build failure when dlt-dbus is enabled, due to missing service file.
dlt-daemon: enable some configurations by default in PACKAGECONFIG
Gianfranco Costamagna (2):
vboxguestdrivers: upgrade 6.1.6 -> 6.1.12
dlt-daemon: fix build with upstream-proposed patch for MUSL libc
Hongxu Jia (1):
vboxguestdrivers: fix failed to compile with kernel 5.8.0
Jack Mitchell (1):
python3-pybind11: install both python wheel and cmake build
Jacob Kroon (1):
abseil-cpp: Use SkipRecipe exception
James Feist (1):
boost-url: Add recipe
Jens Rehsack (1):
bearssl: add new recipe
Johan Jeppsson (1):
nngpp: Add recipe
Jyothi-k (1):
fmt: 7.0.1 -> 7.0.3
Kai Kang (2):
xfce4-eyes-plugin: 4.5.0 -> 4.5.1
rdist: fix parallel build
Khem Raj (82):
flashrom: Fix build failure with glibc 2.32
spdlog: Upgrade to 1.7.0
gerbera: Upgrade to 1.6.0
libqmi: Delete --enable-more-warnings configure option
gnome-settings-daemon: Drop using autotools specific option
gnome-settings-daemon: Add introspection to UNKNOWN_CONFIGURE_WHITELIST
iwd: Module load dir should be relative to root_dir
libcamera: Fix License names to match SPDX convention
satyr: Upgrade to 0.30
gpm: Upgrade to latest master
gensio: Upgrade to 2.1.4
freeglut: Use -fcommon always
xfsprogs: Upgrade to 5.7.0
freerdp: Upgrade to 2.2.0
htop: Fix build with -fno-common
dialog: Turn X11 support into a packageconfig option
x11vnc: Update to latest on master
vblade: Upgrade to version 24
netperf: Fix build with -fno-common
netplan: Update to latest to fix build with -fno-common
ncftp: Fix build with -fno-common
iscsi-initiator-utils: Upgrade to _2.1.2
tftp-hpa: Fix build with -fno-common
fwknop: Fix build with gcc10
dibbler: Update to latest
quagga: Use -fcommon to compile
drbd: Upgrade to 9.0.24-1
drbd-utils: Uphgrade to 9.13.1
snort: Upgrade to 2.9.16.1
daq: Upgrade to 2.0.7
openlldp: Update to latest master
iftop: Fix build with -fno-common
xfce4-sensors-plugin: Fix build with -fno-common
xfce4-cpufreq-plugin: Fix build with -fno-common
imsettings: Upgrade to 1.8.2
lcdproc: Fix compilation with GCC >= 10.x
openal-soft: Update to 1.20.1
mimic: Upgrade to 1.3.0.1
minidlna: Fix build with -fno-common
tvheadend: Update to latest tip
monkey: Upgrade to 1.6.9
klibc: Compile with -fcommon
kexecboot: Use -fcommon to compile
python3-matplotlib: Use lld for linking when using clang
python3-pandas: Add workaround to fix build with clang
memtester: Fix build with -fno-common
read-edid: Fix build with gcc-10+
owfs: Fix build with -fno-common
sharutils: Fix build with -fno-common
lprng: Fix build with -fno-common
fluentbit: Use -fcommon to compile
fbida: Upgrade to 2.14
ipmitool: Fix build with -fno-common
smstools3: Fix build with -fno-common
sblim-sfcb: Fix build with -fno-common
cdrkit: Fix build with -fno-common
openocd: Fix build with gcc10/-fno-common
liblbxutil: Fix build with gcc10/-fno-common
mg: Upgrade to 20200723 tag
libforms: Fix build with -fno-common
wifi-test-suite: Update to latest tip
xf86-video-ati: Fix link failure with gcc 10
ifplugd: Fix build with gcc10/-fno-common
tcsh: Fix build with -fno-common
makedumpfile: Fix build with -fno-common
nodejs: Upgrade to 12.18.3
opencl-headers: Upgrade to v2020.06.16
ocl-icd: Upgrade to latest
opencl-icd-loader: Update beyond 2020.06.16
fwts: Upgrade to 20.07.00
pegtl: Disable type-limits warning
opensaf: Fix build with -fno-common
crash: Fix arm64 build with -fno-common
minifi-cpp: Fix build with lto/clang
libyui-ncurses: Disable werror with clang
sedutils: Fix build with clang11
directfb: Disable dtor-typedef warning with clang11
gerbera: Disable PIE on rv64
opengl-es-cts: Use SECURITY_NOPIE_CFLAGS
opencv: Upgrade to 4.4.0
minifi-cpp: Fix linking with libxml2
sdbus-c++: Fix ptest packaging
Leon Anavi (80):
python3-pytest-metadata: Upgrade 1.9.0 -> 1.10.0
python3-cmd2: Upgrade 1.1.0 -> 1.2.1
python3-aenum: Upgrade 2.2.3 -> 2.2.4
python3-bitarray: Upgrade 1.4.1 -> 1.4.2
python3-colorlog: Upgrade 4.1.0 -> 4.2.1
python3-matplotlib: Upgrade 3.2.2 -> 3.3.0
python3-urllib3: Upgrade 1.25.9 -> 1.25.10
python3-pywbem: Upgrade 0.17.3 -> 0.17.4
python3-lxml: Upgrade 4.5.1 -> 4.5.2
python3-gmqtt: Upgarde 0.6.5 -> 0.6.7
python3-pyroute2: Upgrade 0.5.12 -> 0.5.13
python3-pymongo: Upgrade 3.10.1 -> 3.11.0
python3-pid: Upgrade 3.0.3 -> 3.0.4
python3-pychromecast: Upgrade 7.1.2 -> 7.2.0
python3-dynamic-dispatch: Upgrade 1.0.2 -> 1.0.3
python3-cbor2: Upgrade 5.1.1 -> 5.1.2
python3-xlsxwriter: Consolidate in a single file
python3-xlsxwriter: Upgrade 1.2.9 -> 1.3.0
python3-cffi: Upgrade 1.14.0 -> 1.14.1
python3-pandas: Upgrade 1.0.5 -> 1.1.0
python3-luma-core: Upgrade 1.14.0 -> 1.14.1
python3-tqdm: Upgrade 4.47.0 -> 4.48.0
python3-asn1crypto: Upgrade 1.3.0 -> 1.4.0
python3-pyalsaaudio: Consolidate in a single file
python3-pyalsaaudio: Upgrade 0.8.4 -> 0.9.0
python3-autobahn: Upgrade 20.6.2 -> 20.7.1
python3-isort: Upgrade 5.1.4 -> 5.2.2
python3-ujson: Upgrade 3.0.0 -> 3.1.0
python3-yarl: Upgrade 1.4.2 -> 1.5.1
python3-openpyxl: Upgrade 3.0.3 -> 3.0.4
python3-cryptography: Upgrade 2.8 -> 3.0
python3-dnspython: Upgrade 1.16.0 -> 2.0.0
python3-regex: Upgrade 2020.6.8 -> 2020.7.14
python3-lazy-object-proxy: Upgrade 1.5.0 -> 1.5.1
python3-xxhash: Upgrade 1.4.4 -> 2.0.0
xxhash: Upgrade 0.7.4 -> 0.8.0
python3-parso: Upgrade 0.7.1 -> 0.8.0
python3-argexec: Upgrade 1.0.2 -> 1.0.3
python3-xlsxwriter: Upgrade 1.3.0 -> 1.3.2
python3-cantools: Upgrade 35.1.0 -> 35.3.0
python3-wtforms: Upgrade 2.3.1 -> 2.3.3
python3-prompt-toolkit: Upgrade 3.0.5 -> 3.0.6
python3-cmd2: Upgrade 1.2.1 -> 1.3.1
python3-luma-core: Upgrade 1.14.1 -> 1.15.0
python3-hyperlink: Upgrade 19.0.0 -> 20.0.1
python3-bitarray: Upgrade 1.4.2 -> 1.5.1
python3-isort: Upgrade 5.2.2 -> 5.3.2
python3-gast: Upgrade 0.3.3 -> 0.4.0
python3-tqdm: Upgrade 4.48.0 -> 4.48.2
python3-sympy: Upgrade 1.6.1 -> 1.6.2
python3-parse: Upgrade 1.15.0 -> 1.16.0
python3-flask-login: Consolidate in a single file
python3-flask-login: Upgrade 0.4.1 -> 0.5.0
python3-graphviz: Upgrade 0.14 -> 0.14.1
python3-huey: Upgrade 2.2.0 -> 2.3.0
python3-rsa: Upgrade 3.4.2 -> 4.6
python3-cmd2: Upgrade 1.3.1 -> 1.3.2
python3-u-msgpack-python: Upgrade 2.6.0 -> 2.7.0
python3-pytest-timeout: Upgrade 1.4.1 -> 1.4.2
python3-javaobj-py3: Upgrade 0.4.0.1 -> 0.4.1
python3-sentry-sdk: Upgrade 0.16.0 -> 0.16.3
python3-coverage: Upgrade 5.2 -> 5.2.1
python3-redis: Upgrade 2.10.6 -> 3.5.3
mosquitto: Upgrade 1.6.10 -> 1.6.11
python3-matplotlib: Upgrade 3.3.0 -> 3.3.1
python3-humanize: Upgrade 2.5.0 -> 2.6.0
python3-bcrypt: Upgrade 3.1.7 -> 3.2.0
python3-isort: Upgrade 5.3.2 -> 5.4.2
python3-cffi: Upgrade 1.14.1 -> 1.14.2
python3-wheel: Upgrade 0.34.2 -> 0.35.1
python3-cmd2: Upgrade 1.3.2 -> 1.3.3
python3-google-api-python-client: Upgrade 1.9.3 -> 1.10.0
python3-bitarray: Upgrade 1.5.1 -> 1.5.2
python3-xlsxwriter: Upgrade 1.3.2 -> 1.3.3
python3-sqlalchemy: Upgrade 1.3.18 -> 1.3.19
python3-sentry-sdk: Upgrade 0.16.3 -> 0.16.5
python3-python-vlc: Upgrade 3.0.10114 -> 3.0.11115
python3-pytest-asyncio: Upgrade 0.12.0 -> 0.14.0
python3-djangorestframework: Consolidate in a single file
python3-djangorestframework: Upgrade 3.9.0 -> 3.11.1
Martin Jansa (2):
khronos-cts: add opengl to REQUIRED_DISTRO_FEATURES
lcov: fix lcov-native build
Mingli Yu (4):
mariadb: upgrade to 10.5.4
mariadb: not use the bundled libpcre2
freeradius: fix the occasional verification failure
fio: upgrade to 3.21
Oleksandr Kravchuk (49):
iwd: update to 1.8
nvme-cli: update to 1.12
dialog: update to 1.3-20200327
libqmi: update to 1.26.0
libmbim: update to 1.24.2
libwebsockets: update to 4.0.20
libkcapi: update to 1.2.0
libbytesize: update to 2.3
libvdpau: update to 1.4
libcec: update to 6.0.2
dctl: update v69
pmdk: update to 1.9
libzip: update to 1.7.3
tmux: update to 3.1b
libjcat: update to 0.1.3
leptonica: update to 1.79.0
libvncserver: update to 0.9.13
libopusenc: add recipe 0.2.1
broadcom-bt-firmware: update to 12.0.1.1105_p2
lsscsi: update to 0.31
opusfile: update to 0.12
libmpdclient: update to 2.19
crossguid: update to 0.2.2
libmediaart: update to 2.0_1.9.4
kronosnet: update to 1.18
keepalived: update to 2.1.5
valijson: update to 0.3
ostree: update to 2020.4
terminus-font: update to 4.48
libteam: update to 1.31
libimobiledevice: update to 1.3.0
libusbmuxd: update to 2.0.2
libplist: update to 2.2.0
usbmuxd: update to 1.1.1
ifuse: update to 1.1.4
libyui: update to 3.10.0
libyui-ncurses: update to 2.55.0
mpc: update to 0.33
ncmpc: update to 0.38
dhcpcd: update to 9.1.4
firewalld: update to 0.8.3
openconnect: update to 8.10
relayd: bump to latest revision
fping: update to 4.4
nano: update to 5.0
broadcom-bt-firmware: add PE back
libpeas: update to 1.26.0
ifenslave: update to 2.11
libupnp: update to 1.14.0
Shlomi Vaknin (11):
monit: Set monit files in temporary locations
python3-ipython: add recipe
python3-traitlets: add recipe
python3-ipython-genutils: add recipe
python3-jedi: add recipe
python3-pickleshare: add recipe
python3-backcall: add recipe
python3-parso: add recipe
prompt-toolkit: fix recipe
json-schema-validator: Add recipe
python3-pybind11-json: Add recipe
Slater, Joseph (4):
lvm2: allow for reproducible binary builds
python3-cryptography: fix two tests
mozjs: specify TMPDIR
aoetool: make builds reproducible
Vijay Khemka (1):
Adding recipe for exprtk
William A. Kennington III (3):
fmt: 6.2.0 -> 7.0.1
cli11: 1.9.0 -> 1.9.1
function2: 4.0.0 -> 4.1.0
Yi Zhao (2):
libldb: upgrade 1.5.7 -> 1.5.8
samba: upgrade 4.10.15 -> 4.10.17
Yue Tao (1):
lua: Security Advisory - lua - CVE-2020-15888
Zang Ruochen (25):
fping: upgrade 4.2 -> 4.3
capnproto: upgrade 0.7.0 -> 0.8.0
c-ares: upgrade 1.16.0 -> 1.16.1
iozone3: upgrade 489 -> 490
ser2net: upgrade 4.1.8 -> 4.2.0
apache-websocket: upgrade 0.1.1 -> 0.1.2
hiawatha: upgrade 10.10 -> 10.11
nostromo: upgrade 1.9.7 -> 1.9.9
purple-skypeweb: upgrade 1.5 -> 1.6
dnsmasq: upgrade 2.81 -> 2.82
linuxptp: upgrade 2.0 -> 3.0
nlohmann-json: upgrade 3.7.3 -> 3.9.0
paho-mqtt-c: upgrade 1.3.2 -> 1.3.4
zlog: upgrade 1.2.14 -> 1.2.15
jasper: upgrade 2.0.16 -> 2.0.19
dash: upgrade 0.5.11 -> 0.5.11.1
libbytesize: upgrade 2.3 -> 2.4
jsonrpc: Fix build with libmicrohttpd 0.9.71
libmicrohttpd: upgrade 0.9.70 -> 0.9.71
rdma-core: upgrade 28.0 -> 30.0
ipc-run: upgrade 20180523.0 -> 20200505.0
uhubctl: upgrade 2.1.0 -> 2.2.0
gsoap: upgrade 2.8.103 -> 2.8.105
libcgi-perl: upgrade 4.48 -> 4.50
redis: upgrade 6.0.5 -> 6.0.6
wonjong.lee (1):
minifi: Add recipe for c++ version
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I003021e0f4c267f79eedf704c43fbb6fdcdaf8b8
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
48 files changed, 743 insertions, 257 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20200327.bb index a1acfcd005..4c3177c05f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20200327.bb @@ -10,14 +10,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ " -SRC_URI[md5sum] = "f48b597251a26c522002736652e0300c" -SRC_URI[sha256sum] = "886e12f2cf3df36cde65f32f6ae52bc598eb2599a611b1d8ce5dfdea599e47e2" +SRC_URI[md5sum] = "f7a3c240af305b5282af590541e8f4b7" +SRC_URI[sha256sum] = "466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" inherit autotools-brokensep pkgconfig +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" + EXTRA_OECONF = "--with-ncurses \ --disable-rpath-hack" diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch deleted file mode 100644 index f0fc0bcb2c..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch +++ /dev/null @@ -1,148 +0,0 @@ -Upstream-Status: Submitted [https://github.com/GENIVI/dlt-daemon/pull/204] -From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Date: Sat, 25 Jan 2020 09:08:07 +0100 -Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc - implementation, by adding a missing include for pthread_t reference: - -see https://errors.yoctoproject.org/Errors/Details/308000/ for details - -Thanks Khem Raj <raj.khem@gmail.com> for the report - -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org> ---- - include/dlt/dlt_user.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h -index 69cb854..766d349 100644 ---- a/include/dlt/dlt_user.h -+++ b/include/dlt/dlt_user.h -@@ -74,6 +74,7 @@ - \{ - */ - # include <mqueue.h> -+# include <pthread.h> - - # if !defined (__WIN32__) - # include <semaphore.h> - -From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Date: Sat, 25 Jan 2020 09:16:14 +0100 -Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict - compiler flags, due to uint being undefined. This is actually an "int" type, - looking at the test implementation - -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org> ---- - src/tests/dlt-test-init-free.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tests/dlt-test-init-free.c b/src/tests/dlt-test-init-free.c -index 96b5245..35b8803 100644 ---- a/src/tests/dlt-test-init-free.c -+++ b/src/tests/dlt-test-init-free.c -@@ -32,7 +32,7 @@ - - void exec(const char *cmd, char *buffer, size_t length); - void printMemoryUsage(); --char *occupyMemory(uint size); -+char *occupyMemory(int size); - void do_example_test(); - void do_dlt_test(); - -@@ -131,7 +131,7 @@ void printMemoryUsage() - printf("%s", result); - } - --char *occupyMemory(uint size) -+char *occupyMemory(int size) - { - char *buf = (char *)malloc(size * sizeof(char)); - - -From c790d61fad382e5d3e648ee99904087eb9bc4a77 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Date: Sat, 25 Jan 2020 09:20:48 +0100 -Subject: [PATCH 3/3] sys/poll.h: deprecate old sys/poll.h include header, now - glibc/musl wants poll.h being included directly. This fixes a build failure - on musl systems with strict c hardening flags - -Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org> ---- - src/console/logstorage/dlt-logstorage-ctrl.c | 2 +- - src/daemon/dlt_daemon_event_handler.c | 2 +- - src/daemon/dlt_daemon_event_handler.h | 2 +- - src/daemon/dlt_daemon_event_handler_types.h | 2 +- - src/lib/dlt_user.c | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c b/src/console/logstorage/dlt-logstorage-ctrl.c -index 525c137..6614f44 100644 ---- a/src/console/logstorage/dlt-logstorage-ctrl.c -+++ b/src/console/logstorage/dlt-logstorage-ctrl.c -@@ -61,7 +61,7 @@ - #include <string.h> - #include <getopt.h> - --#include <sys/poll.h> -+#include <poll.h> - - #if defined(__linux__) - # include "sd-daemon.h" -diff --git a/src/daemon/dlt_daemon_event_handler.c b/src/daemon/dlt_daemon_event_handler.c -index 1611f7b..0d463da 100644 ---- a/src/daemon/dlt_daemon_event_handler.c -+++ b/src/daemon/dlt_daemon_event_handler.c -@@ -30,7 +30,7 @@ - #include <string.h> - #include <errno.h> - --#include <sys/poll.h> -+#include <poll.h> - #include <syslog.h> - - #include "dlt_common.h" -diff --git a/src/daemon/dlt_daemon_event_handler.h b/src/daemon/dlt_daemon_event_handler.h -index eb96101..bd550d3 100644 ---- a/src/daemon/dlt_daemon_event_handler.h -+++ b/src/daemon/dlt_daemon_event_handler.h -@@ -25,7 +25,7 @@ - * \file dlt_daemon_event_handler.h - */ - --#include <sys/poll.h> -+#include <poll.h> - - #include "dlt_daemon_connection_types.h" - #include "dlt_daemon_event_handler_types.h" -diff --git a/src/daemon/dlt_daemon_event_handler_types.h b/src/daemon/dlt_daemon_event_handler_types.h -index 370e503..0b16d08 100644 ---- a/src/daemon/dlt_daemon_event_handler_types.h -+++ b/src/daemon/dlt_daemon_event_handler_types.h -@@ -25,7 +25,7 @@ - * \file dlt_daemon_event_handler_types.h - */ - --#include <sys/poll.h> -+#include <poll.h> - - #include "dlt_daemon_connection_types.h" - -#diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c -#index ffa9b09..511f991 100644 -#--- a/src/lib/dlt_user.c -#+++ b/src/lib/dlt_user.c -#@@ -43,7 +43,7 @@ -# #include <errno.h> -# -# #include <sys/uio.h> /* writev() */ -#-#include <sys/poll.h> -#+#include <poll.h> -# -# #include <limits.h> -# #ifdef linux diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch new file mode 100644 index 0000000000..14c44e6edd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch @@ -0,0 +1,35 @@ +From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Fri, 31 Jul 2020 15:26:35 +0200 +Subject: [PATCH] dlt_offline: fix build failures with gcc-10 + +see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140 + +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_client.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_offline_logstorage.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +--- + src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h +index b58da70..8ad84b8 100644 +--- a/src/offlinelogstorage/dlt_offline_logstorage.h ++++ b/src/offlinelogstorage/dlt_offline_logstorage.h +@@ -114,9 +114,9 @@ + #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s)) + + /* logstorage max cache */ +-unsigned int g_logstorage_cache_max; ++static unsigned int g_logstorage_cache_max; + /* current logstorage cache size */ +-unsigned int g_logstorage_cache_size; ++static unsigned int g_logstorage_cache_size; + + typedef struct + { diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch new file mode 100644 index 0000000000..7d8f22ec78 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch @@ -0,0 +1,30 @@ +From b8f9919f000e642fc8970d0a42c1bdadf5a9d720 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Mon, 10 Aug 2020 08:30:34 +0200 +Subject: [PATCH] sd-daemon.c: Fix build with newer glibc and musl libc + +Reported by Khem Raj on meta-oe list + +TOPDIR/build/tmp/work/armv7vet2hf-neon-yoe-linux-musleabi/dlt-daemon/2.18.5-r0/recipe-sysroot/usr/include/sys/fcntl.h:1:2: error: redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Werror,-W#warnings] + ^ +1 error generated. + +Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org> +--- + systemd/3rdparty/sd-daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/3rdparty/sd-daemon.c b/systemd/3rdparty/sd-daemon.c +index 88936d2..de3f985 100644 +--- a/systemd/3rdparty/sd-daemon.c ++++ b/systemd/3rdparty/sd-daemon.c +@@ -35,7 +35,7 @@ + #ifdef __BIONIC__ + #include <linux/fcntl.h> + #else +-#include <sys/fcntl.h> ++#include <fcntl.h> + #endif + #include <netinet/in.h> + #include <stdlib.h> diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb index 35c638bc78..3a2b405157 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb @@ -17,13 +17,17 @@ DEPENDS = "zlib gzip-native" SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ - file://204.patch \ + file://238.patch \ + file://241.patch \ " -SRCREV = "14ea971be7e808b9c5099c7f404ed3cf341873c4" +SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2" S = "${WORKDIR}/git" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES','systemd', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-console ', '', d)} \ + udp-connection dlt-system dlt-filetransfer " +# dlt-dbus + # General options PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd" @@ -37,6 +41,7 @@ PACKAGECONFIG[udp-connection] = "-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION= # Command line options PACKAGECONFIG[dlt-system] = "-DWITH_DLT_SYSTEM=ON,-DWITH_DLT_SYSTEM=OFF" PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt-daemon-systemd" +PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF" PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" inherit autotools gettext cmake systemd @@ -46,7 +51,8 @@ EXTRA_OECMAKE += "-DSYSTEMD_UNITDIR=${systemd_system_unitdir}" PACKAGES += "${PN}-systemd" SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" SYSTEMD_SERVICE_${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-system', 'dlt-system.service', '', d)}" + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-system', 'dlt-system.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-dbus', 'dlt-dbus.service', '', d)}" SYSTEMD_AUTO_ENABLE_${PN} = "enable" SYSTEMD_SERVICE_${PN}-systemd = " \ ${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor', 'dlt-adaptor-udp.service', '', d)} \ 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 21d13ac935..411268815a 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 @@ -54,5 +54,7 @@ EXTRA_OECMAKE_append_riscv64 = " -DFLB_DEPS='atomic'" inherit cmake systemd +CFLAGS += "-fcommon" + SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb index 39ceb489e2..894ee52f96 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb @@ -9,9 +9,7 @@ DEPENDS = "p8platform udev ncurses swig-native python3" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}" DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" -PV = "5.0.0" - -SRCREV = "43bc27fe7be491149e6f57d14110e02abdac2f24" +SRCREV = "29d82c80bcc62be2878a9ac080de7eb286c4beb9" SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release \ file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \ file://0001-Enhance-reproducibility.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb index 36659e752d..408fa8ac0e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb @@ -1,5 +1,5 @@ SUMMARY = "A library to handle Apple Property List format whereas it's binary or XML" - +HOMEPAGE = "https://github.com/libimobiledevice/libplist" LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7" @@ -8,9 +8,8 @@ DEPENDS = "libxml2 glib-2.0 swig python3" inherit autotools pkgconfig python3native -SRCREV = "3df02d4d0e9008771e8622fdc10de8333b3f0d85" -SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https \ - " +SRCREV = "c5a30e9267068436a75b5d00fcbf95cb9c1f4dcd" +SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https" S = "${WORKDIR}/git" @@ -20,10 +19,11 @@ do_install_append () { fi } -PACKAGES =+ "${PN}-utils ${PN}++ ${PN}-python" -FILES_${PN} = "${libdir}/libplist${SOLIBS}" -FILES_${PN}++ = "${libdir}/libplist++${SOLIBS}" +PACKAGES =+ "${PN}-utils \ + ${PN}++ \ + ${PN}-python" + +FILES_${PN} = "${libdir}/libplist-2.0${SOLIBS}" +FILES_${PN}++ = "${libdir}/libplist++-2.0${SOLIBS}" FILES_${PN}-utils = "${bindir}/*" FILES_${PN}-python = "${libdir}/python*/site-packages/*" - - diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb index 36fc5c858c..343d0bc63f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb @@ -8,7 +8,7 @@ inherit autotools pkgconfig gitpkgv PKGV = "${GITPKGVTAG}" -SRCREV = "78df9be5fc8222ed53846cb553de9b5d24c85c6c" +SRCREV = "ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af" SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb index 1a9cd8f109..e903de3da3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip ar HOMEPAGE = "https://libzip.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e33bb117aa55f9aad3d28e29256f9919" +LIC_FILES_CHKSUM = "file://LICENSE;md5=067e9870bba57e1ce20695c4d5672f30" DEPENDS = "zlib bzip2" @@ -15,4 +15,4 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" -SRC_URI[sha256sum] = "a020dc1b17a79faa748e43a05f8605d65e403813e8e97ad3a300a90ddba097ac" +SRC_URI[sha256sum] = "a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132" diff --git a/meta-openembedded/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch b/meta-openembedded/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch new file mode 100644 index 0000000000..5748690445 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch @@ -0,0 +1,34 @@ +From 6358561d5bad34f0003ebd415142d504fe53045a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 13 Aug 2020 11:42:08 -0700 +Subject: [PATCH] checkpc: Do not define Mail_fd multiple times + +Its also defines in var.c via lp.h this is flagged when -fno-common is +used + +Fixes +TOPDIR/build/tmp/work/core2-32-yoe-linux/lprng/3.8.C-r0/recipe-sysroot-native/usr/bin/i686-yoe-linux/i686-yoe-linux-ld: vars.o:/usr/src/debug/lprng/3.8.C-r0/build/src/../../lprng-3.8.C/src/include/lp.h:72: multiple definition of `Mail_fd'; checkpc.o:/usr/src/debug/lprng/3.8.C-r0/build/src/../../lprng-3.8.C/src/common/checkpc.c:35: first defined here +clang-11: error: linker command failed with exit code 1 (use -v to see invocation) + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/common/checkpc.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/common/checkpc.c b/src/common/checkpc.c +index aa03b08..7334094 100644 +--- a/src/common/checkpc.c ++++ b/src/common/checkpc.c +@@ -32,8 +32,6 @@ static int Remove; + static char *User_specified_printer; + static time_t Current_time; + static int Check_path_list( char *plist, int allow_missing ); +-int Mail_fd; +- + + /* pathnames of the spool directory (sd) and control directory (cd) */ + +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb b/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb index 963c6320f2..4432342366 100644 --- a/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb +++ b/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb @@ -3,7 +3,9 @@ SECTION = "console/utils" LICENSE = "GPLv2 | Artistic-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c6570d8d699af1883db9d0e733ac9bfb" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ + file://0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch \ + " SRC_URI[md5sum] = "5901bed95e61d2bea3ba3056056af432" SRC_URI[sha256sum] = "694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10" diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch new file mode 100644 index 0000000000..d813b37f99 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch @@ -0,0 +1,39 @@ +From 609e1745d26d6f42d426018a4dd8d2342d6fc170 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 18 Aug 2020 08:37:57 -0700 +Subject: [PATCH] Add -lxml2 to linker cmdline of xml is found + +When cross compiling for systems where static libs +for libxml are not available cmake's detection mechanism +resort to linking with libxml.so but doesnt use -lxml2 +liblldbHost.a however requires libxml on linker +cmdline _after_ itself so its use of symbols from libxml2 +can be resolved. Here check for libxml2 being detected and +add it if its found. + +Fixes +minifi-cpp/0.7.0-r0/recipe-sysroot-native/usr/lib/libxml2.so is incompatible with elf32-i386 +| clang-11: error: linker command failed with exit code 1 (use -v to see invocation) + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + thirdparty/libarchive-3.3.2/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/thirdparty/libarchive-3.3.2/CMakeLists.txt b/thirdparty/libarchive-3.3.2/CMakeLists.txt +index 0c1ea6f7..cde0cc51 100644 +--- a/thirdparty/libarchive-3.3.2/CMakeLists.txt ++++ b/thirdparty/libarchive-3.3.2/CMakeLists.txt +@@ -1031,7 +1031,7 @@ ENDIF() + IF(LIBXML2_FOUND) + CMAKE_PUSH_CHECK_STATE() # Save the state of the variables + INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +- LIST(APPEND ADDITIONAL_LIBS ${LIBXML2_LIBRARIES}) ++ LIST(APPEND ADDITIONAL_LIBS xml2) + SET(HAVE_LIBXML2 1) + # libxml2's include files use iconv.h + SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch new file mode 100644 index 0000000000..d0febfd534 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch @@ -0,0 +1,34 @@ +diff -urN -x .git orig/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch patched/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch +--- orig/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch 1970-01-01 09:00:00.000000000 +0900 ++++ patched/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch 2020-08-07 23:14:46.196764271 +0900 +@@ -0,0 +1,30 @@ ++This patch was imported from the libressl potable. ++https://github.com/libressl-portable/portable/commit/a9332ccecfce63bf54924e70c11f420edd3ae312 ++ ++From a9332ccecfce63bf54924e70c11f420edd3ae312 Mon Sep 17 00:00:00 2001 ++From: Brent Cook <bcook@openbsd.org> ++Date: Sun, 17 Jul 2016 18:12:23 -0500 ++Subject: [PATCH] avoid BSWAP assembly for ARM <= v6 ++ ++diff -urN orig/crypto/modes/modes_lcl.h patched/crypto/modes/modes_lcl.h ++--- orig/crypto/modes/modes_lcl.h 2018-11-18 21:27:10.000000000 +0900 +++++ patched/crypto/modes/modes_lcl.h 2020-08-07 23:11:01.960764745 +0900 ++@@ -45,14 +45,16 @@ ++ asm ("bswapl %0" \ ++ : "+r"(ret)); ret; }) ++ # elif (defined(__arm__) || defined(__arm)) && !defined(__STRICT_ALIGNMENT) ++-# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ +++# if (__ARM_ARCH >= 6) +++# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ ++ asm ("rev %0,%0; rev %1,%1" \ ++ : "+r"(hi),"+r"(lo)); \ ++ (u64)hi<<32|lo; }) ++-# define BSWAP4(x) ({ u32 ret; \ +++# define BSWAP4(x) ({ u32 ret; \ ++ asm ("rev %0,%1" \ ++ : "=r"(ret) : "r"((u32)(x))); \ ++ ret; }) +++# endif ++ # endif ++ #endif ++ #endif diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-compile.patch new file mode 100644 index 0000000000..84b8c8cb0e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-compile.patch @@ -0,0 +1,43 @@ +diff -urN -x .git orig/cmake/LibreSSL.cmake patched/cmake/LibreSSL.cmake +--- orig/cmake/LibreSSL.cmake 2020-08-07 21:58:34.660773928 +0900 ++++ patched/cmake/LibreSSL.cmake 2020-08-07 22:51:18.620767245 +0900 +@@ -18,6 +18,9 @@ + function(use_libre_ssl SOURCE_DIR BINARY_DIR) + message("Using bundled LibreSSL from release") + ++ find_package(Patch REQUIRED) ++ set(PATCH "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch") ++ + set(BYPRODUCT_PREFIX "lib" CACHE STRING "" FORCE) + set(BYPRODUCT_SUFFIX ".a" CACHE STRING "" FORCE) + +@@ -27,16 +30,29 @@ + set(BYPRODUCT_PREFIX "" CACHE STRING "" FORCE) + set(BUILD_ARGS " -GVisual Studio 15 2017") + endif(WIN32) ++ ++ set(BYPRODUCTS ++ "lib/${BYPRODUCT_PREFIX}crypto${BYPRODUCT_SUFFIX}" ++ "lib/${BYPRODUCT_PREFIX}ssl${BYPRODUCT_SUFFIX}" ++ "lib/${BYPRODUCT_PREFIX}tls${BYPRODUCT_SUFFIX}" ++ ) ++ set(LIBRESSL_INSTALL_DIR "${BINARY_DIR}/thirdparty/libressl-install" CACHE STRING "" FORCE) ++ FOREACH(BYPRODUCT ${BYPRODUCTS}) ++ LIST(APPEND LIBRESSL_LIBRARIES_LIST "${LIBRESSL_INSTALL_DIR}/${BYPRODUCT}") ++ ENDFOREACH(BYPRODUCT) ++ + ExternalProject_Add( + libressl-portable + URL https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://gentoo.osuosl.org/distfiles/libressl-2.8.3.tar.gz + URL_HASH "SHA256=9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477" + SOURCE_DIR "${BINARY_DIR}/thirdparty/libressl-src" ++ PATCH_COMMAND ${PATCH} + CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} + "-DCMAKE_INSTALL_PREFIX=${BINARY_DIR}/thirdparty/libressl-install" + "-DLIBRESSL_APPS=OFF" + "-DLIBRESSL_TESTS=OFF" + "${BUILD_ARGS}" ++ BUILD_BYPRODUCTS ${LIBRESSL_LIBRARIES_LIST} + ) + + add_library(crypto STATIC IMPORTED) diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-minifi-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-minifi-compile.patch new file mode 100644 index 0000000000..9653ba3426 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-minifi-compile.patch @@ -0,0 +1,60 @@ +diff -urN -x .git orig/CMakeLists.txt patched/CMakeLists.txt +--- orig/CMakeLists.txt 2020-08-07 21:58:34.656773928 +0900 ++++ patched/CMakeLists.txt 2020-08-10 15:08:31.800278357 +0900 +@@ -119,13 +119,28 @@ + endif() + endif() + ++include(CheckCXXSourceCompiles) ++CHECK_CXX_SOURCE_COMPILES(" ++ #include <atomic> ++ int main(int argc, char **argv) { ++ uint8_t m; ++ __atomic_load_8(&m, 0); ++ __atomic_fetch_add_1(&m , 0, 0); ++ return 0; ++ }" ++ HAVE_ATOMIC ++) ++if(NOT HAVE_ATOMIC) ++ set(LIB_ATOMIC atomic) ++endif() ++ + # Use ccache if present +-find_program(CCACHE_FOUND ccache) +-if(CCACHE_FOUND) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) +- message("-- Found ccache: ${CCACHE_FOUND}") +-endif(CCACHE_FOUND) ++#find_program(CCACHE_FOUND ccache) ++#if(CCACHE_FOUND) ++# set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) ++# set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) ++# message("-- Found ccache: ${CCACHE_FOUND}") ++#endif(CCACHE_FOUND) + + if (UNIX AND USE_GOLD_LINKER AND NOT APPLE ) + execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE ld_version) +@@ -303,8 +318,10 @@ + GIT_TAG "f3294d9d86e6a7915a967efff2842089b8b0d071" # Version 7.64.0 + SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-src" + LIST_SEPARATOR % # This is needed for passing semicolon-separated lists ++ TLS_VERIFY OFF + CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} + "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-install" ++ "-DCMAKE_INSTALL_LIBDIR=lib${LIBSUFFIX}" + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DBUILD_CURL_EXE=OFF + -DBUILD_TESTING=OFF +diff -urN -x .git orig/libminifi/CMakeLists.txt patched/libminifi/CMakeLists.txt +--- orig/libminifi/CMakeLists.txt 2020-08-07 21:58:34.676773928 +0900 ++++ patched/libminifi/CMakeLists.txt 2020-08-10 15:06:17.124278642 +0900 +@@ -108,6 +108,7 @@ + add_library(spdlog STATIC ${SPD_SOURCES}) + add_library(core-minifi STATIC ${SOURCES}) + target_link_libraries(core-minifi ${CMAKE_DL_LIBS} yaml-cpp) ++target_link_libraries(core-minifi ${LIB_ATOMIC}) + + #target_link_libraries(core-minifi PRIVATE bsdiff ) + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-compile.patch new file mode 100644 index 0000000000..42e1e583c3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-compile.patch @@ -0,0 +1,36 @@ +diff -urN -x .git orig/cmake/BundledOSSPUUID.cmake patched/cmake/BundledOSSPUUID.cmake +--- orig/cmake/BundledOSSPUUID.cmake 2020-08-07 21:58:34.660773928 +0900 ++++ patched/cmake/BundledOSSPUUID.cmake 2020-08-07 22:05:57.404772993 +0900 +@@ -22,7 +22,9 @@ + + # Define patch step + find_package(Patch REQUIRED) +- set(PC "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch") ++ set(PATCH1 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch") ++ set(PATCH2 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch") ++ set(PATCH3 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch") + + # Define byproducts + set(BYPRODUCTS "lib/libuuid.a" +@@ -35,7 +37,9 @@ + ENDFOREACH(BYPRODUCT) + + # Build project +- set(CONFIGURE_COMMAND ./configure "CFLAGS=-fPIC" "CXXFLAGS=-fPIC" --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install") ++ set(CONFIGURE_COMMAND ac_cv_va_copy=C99 ./configure CFLAGS=-fPIC CXXFLAGS=-fPIC --host=${HOST_SYS} ++ --with-cxx --without-perl --without-php --without-pgsql ++ --prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install) + string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type) + if(NOT build_type MATCHES debug) + list(APPEND CONFIGURE_COMMAND --enable-debug=yes) +@@ -52,8 +56,8 @@ + UPDATE_COMMAND "" + INSTALL_COMMAND make install + BUILD_BYPRODUCTS ${OSSPUUID_LIBRARIES_LIST} +- CONFIGURE_COMMAND "" +- PATCH_COMMAND ${PC} && ${CONFIGURE_COMMAND} ++ CONFIGURE_COMMAND ${CONFIGURE_COMMAND} ++ PATCH_COMMAND ${PATCH1} && ${PATCH2} && ${PATCH3} + STEP_TARGETS build + EXCLUDE_FROM_ALL TRUE + ) diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-cross-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-cross-compile.patch new file mode 100644 index 0000000000..dc354d9ac7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-cross-compile.patch @@ -0,0 +1,37 @@ +diff -urN -x .git orig/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch patched/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch +--- orig/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch 1970-01-01 09:00:00.000000000 +0900 ++++ patched/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch 2020-08-07 22:28:04.396770190 +0900 +@@ -0,0 +1,33 @@ ++diff -urN orig/config.sub patched/config.sub ++--- orig/config.sub 2008-07-05 06:43:08.000000000 +0900 +++++ patched/config.sub 2020-08-07 22:23:48.412770731 +0900 ++@@ -238,6 +238,8 @@ ++ # Some are omitted here because they have special meanings below. ++ 1750a | 580 \ ++ | a29k \ +++ | aarch64 | aarch64_be \ +++ | riscv32 | riscv64 \ ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++@@ -314,6 +316,8 @@ ++ # Recognize the basic CPU types with company name. ++ 580-* \ ++ | a29k-* \ +++ | aarch64-* | aarch64_be-* \ +++ | riscv32-* | riscv64-* \ ++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++diff -urN orig/shtool patched/shtool ++--- orig/shtool 2008-07-05 06:43:08.000000000 +0900 +++++ patched/shtool 2020-08-07 22:21:23.192771037 +0900 ++@@ -1400,7 +1400,7 @@ ++ if [ ".$opt_t" = .yes ]; then ++ echo "strip $dsttmp" 1>&2 ++ fi ++- strip $dsttmp || shtool_exit $? +++ $STRIP $dsttmp || shtool_exit $? ++ fi ++ if [ ".$opt_o" != . ]; then ++ if [ ".$opt_t" = .yes ]; then diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-musl-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-musl-compile.patch new file mode 100644 index 0000000000..7caf848eb5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-musl-compile.patch @@ -0,0 +1,25 @@ +diff -urN -x .git orig/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch patched/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch +--- orig/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch 1970-01-01 09:00:00.000000000 +0900 ++++ patched/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch 2020-08-07 11:22:49.344854508 +0900 +@@ -0,0 +1,21 @@ ++diff -urN orig/config.sub patched/config.sub ++--- orig/config.sub 2008-07-05 06:43:08.000000000 +0900 +++++ patched/config.sub 2020-08-07 11:19:25.948854937 +0900 ++@@ -120,7 +120,7 @@ ++ # Here we must recognize all the valid KERNEL-OS combinations. ++ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` ++ case $maybe_os in ++- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | linux-musl* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) ++ os=-$maybe_os ++@@ -1250,7 +1250,7 @@ ++ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -chorusos* | -chorusrdb* \ ++ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ +++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* | -linux-musl* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ ++ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-rocksdb-cross-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-rocksdb-cross-compile.patch new file mode 100644 index 0000000000..8c5db7c9e3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-rocksdb-cross-compile.patch @@ -0,0 +1,12 @@ +diff -urN orig/thirdparty/rocksdb/CMakeLists.txt patched/thirdparty/rocksdb/CMakeLists.txt +--- orig/thirdparty/rocksdb/CMakeLists.txt 2020-07-28 11:39:40.254677515 +0900 ++++ patched/thirdparty/rocksdb/CMakeLists.txt 2020-07-28 11:51:11.898676054 +0900 +@@ -618,6 +618,7 @@ + add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES}) + target_link_libraries(${ROCKSDB_STATIC_LIB} + ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) ++target_link_libraries(${ROCKSDB_STATIC_LIB} ${LIB_ATOMIC}) + + if(WIN32) + # add_library(${ROCKSDB_IMPORT_LIB} SHARED ${SOURCES}) + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service new file mode 100644 index 0000000000..5802a7b2fd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service @@ -0,0 +1,13 @@ +[Unit] +Description=MiNiFi Service +After=network.target +RequiresMountsFor=/var + +[Service] +Type=simple +WorkingDirectory=@LOCALSTATEDIR@/run/minifi +Environment=MINIFI_HOME=@SYSCONFDIR@/minifi +ExecStart=@BINDIR@/minifi + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch new file mode 100644 index 0000000000..2d66576f6e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch @@ -0,0 +1,38 @@ +From bfce136fa9ff1e955928539484ba4dd55f98f05b Mon Sep 17 00:00:00 2001 +From: Willem Jan Withagen <wjw@digiware.nl> +Date: Sun, 16 Aug 2020 23:38:55 +0200 +Subject: [PATCH] Update channel.h + +Compiling this on FreeBSD with CLang fails due to: +```In file included from /usr/ports/net/ceph15/work/ceph-15.2.4/src/rocksdb/utilities/backupable/backupable_db.cc:16: +/usr/ports/net/ceph15/work/ceph-15.2.4/src/rocksdb/util/channel.h:35:33: error: no matching constructor for initialization of 'std::lock_guard<std::mutex>' + std::lock_guard<std::mutex> lk(lock_); + ^ ~~~~~ +/usr/include/c++/v1/__mutex_base:90:14: note: candidate constructor not viable: 1st argument ('const std::mutex') would lose const qualifier + explicit lock_guard(mutex_type& __m) _LIBCPP_THREAD_SAFETY_ANNOTATION(acquire_capability(__m)) + ^ +/usr/include/c++/v1/__mutex_base:100:5: note: candidate constructor not viable: no known conversion from 'const std::mutex' to 'const std::__1::lock_guard<std::__1::mutex>' for 1st argument + lock_guard(lock_guard const&) _LIBCPP_EQUAL_DELETE; + ^ +/usr/include/c++/v1/__mutex_base:94:5: note: candidate constructor not viable: requires 2 arguments, but 1 was provided + lock_guard(mutex_type& __m, adopt_lock_t) _LIBCPP_THREAD_SAFETY_ANNOTATION(requires_capability(__m)) + ^ +1 error generated. +``` +--- + thirdparty/rocksdb/util/channel.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/thirdparty/rocksdb/util/channel.h b/thirdparty/rocksdb/util/channel.h +index 705fa2d28f..993bef5bc0 100644 +--- a/thirdparty/rocksdb/util/channel.h ++++ b/thirdparty/rocksdb/util/channel.h +@@ -31,7 +31,7 @@ class channel { + return buffer_.empty() && eof_; + } + +- size_t size() const { ++ size_t size() { + std::lock_guard<std::mutex> lk(lock_); + return buffer_.size(); + } diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf new file mode 100644 index 0000000000..c828b49fa3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf @@ -0,0 +1,2 @@ +d @MINIFI_RUN@ 0755 root root - +d @MINIFI_LOG@ 0755 root root - diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf new file mode 100644 index 0000000000..2ad14e677b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf @@ -0,0 +1,2 @@ +d root root 0755 @MINIFI_RUN@ none +d root root 0755 @MINIFI_LOG@ none 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 new file mode 100644 index 0000000000..37036ebbb4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -0,0 +1,120 @@ +SUMMARY = "A subproject of Apache NiFi to collect data where it originates." +DESCRIPTION = "MiNiFi--a subproject of Apache NiFi--is a complementary \ +data collection approach that supplements the core tenets of NiFi in dataflow \ +management, focusing on the collection of data at the source of its creation." +HOMEPAGE = "https://nifi.apache.org/minifi/index.html" +SECTION = "console/network" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9534eb5f4ab800b573a37bffc62f3a7" + +DEPENDS = "virtual/crypt expat flex python3 bison-native libxml2" +RDEPENDS_${PN} = "python3-core" + +SRCREV = "aa42957a2e227df41510047cece3cd606dc1cb6a" +SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ + file://fix-minifi-compile.patch \ + file://fix-libressl-compile.patch \ + file://fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch \ + file://fix-osspuuid-compile.patch \ + file://fix-osspuuid-cross-compile.patch \ + file://fix-osspuuid-musl-compile.patch \ + file://fix-rocksdb-cross-compile.patch \ + file://remove_const_due_to_std_lock_guard.patch \ + file://0001-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch \ + file://minifi.service \ + file://systemd-volatile.conf \ + file://sysvinit-volatile.conf \ + " +S = "${WORKDIR}/git" + +inherit pkgconfig cmake systemd + +SYSTEMD_PACKAGES = "minifi-cpp" +SYSTEMD_SERVICE_${PN} = "minifi.service" +SYSTEMD_AUTO_ENABLE = "disable" + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" + +EXTRA_OECMAKE += " \ + -DHOST_SYS=${HOST_SYS} -DBUILD_SYS=${BUILD_SYS} \ + -DSKIP_TESTS=ON \ + " +EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib" +LDFLAGS_append_toolchain-clang = " -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" + + +do_install() { + DESTDIR='${B}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} + + MINIFI_BIN=${base_prefix}${bindir} + MINIFI_HOME=${base_prefix}${sysconfdir}/minifi + MINIFI_RUN=${base_prefix}${localstatedir}/run/minifi + MINIFI_LOG=${base_prefix}${localstatedir}/log/minifi + + install -d ${D}${MINIFI_BIN} + install -d ${D}${MINIFI_HOME}/conf + cp -a ${B}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ + cp -a ${B}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ + + sed -i 's|#appender.rolling.directory=.*|appender.rolling.directory='${MINIFI_LOG}'|g' \ + ${D}${MINIFI_HOME}/conf/minifi-log.properties + sed -i 's|nifi.provenance.repository.directory.default=.*|nifi.provenance.repository.directory.default='${MINIFI_RUN}'/provenance_repository|g' \ + ${D}${MINIFI_HOME}/conf/minifi.properties + sed -i 's|nifi.flowfile.repository.directory.default=.*|nifi.flowfile.repository.directory.default='${MINIFI_RUN}'/flowfile_repository|g' \ + ${D}${MINIFI_HOME}/conf/minifi.properties + sed -i 's|nifi.database.content.repository.directory.default=.*|nifi.database.content.repository.directory.default='${MINIFI_RUN}'/content_repository|g' \ + ${D}${MINIFI_HOME}/conf/minifi.properties + sed -i 's|nifi.flow.configuration.file=.*|nifi.flow.configuration.file='${MINIFI_HOME}'/conf/config.yml|g' \ + ${D}${MINIFI_HOME}/conf/minifi.properties + + sed -i 's|export MINIFI_HOME=.*|export MINIFI_HOME='${MINIFI_HOME}'|g' ${D}${MINIFI_BIN}/minifi.sh + sed -i 's|bin_dir=${MINIFI_HOME}/bin|bin_dir='${MINIFI_BIN}'|g' ${D}${MINIFI_BIN}/minifi.sh + sed -i 's|pid_file=${bin_dir}|pid_file='${MINIFI_RUN}'|g' ${D}${MINIFI_BIN}/minifi.sh + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${WORKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + install -m 0755 -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/minifi.service ${D}${systemd_unitdir}/system/ + + sed -i 's|@LOCALSTATEDIR@|${localstatedir}|g' ${D}${systemd_unitdir}/system/minifi.service + sed -i 's|@SYSCONFDIR@|${sysconfdir}|g' ${D}${systemd_unitdir}/system/minifi.service + sed -i 's|@BINDIR@|${bindir}|g' ${D}${systemd_unitdir}/system/minifi.service + + sed -i 's|@MINIFI_RUN@|'${MINIFI_RUN}'|g' ${D}${sysconfdir}/tmpfiles.d/systemd-volatile.conf + sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/tmpfiles.d/systemd-volatile.conf + + elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi + + sed -i 's|@MINIFI_RUN@|'${MINIFI_RUN}'|g' ${D}${sysconfdir}/default/volatiles/99_minifi + sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/default/volatiles/99_minifi + fi +} + +pkg_postinst_${PN}() { + if [ -z "$D" ]; then + if type systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + fi +} + +FILES_${PN} = " \ + ${bindir} \ + ${sysconfdir} \ + ${systemd_unitdir} \ + " diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.3.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.5.bb index 43021c5342..7527298c24 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.5.bb @@ -25,7 +25,7 @@ SRC_URI = " \ gitsm://github.com/ostreedev/ostree \ file://run-ptest \ " -SRCREV = "6ed48234ba579ff73eb128af237212b0a00f2057" +SRCREV = "63797cb750b4b2a05c5143613d89de9df99df9df" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb index 92741d8178..01233699a5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb @@ -10,3 +10,5 @@ SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=2.x \ inherit cmake S = "${WORKDIR}/git" + +CXXFLAGS += " -Wno-error=type-limits" diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch deleted file mode 100644 index 8e2b3c7cbb..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 721a48e5397bd4ab454482041e55671eae7b189f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 11 May 2020 18:01:11 -0700 -Subject: [PATCH] examples: Initialize child_idx - -Assign UINT_MAX and assert it - -Fixes warning -rtree_map.c:358:12: error: 'child_idx' may be used uninitialized -in this function [-Werror=maybe-uninitialized] - -Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/4802] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/examples/libpmemobj/tree_map/rtree_map.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/examples/libpmemobj/tree_map/rtree_map.c b/src/examples/libpmemobj/tree_map/rtree_map.c -index 995e22bb9..6b3ead65c 100644 ---- a/src/examples/libpmemobj/tree_map/rtree_map.c -+++ b/src/examples/libpmemobj/tree_map/rtree_map.c -@@ -8,6 +8,7 @@ - #include <ex_common.h> - #include <assert.h> - #include <errno.h> -+#include <limits.h> - #include <stdlib.h> - #include <stdbool.h> - -@@ -320,12 +321,13 @@ has_only_one_child(TOID(struct tree_map_node) node, unsigned *child_idx) - static void - remove_extra_node(TOID(struct tree_map_node) *node) - { -- unsigned child_idx; -+ unsigned child_idx = UINT_MAX; - TOID(struct tree_map_node) tmp, tmp_child; - - /* Our node has child with only one child. */ - tmp = *node; - has_only_one_child(tmp, &child_idx); -+ assert(child_idx != UINT_MAX); - tmp_child = D_RO(tmp)->slots[child_idx]; - - /* --- -2.26.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch deleted file mode 100644 index 82b96cf95e..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3863d8bd71d6a5638cf984f8d8f9cccac0c7f2a4 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Mon, 23 Jul 2018 11:31:17 -0700 -Subject: [PATCH] Makefile: Don't install the docs - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Inappropriate [disable feature] ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 47a447f12..7c0f9848f 100644 ---- a/Makefile -+++ b/Makefile -@@ -148,7 +148,6 @@ rpm dpkg: pkg-clean - - install uninstall: - $(MAKE) -C src $@ -- $(MAKE) -C doc $@ - - .PHONY: all clean clobber test check cstyle check-license install uninstall\ - source rpm dpkg pkg-clean pcheck check-remote format doc require-rpmem\ --- -2.14.4 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.8.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb index fe7b760e22..8bb89f418c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Persistent Memory Development Kit" HOMEPAGE = "http://pmem.io" SECTION = "libs" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1b8430f251523f1bff0c9fb95da7e0ca" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b44ee63f162f9cdb18fff1224877aafd" DEPENDS = "ndctl" # Required to have the fts.h header for musl @@ -11,12 +11,9 @@ DEPENDS_append_libc-musl = " fts" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/pmem/pmdk.git \ - file://0001-examples-Initialize-child_idx.patch \ - file://0002-Makefile-Don-t-install-the-docs.patch \ - " +SRC_URI = "git://github.com/pmem/pmdk.git" -SRCREV = "0245d75eaf0f6106c86a7926a45fdf2149e37eaa" +SRCREV = "1926ffb8f3f5f0617b3b3ed32029d437c272f187" inherit autotools-brokensep pkgconfig @@ -25,7 +22,7 @@ inherit autotools-brokensep pkgconfig # | If you meant to cross compile, use `--host'. # # Also fix #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] -EXTRA_OEMAKE = "BUILD_EXAMPLES='n' HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" +EXTRA_OEMAKE = "BUILD_EXAMPLES='n' DOC='n' HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" # Fix the missing fts libs when using musl EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.6.bb index 893f323d34..c9846c5c73 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.6.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Redis is an open source, advanced key-value store." HOMEPAGE = "http://redis.io" SECTION = "libs" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" DEPENDS = "readline lua ncurses" SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ @@ -17,8 +17,8 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ " -SRC_URI[md5sum] = "617d680fc0944c217e2350a365686eb0" -SRC_URI[sha256sum] = "42cf86a114d2a451b898fcda96acd4d01062a7dbaaad2801d9164a36f898f596" +SRC_URI[md5sum] = "2f65e1f5610d98dd48e10eef49c79b02" +SRC_URI[sha256sum] = "12ad49b163af5ef39466e8d2f7d212a58172116e5b441eebecb4e6ca22363d94" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Avoid-variable-definition-in-header-files.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Avoid-variable-definition-in-header-files.patch new file mode 100644 index 0000000000..b0b43f357c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Avoid-variable-definition-in-header-files.patch @@ -0,0 +1,100 @@ +From fccbb85beb89b9ca35cac87fb553ef124a6c516b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 13 Aug 2020 17:26:14 -0700 +Subject: [PATCH] Avoid variable definition in header files + +This can cause multiple definitions to be emitted into objects and link +fail as a result with gcc-10+ since it defaults to -fno-common, patch +moves the definitions to source files + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + control.h | 2 +- + providerMgr.c | 1 + + providerMgr.h | 2 +- + sfcBroker.c | 2 +- + trace.c | 1 + + trace.h | 2 +- + 6 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/control.h b/control.h +index e41e4b9..5e15363 100644 +--- a/control.h ++++ b/control.h +@@ -28,7 +28,7 @@ int getControlUNum(char *id, unsigned int *val); + int getControlULong(char *id, unsigned long *val); + int getControlNum(char *id, long *val); + int getControlBool(char *id, int *val); +-const char * sfcBrokerStart; ++extern const char * sfcBrokerStart; + + #endif + /* MODELINES */ +diff --git a/providerMgr.c b/providerMgr.c +index c38a7d3..ff6d38d 100644 +--- a/providerMgr.c ++++ b/providerMgr.c +@@ -53,6 +53,7 @@ + #define SFCB_ASM(x) + #endif + ++sigset_t mask, old_mask; + static pthread_mutex_t resultsocketMutex = PTHREAD_MUTEX_INITIALIZER; + + extern CMPIBroker *Broker; +diff --git a/providerMgr.h b/providerMgr.h +index 3cc7745..fbbfecd 100644 +--- a/providerMgr.h ++++ b/providerMgr.h +@@ -398,7 +398,7 @@ BinResponseHdr **invokeProviders(BinRequestContext * binCtx, int *err, + BinResponseHdr *invokeProvider(BinRequestContext * ctx); + void freeResponseHeaders(BinResponseHdr ** resp, + BinRequestContext * ctx); +-sigset_t mask, old_mask; ++extern sigset_t mask, old_mask; + + #endif + /* MODELINES */ +diff --git a/sfcBroker.c b/sfcBroker.c +index ca043c9..85581f5 100644 +--- a/sfcBroker.c ++++ b/sfcBroker.c +@@ -53,7 +53,7 @@ + #endif + + int sfcBrokerPid = 0; +- ++const char *sfcBrokerStart; + extern int sfcbUseSyslog; + + extern void setExFlag(unsigned long f); +diff --git a/trace.c b/trace.c +index 438af46..23597e1 100644 +--- a/trace.c ++++ b/trace.c +@@ -52,6 +52,7 @@ char *processName = NULL; + int providerProcess = 0; + int idleThreadId = 0; + int terminating = 0; ++int colorTrace; + + int _sfcb_debug = 0; + unsigned long _sfcb_trace_mask = 0; +diff --git a/trace.h b/trace.h +index 2c6d8be..ea39850 100644 +--- a/trace.h ++++ b/trace.h +@@ -130,7 +130,7 @@ typedef struct traceId { + #define CYAN 6 + #define WHITE 7 + void changeTextColor(int reset); +-int colorTrace; ++extern int colorTrace; + + #define MAX_MSG_SIZE 1024 /* max length of trace message */ + +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-Replace-need-for-error.h-when-it-does-not-exist.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch index e723050237..e723050237 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-Replace-need-for-error.h-when-it-does-not-exist.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-include-stdint.h-system-header-for-UINT16_MAX.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-stdint.h-system-header-for-UINT16_MAX.patch index c2111a2c10..c2111a2c10 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-include-stdint.h-system-header-for-UINT16_MAX.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-stdint.h-system-header-for-UINT16_MAX.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.15-fix-provider-debugging.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.15-fix-provider-debugging.patch index 4fbecaa63f..4fbecaa63f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.15-fix-provider-debugging.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.15-fix-provider-debugging.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-maxMsgLen.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-maxMsgLen.patch index a0dd81653d..a0dd81653d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-maxMsgLen.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-maxMsgLen.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-multilib-man-cfg.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-multilib-man-cfg.patch index c8cece2c20..c8cece2c20 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-multilib-man-cfg.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-multilib-man-cfg.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch index 7f95a9da3f..7f95a9da3f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.5-service.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.5-service.patch index eaccfa594c..eaccfa594c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.5-service.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.5-service.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch index 3268d49f43..3268d49f43 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-ftbfs.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-ftbfs.patch index 9548b3c063..9548b3c063 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-ftbfs.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-ftbfs.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch index 7279d84a5d..7279d84a5d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sfcb.service index 5adf63c8a4..5adf63c8a4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sfcb.service diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index a527f773a6..3e4ed7c03c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -26,6 +26,7 @@ SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ file://0001-include-stdint.h-system-header-for-UINT16_MAX.patch \ file://0001-Replace-need-for-error.h-when-it-does-not-exist.patch \ file://sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch \ + file://0001-Avoid-variable-definition-in-header-files.patch \ " SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30" diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-DtaAnnotatedDump-Add-typedef-name-to-the-union.patch b/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-DtaAnnotatedDump-Add-typedef-name-to-the-union.patch new file mode 100644 index 0000000000..4be3353c66 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-DtaAnnotatedDump-Add-typedef-name-to-the-union.patch @@ -0,0 +1,34 @@ +From 9db49b94336f65453e06fb6a6bc4e6edf9403fea Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 17 Aug 2020 17:22:09 -0700 +Subject: [PATCH] DtaAnnotatedDump: Add typedef name to the union + +This is found with clang +error: anonymous non-C-compatible type given name for linkage purposes by +typedef declaration; add a tag name here [-Werror,-Wnon-c-typedef-for-linkage] +| typedef union +| ^ +| CAtomHeader + +Upstream-Status: Submitted [https://github.com/Drive-Trust-Alliance/sedutil/pull/332] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Common/DtaAnnotatedDump.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Common/DtaAnnotatedDump.h b/Common/DtaAnnotatedDump.h +index 2749365..734c8eb 100644 +--- a/Common/DtaAnnotatedDump.h ++++ b/Common/DtaAnnotatedDump.h +@@ -20,7 +20,7 @@ along with sedutil. If not, see <http://www.gnu.org/licenses/>. + + #pragma pack(push,1) + +-typedef union ++typedef union CAtomHeader_t + { + // four bytes in big endian (network) byte order + uint8_t all[4]; +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb index 765618433b..1e7a393193 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb @@ -12,6 +12,7 @@ PV = "${BASEPV}+git${SRCPV}" SRCREV = "358cc758948be788284d5faba46ccf4cc1813796" SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git \ file://0001-Fix-build-on-big-endian-architectures.patch \ + file://0001-DtaAnnotatedDump-Add-typedef-name-to-the-union.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1b.bb index 17c2fbab2b..fde0ed4acf 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1b.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf DEPENDS = "ncurses libevent" SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz" -SRC_URI[md5sum] = "d541ff392249f94c4f3635793556f827" -SRC_URI[sha256sum] = "b17cd170a94d7b58c0698752e1f4f263ab6dc47425230df7e53a6435cc7cd7e8" +SRC_URI[md5sum] = "2cdacbf06ac4980d3f5312ad23b37f9b" +SRC_URI[sha256sum] = "d93f351d50af05a75fe6681085670c786d9504a5da2608e481c47cf5e1486db9" UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb index b94664c33c..7dde4182fb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/HardySimpson/zlog" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "8fc78c3c65cb705953a2f3f9a813c3ef3c8b2270" +SRCREV = "876099f3c66033f3de11d79f63814766b1021dbe" SRC_URI = "git://github.com/HardySimpson/zlog" S = "${WORKDIR}/git" |