summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-support/zchunk
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-06-13 18:40:47 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-06-13 18:45:48 +0300
commit89770b09490d616883ab728cc628a844ca0e1150 (patch)
treea24e3c597afe31a84abbb2685bf10c8ba6c9af74 /meta-openembedded/meta-oe/recipes-support/zchunk
parent4accb8864625d1bb909b299d5ddbc11df53c22d3 (diff)
downloadopenbmc-89770b09490d616883ab728cc628a844ca0e1150.tar.xz
meta-openembedded: subtree update:5caca0f7bd..fe77eaab8f
Adam Miartus (3): meta-oe toybox-inittab: toybox inittab implementation meta-oe toybox-inittab: allow getty as a packageconfig feature meta-oe toybox: enable toybox init when selected as init manager Alex Kiernan (1): libgusb: Upgrade 0.3.0+ -> 0.3.4 Andreas Müller (48): gfbgraph: initial add 0.2.4 libgdata: Change PACKAGECONFIG defaults gnome-photos: initial add 3.34.2 dconf: upgrade 0.34.0 -> 0.36.0 dconf-editor: upgrade 3.34.2 -> 3.36.2 nautilus: upgrade 3.34.3 -> 3.36.3 evince: upgrade 3.34.2 -> 3.36.3 evolution-data-server: upgrade 3.34.4 -> 3.36.3 file-roller: upgrade 3.32.5 -> 3.36.2 amtk: initial add 5.1.1 uchardet: initial add 0.0.7 tepl: initial add 4.4.0 gedit: upgradde 3.34.1 -> 3.36.2 gdm: upgrade 3.34.1 -> 3.36.2 gnome-backgrounds: upgrade 3.34.0 -> 3.36.0 gnome-calculator: upgrade 3.34.1 -> 3.36.0 gnome-system-monitor: upgrade 3.32.1 -> 3.36.1 gvfs: upgrade 1.42.2 -> 1.44.1 gtksourceview4: upgrade 4.4.0 -> 4.6.0 gnome-desktop3; upgrade 3.34.5 -> 3.36.2 gnome-panel: upgrade 3.34.1 -> 3.36.1 gnome-flashback: upgrade 3.34.2 -> 3.36.3 gnome-keyring: upgrade 3.34.0 -> 3.36.0 gnome-menus3: upgrade 3.32.0 -> 3.36.0 gnome-online-accounts: upgrade 3.34.1 -> 3.36.0 gnome-session: upgrade 3.34.2 -> 3.36.0 gnome-settings-daemon: upgrade 3.34.2 -> 3.36.1 gnome-terminal: upgrade 3.34.2 -> 3.36.2 grilo: upgrade 0.3.10 -> 0.3.12 libgnomekbd: remove libgweather: upgrade 3.34.0 -> 3.36.0 libwnck3: upgrade 3.32.0 -> 3.36.0 metacity: upgrade 3.34.1 -> 3.36.1 graphene: initial add 1.10.0 yelp-xsl: upgrade 3.34.2 -> 3.36.0 yelp: upgrade 3.34.0 -> 3.36.0 sysprof: upgrade 3.34.1 -> 3.36.0 gnome-control-center: upgrade 3.34.5 -> 3.36.2 libblockdev: upgrade 2.23 -> 2.24 poppler: upgrade 0.88.0 -> 0.89.0 gtksourceview: remove forgotten files vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches vlc: upgrade 3.0.9.2 -> 3.0.10 babl: upgrade 0.1.74 -> 0.1.78 gegl: upgrade 0.4.22 -> 0.4.24 libmypaint: upgrade 1.4.0 -> 1.6.1 mypaint-brushes-1.0: upgrade 1.3.0 -> 1.3.1 gimp: upgrade 2.10.18 -> 2.10.20 Andrej Valek (1): thrift: drop unsupported features Bog999 (1): python3: Add python3-cryptography to RDEPENDS for python3-redis Changqing Li (3): packagegroup-xfce-base: add RDEPEND packagegroup-core-x11 python-django: add RDEPENDS python-m2crypto: Add RDEPENDS Chenxi Mao (1): geoclue: select avahi-daemon if nmea enabled Christian Eggers (4): graphviz: Extend for nativesdk ttf-dejavu: Extend for native and nativesdk gd: Extend for native and nativesdk mscgen: Extend for native and nativesdk Denys Dmytriyenko (1): serialcheck: switch to a fork and update to the latest Jacob Kroon (1): meta-oe: Don't inherit 'features_check' in recipes that don't utilize it Joris Offouga (1): c-periphery: add recipe Kai Kang (1): lvm2: remove service template from SYSTEMD_SERVICE Khem Raj (5): python3-zopeinterface: Upgrade to 5.1.0 multipath-tools: Fix build with json-c 0.14 and newer toybox-inittab: Get rid of bashism mpv: Drop unused features_check inherit evince: Drop unused features_check inherit Konrad Weihmann (3): mpd: fix PACKAGECONFIG assignment netkit-rsh: properly append PACKAGECONFIG zile: properly append PACKAGECONFIG Lei YU (1): httpfs2: mount a http url as a file based on FUSE Leon Anavi (57): python3-unidiff: Upgrade 0.5.5 -> 0.6.0 python3-tzlocal: Upgrade 2.0.0 -> 2.1 python3-serpent: Upgrade 1.28 -> 1.30.2 python3-python-vlc: Upgrade 3.0.7110 -> 3.0.9113 python3-gast: Upgrade 0.2.2 -> 0.3.3 python3-langtable: Upgrade 0.0.38 -> 0.0.51 python3-automat: Upgrade 0.8.0 -> 20.2.0 python3-humanize: Upgrade 0.5.1 -> 2.4.0 python-pyaudio: Consolidate in a single file python3-isort: Consolidate in a single file python3-editor: Consolidate in a single file python3-engineio: Upgrade 3.12.1 -> 3.13.0 python3-feedformatter: Consolidate in a single file python3-decorator: Consolidate in a single file python3-dateutil: Consolidate in a single file python3-dnspython: Consolidate in a single file python3-future: Consolidate in a single file python3-requests-futures: Upgrade 0.9.5 -> 1.0.0 python3-greenlet: Consolidate in a single file python3-html2text: Upgrade 2019.8.11 -> 2020.1.16 python3-jsonpatch: Consolidate in a single file python3-jsonschema: Consolidate in a single file python3-evdev: Consolidate in a single file python3-oauthlib: Consolidate in a single file python3-oauthlib: Upgrade 2.0.6 -> 3.1.0 python3-tornado: Consolidate in a single file python3-tornado: Upgrade 6.0.3 -> 6.0.4 python3-waitress: Upgrade 1.4.3 -> 1.4.4 python3-urllib3: Upgrade 1.25.7 -> 1.25.9 python3-ujson: Upgrade 2.0.3 -> 3.0.0 python3-wheel: Upgrade 0.33.6 -> 0.34.2 python3-wcwidth: Upgrade 0.1.8 -> 0.2.4 python3-twine: Upgrade 1.13.0 -> 3.1.1 python3-beautifulsoup4: Upgrade 4.8.2 -> 4.9.1 python3-bitarray: Upgrade 1.2.1 -> 1.2.2 python3-soupsieve: Upgrade 1.9.4 -> 2.0.1 python3-meld3: Consolidate in a single file python3-meld3: Upgrade 1.0.2 -> 2.0.1 python3-markupsafe: Consolidate in a single file python3-more-itertools: Consolidate in a single file python3-more-itertools: Upgrade 8.2.0 -> 8.3.0 python3-nmap: Upgrade 1.4.1 -> 1.4.7 python3-multidict: Upgrade 4.7.5 -> 4.7.6 python3-lxml: Consolidate in a single file python3-hyperlink: Consolidate in a single file python3-humanfriendly: Upgrade 4.18 -> 8.2 python3-html5lib: Consolidate in a single file python3-progress: Consolidate in a single file python3-prettytable: Consolidate in a single file python3-lxml: Upgrade 4.5.0 -> 4.5.1 python3-pika: Consolidate in a single file python3-pluggy: Consolidate in a single file python3-ply: Consolidate in a single file python3-pocketsphinx: Consolidate in a single file python3-pocketsphinx: 0.1.0 -> 0.1.15 python3-pint: Consolidate in a single file python3-pint: Upgrade 0.11 -> 0.12 Martin Jansa (1): meta-python: depend on core version 12 or higher Martin Kelly (4): mosquitto: add native, nativesdk support msgpack-c: add native, nativesdk support mosquitto: typo fix python3-paho-mqtt: add native,nativesdk support Mingli Yu (2): python3-webcolors: add the missing rdepends python3-m2crypto: add the missing rdepends Naveen Saini (2): ace: add new recipe ocl-icd_git.bb: Add recipe for OpenCL ICD loaders Peace Lee (1): guider: Upgrade to 3.9.7 Pierre-Jean Texier (14): zchunk: upgrade 1.1.5 -> 1.1.6 uriparser: upgrade 0.9.3 -> 0.9.4 dbus-brocker: upgrade 22 -> 23 jsoncpp: upgrade 1.9.2 -> 1.9.3 hwdata: upgrade 0.333 -> 0.336 libiio: upgrade 0.19 -> 0.20 libnfc: upgrade 1.7.1 -> 1.8.0 tcpreplay: fix upstream check URL tinyproxy: fix upstream check URL jpnevulator: upgrade 2.3.4 -> 2.3.5 libnftnl: upgrade 1.1.6 -> 1.1.7 nftables: upgrade 0.9.4 -> 0.9.5 libzip: upgrade 1.6.1 -> 1.7.0 haveged: upgrade 1.9.8 -> 1.9.9 Qi.Chen@windriver.com (1): python-django: set CVE_PRODUCT to be django Wang Mingyu (5): opensaf: upgrade 5.19.10 -> 5.20.05 dash: upgrade 0.5.10.2 -> 0.5.11 postgresql: 12.2 -> 12.3 python3-pycodestyle: upgrade 2.5.0 -> 2.6.0 python3-scapy: upgrade 0.25 -> 0.26 Yi Zhao (1): gpsd: add new init script Yongxin Liu (1): intel-speed-select: Add new recipe for the tool to validate Intel SST Zang Ruochen (7): proj: upgrade 7.0.0 -> 7.0.1 mksh: upgrade 58 -> 59 libvpx: upgrade 1.8.1 -> 1.8.2 mercurial: upgrade 5.2 -> 5.4 libcgi-perl: upgrade 4.47 -> 4.48 mm-common: upgrade 1.0..0 -> 1.0.1 cryptsetup: upgrade 2.3.2 -> 2.3.3 Zheng Ruoqin (2): nghttp2: upgrade 1.40.0 -> 1.41.0 python3-inflection: upgrade 0.3.1 -> 0.5.0 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I15cb7860a288b903ef186f1979ee028e6f54ea50
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/zchunk')
-rw-r--r--meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch39
-rw-r--r--meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch61
-rw-r--r--meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb (renamed from meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb)8
3 files changed, 2 insertions, 106 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
deleted file mode 100644
index 64e0e8ed61..0000000000
--- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 78247d478cec254bad27f4ed97b532f4f54bf1b0 Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <pjtexier@koncepto.io>
-Date: Thu, 23 Jan 2020 19:14:40 +0100
-Subject: [PATCH 1/2] zck.h: fix build on musl
-
-The ssize_t type requires the <sys/types.h> header. This fixes build with musl
-libc:
-
-include/zck.h:68:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
- 68 | ssize_t zck_read(zckCtx *zck, char *dst, size_t dst_size)
- | ^~~~~~~
- | size_t
-include/zck.h:81:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
- 81 | ssize_t zck_write(zckCtx *zck, const char *src, const size_t src_size)
- | ^~~~~~~
- | size_t
-
-Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23]
-
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
----
- include/zck.h.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/zck.h.in b/include/zck.h.in
-index 91d2557..b847576 100644
---- a/include/zck.h.in
-+++ b/include/zck.h.in
-@@ -5,6 +5,7 @@
-
- #include <stdlib.h>
- #include <stdbool.h>
-+#include <sys/types.h>
-
- typedef enum zck_hash {
- ZCK_HASH_SHA1,
---
-2.7.4
-
diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
deleted file mode 100644
index a1c95bf362..0000000000
--- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 72c55e3da59eccdfea3778d11f83862b58af723d Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <pjtexier@koncepto.io>
-Date: Thu, 23 Jan 2020 22:42:40 +0100
-Subject: [PATCH 2/2] unzck: fix build with musl libc
-
-On musl libc "stdout" is a preprocessor macro whose expansion leads to
-compilation errors.
-
-Fixes:
-
-| In file included from ../git/src/unzck.c:31:
-| ../git/src/unzck.c: In function 'parse_opt':
-| ../git/src/unzck.c:78:24: error: expected identifier before '(' token
-| 78 | arguments->stdout = true;
-| | ^~~~~~
-| ../git/src/unzck.c: In function 'main':
-| ../git/src/unzck.c:141:20: error: expected identifier before '(' token
-| 141 | if(!(arguments.stdout)) {
-| | ^~~~~~
-
-Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23]
-
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
----
- src/unzck.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/unzck.c b/src/unzck.c
-index 8d6c62a..002492c 100644
---- a/src/unzck.c
-+++ b/src/unzck.c
-@@ -58,7 +58,7 @@ struct arguments {
- char *args[1];
- zck_log_type log_level;
- bool dict;
-- bool stdout;
-+ bool stdOut;
- bool exit;
- };
-
-@@ -75,7 +75,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) {
- arguments->log_level = ZCK_LOG_DDEBUG;
- break;
- case 'c':
-- arguments->stdout = true;
-+ arguments->stdOut = true;
- break;
- case 'V':
- version();
-@@ -138,7 +138,7 @@ int main (int argc, char *argv[]) {
- snprintf(out_name + strlen(base_name) - 4, 7, ".zdict");
-
- int dst_fd = STDOUT_FILENO;
-- if(!arguments.stdout) {
-+ if(!arguments.stdOut) {
- dst_fd = open(out_name, O_TRUNC | O_WRONLY | O_CREAT, 0666);
- if(dst_fd < 0) {
- dprintf(STDERR_FILENO, "Unable to open %s", out_name);
---
-2.7.4
-
diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb
index f75412f49e..e041132b1c 100644
--- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb
+++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb
@@ -4,13 +4,9 @@ AUTHOR = "Jonathan Dieter"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f"
-SRC_URI = " \
- git://github.com/zchunk/zchunk.git;protocol=https \
- file://0001-zck.h-fix-build-on-musl.patch \
- file://0002-unzck-fix-build-with-musl-libc.patch \
- "
+SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https"
-SRCREV = "c01bf12feede792982f165f52f4a6c573e3a8c17"
+SRCREV = "f5593aa11584faa691c81b4898f0aaded47f8bf7"
S = "${WORKDIR}/git"
DEPENDS = "\