From a2681d9b6ff6eb6e4456d769b8d76e77b2c4d51d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 16 Oct 2020 10:17:07 -0500 Subject: meta-openembedded: subtree update:bccd3277e4..2258c9a767 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alejandro Enedino Hernandez Samaniego (1): gedit: Add gsettings-desktop-schemas to RDEPENDS Alexander Vickberg (1): wolfssl: upgrade 4.4.0 -> 4.5.0 Andreas Müller (11): gnome-settings-daemon: Remove wrong RDEPEND gnome-desktop3: upgrade 3.36.5 -> 3.36.6 grilo: upgrade 0.3.12 -> 0.3.13 gspell: upgrade 1.8.3 -> 1.8.4 libgdata: upgrade 0.17.12 -> 0.17.13 tracker: upgrade 2.3.4 -> 2.3.6 tracker-miners: upgrade 2.3.3 -> 2.3.5 gjs: upgrade 1.58.7 -> 1.58.8 xfce4-notifyd: upgrade 0.6.1 -> 0.6.2 live555: upgrade 20200721 -> 20200819 vlc: upgrade 3.0.11 -> 3.0.11.1 Andrey Zhizhikin (1): python3-pybind11: extend to native and nativesdk Armin Kuster (3): cmocka: add recipe musl-nscd: add package add musl-nscd to pkg grps Bartosz Golaszewski (2): libgpiod: drop support for 0.3.3 libgpiod: consolidate the recipe files Diego Rondini (1): README: fix incorrect links Geoff Parker (1): multipath-tools: replace perl with sed in libdmmp/Makefile for pseudo Gianfranco Costamagna (1): vboxguestdrivers: upgrade 6.1.12 -> 6.1.14 Drop kernel 5.8 compatibility patch, now part of upstream codebase Hongxu Jia (4): python3-argcomplete: add recipe 1.12.0 python3-dateutil/python3-pykwalify: add nativesdk support python3-pykwalify: fix missing comma python3-docopt: add version 0.6.2 Kai Kang (2): python3-iniconfig: add recipe python3-pytest: 5.4.3 -> 6.1.0 Khem Raj (3): st: Use update alternatives numactl: Link with libatomic on rv64/rv32 ubi-utils-klibc: Remove trailing slash from S Lee Chee Yang (4): ace : improve reproducibility libgphoto2: improve reproducibility tbb: improve reproducibility glog : improve reproducibility Leon Anavi (57): python3-langtable: Upgrade 0.0.52 -> 0.0.53 python3-sentry-sdk: Upgrade 0.17.5 -> 0.17.6 python3-cmd2: Upgrade 1.3.9 -> 1.3.10 python3-rfc3339-validator: Upgrade 0.1.1 -> 0.1.2 python3-h2: Upgrade 3.2.0 -> 4.0.0 python3-luma-core: Upgrade 1.16.1 -> 1.16.2 python3-isort: Upgrade 5.5.2 -> 5.5.3 python3-xlsxwriter: Upgrade 1.3.3 -> 1.3.4 python3-flask-uploads: Consolidate in a single file python3-paho-mqtt: Upgrade 1.5.0 -> 1.5.1 python3-sentry-sdk: Upgrade 0.17.6 -> 0.17.7 python3-importlib-metadata: Upgrade 1.7.0 -> 2.0.0 python3-pint: Upgrade 0.16 -> 0.16.1 python3-zipp: Upgrade 3.1.0 -> 3.2.0 python3-xlsxwriter: Upgrade 1.3.4 -> 1.3.5 python3-greenlet: Upgrade 0.4.16 -> 0.4.17 python3-xlsxwriter: Upgrade 1.3.5 -> 1.3.6 python3-yarl: Upgrade 1.5.1 -> 1.6.0 python3-sentry-sdk: Upgrade 0.17.7 -> 0.17.8 python3-google-api-python-client: Upgrade 1.12.1 -> 1.12.2 python3-cryptography: Upgrade 3.1 -> 3.1.1 python3-cryptography-vectors: Upgrade 3.1 -> 3.1.1 python3-gevent: Upgrade 20.6.2 -> 20.9.0 python3-pycrypto: Consolidate in a single file python3-pychromecast: Upgrade 7.3.0 -> 7.5.0 python3-beautifulsoup4: Upgrade 4.9.1 -> 4.9.2 python3-tqdm: Upgrade 4.49.0 -> 4.50.0 python3-argcomplete: Upgrade 1.12.0 -> 1.12.1 python3-luma-core: Upgrade 1.16.2 -> 1.17.1 python3-luma-oled: Upgrade 3.5.0 -> 3.6.0 python3-regex: Upgrade 2020.7.14 -> 2020.9.27 python3-djangorestframework: Upgrade 3.11.1 -> 3.12.1 python3-isort: Upgrade 5.5.3 -> 5.5.4 python3-cbor2: Upgrade 5.1.2 -> 5.2.0 python3-humanize: Upgrade 2.6.0 -> 3.0.0 python3-pystemd: Upgrade 0.7.0 -> 0.8.0 python3-sentry-sdk: Upgrade 0.17.8 -> 0.18.0 python3-nocasedict: Upgrade 1.0.0 -> 1.0.1 python3-google-api-python-client: Upgrade 1.12.2 -> 1.12.3 beautifulsoup4: Upgrade 4.9.2 -> 4.9.3 python3-humanize: Upgrade 3.0.0 -> 3.0.1 python3-zipp: Upgrade 3.2.0 -> 3.3.0 python3-cmd2: Upgrade 1.3.10 -> 1.3.11 python3-pywbemtools: Upgrade 0.7.1 -> 0.7.2 python3-prettytable: Upgrade 0.7.2 -> 1.0.0 python3-nocaselist: Upgrade 1.0.2 -> 1.0.3 python3-pandas: Upgrade 1.1.2 -> 1.1.3 python3-configparser: Upgrade 5.0.0 -> 5.0.1 python3-pywbemtools: Upgrade 0.7.2 -> 0.7.3 python3-colorlog: Upgrade 4.2.1 -> 4.4.0 python3-markdown: Upgrade 3.2.2 -> 3.3 python3-tqdm: Upgrade 4.50.0 -> 4.50.2 python3-pywbem: Upgrade 1.0.2 -> 1.1.0 python3-regex: Upgrade 2020.9.27 -> 2020.10.11 python3-multidict: Upgrade 4.7.6 -> 5.0.0 python3-prettytable: Upgrade 1.0.0 -> 1.0.1 python3-pyperclip: Upgrade 1.8.0 -> 1.8.1 Lim Siew Hoon (1): Alliance for Open Media: new library Martin Jansa (4): libhugetlbfs: revert one commit from 2.23 to work around build error on arm netkit-rsh: inherit update-alternatives ssmtp: adjust u-a utouch-*, ifenslave, iozone3, ttf-honkyfonts, python3-smbus: don't use trailing slash in S Michael Vetter (3): jasper: use correct homepage jasper: upgrade 2.0.20 -> 2.0.21 jasper: upgrade 2.0.21 -> 2.0.22 Mingli Yu (3): smartmontools: Remove obsolete setting regarding the Standard Output ippool: Remove obsolete setting in service file strongswan: Remove obsolete setting regarding the Standard Output Naveen Saini (1): tbb: upgrade 2020.2 -> 2020.3 Pascal Bach (1): rocksdb: 6.6.4 -> 6.11.4 Pierre-Jean Texier (1): cppzmq: upgrade 4.6.0 -> 4.7.0 Ricardo Salveti (1): pcsc-lite: upgrade 1.8.26 -> 1.9.0 Richard Purdie (1): minifi-cpp: Adapt to potential psuedo changes Robert Yang (1): crda: rdepends on wireless-regdb-static Romain Naour (1): libiec61850: add recipe for libiec61850 Ross Burton (1): mpv: don't remove lua for aarch64 twice Sakib Sajal (1): libssh2: enable ptest Sinan Kaya (1): collectd: make rrdtool and rrdcached optional Tim Orling (3): python3-markupsafe: bbappend for ptest python3-jinja2: bbappend for ptest packagegroup-meta-python: -jinja2 -markupsafe => ptest Todd Cunningham (1): firewalld: upgrade 0.8.3 -> 0.9.0 Vladimir Zapolskiy (1): cifs-utils: remove explicitly set PV variable Winfried Dobbe (1): firewalld: Add missing rdep on nftables-python Yi Zhao (2): minifi-cpp: do not download source during compile minifi-cpp: set the default repositories location to /var/lib Zang Ruochen (6): byacc: upgrade 20200330 -> 20200910 memtester: upgrade 4.3.0 -> 4.4.0 redis: upgrade 6.0.7 -> 6.0.8 znc: upgrade 1.8.1 -> 1.8.2 arno-iptables-firewall: upgrade 2.1.0 -> 2.1.1 numactl: upgrade 2.0.13 -> 2.0.14 Zheng Ruoqin (1): dnf-plugin-tui: upgrade 1.1 -> 1.2 Zig Globulin (1): libuvc: add recipe Signed-off-by: Andrew Geissler Change-Id: I67cbdcd31a7ead9641a4bce3477ff706f33bb253 --- .../meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb | 39 ++++++++++++++++ .../cmocka/files/cmocka-uintptr_t.patch | 53 ++++++++++++++++++++++ .../meta-oe/recipes-test/cmocka/files/run-ptest | 10 ++++ 3 files changed, 102 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch create mode 100644 meta-openembedded/meta-oe/recipes-test/cmocka/files/run-ptest (limited to 'meta-openembedded/meta-oe/recipes-test/cmocka') diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb new file mode 100644 index 0000000000..5aee5ef931 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "cmocka is an elegant unit testing framework for C with support for mock \ +objects. It only requires the standard C library, works on a range of computing \ +platforms (including embedded) and with different compilers." +HOMEPAGE = "https://cmocka.org/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRCREV = "56eb3a183fc222120f86d0c54fd033992c30135e" +SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git \ + file://run-ptest \ + file://cmocka-uintptr_t.patch \ + " + +S = "${WORKDIR}/git" + +inherit cmake ptest + +EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}" + +do_install_append () { + install -d ${D}${datadir}/${BPN}/example + install -d ${D}${datadir}/${BPN}/example/mock/chef_wrap + install -d ${D}${datadir}/${BPN}/example/mock/uptime + + install -m 0755 ${B}/example/*_test ${D}/${datadir}/${BPN}/example + install -m 0755 ${B}/example/mock/chef_wrap/waiter_test_wrap ${D}/${datadir}/${BPN}/example/mock/chef_wrap + install -m 0755 ${B}/example/mock/uptime/uptime ${D}/${datadir}/${BPN}/example/mock/uptime + install -m 0755 ${B}/example/mock/uptime/test_uptime ${D}/${datadir}/${BPN}/example/mock/uptime +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/tests/test_* ${D}${PTEST_PATH}/tests +} + +PACKAGE_BEFORE_PN += "${PN}-examples" + +FILES_${PN}-examples = "${datadir}/${BPN}/example" diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch b/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch new file mode 100644 index 0000000000..8d3b73b631 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch @@ -0,0 +1,53 @@ +From 5bd7b5d04435bd593349825973ce32290f5f604d Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Wed, 25 Jul 2018 09:55:25 +0800 +Subject: [PATCH] samba: cmocka.h: fix musl libc conflicting types error + +Fix build on qemumips64(el) + +taken from: +[PATCH] libldb: fix musl libc conflicting types error + +/third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' + typedef unsigned int uintptr_t; + ^~~~~~~~~ +use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined + +Upstream-Status: Pending + +Signed-off-by: Changqing Li +Signed-off-by: Andrea Adami + +Taken from [PATCH] samba: cmocka.h: fix musl libc conflicting types error +https://git.openembedded.org/meta-openembedded/commit/meta-networking/recipes-connectivity/samba?id=b758150d30a5fbdc47c465d0e9dca3a7e6d71f3c + +Signed-off-by: Armin Kuster + +This fix is not in cmocka, so pending pending?? + + +Index: git/include/cmocka.h +=================================================================== +--- git.orig/include/cmocka.h ++++ git/include/cmocka.h +@@ -116,7 +116,7 @@ typedef uintmax_t LargestIntegralType; + ((LargestIntegralType)(value)) + + /* Smallest integral type capable of holding a pointer. */ +-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) ++#if !defined(__DEFINED_uintptr_t) + # if defined(_WIN32) + /* WIN32 is an ILP32 platform */ + typedef unsigned int uintptr_t; +@@ -140,9 +140,8 @@ typedef uintmax_t LargestIntegralType; + # endif /* __WORDSIZE */ + # endif /* _WIN32 */ + +-# define _UINTPTR_T +-# define _UINTPTR_T_DEFINED +-#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ ++# define __DEFINED_uintptr_t ++#endif /* !defined(__DEFINED_uintptr_t) */ + + /* Perform an unsigned cast to uintptr_t. */ + #define cast_to_pointer_integral_type(value) \ diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/files/run-ptest b/meta-openembedded/meta-oe/recipes-test/cmocka/files/run-ptest new file mode 100644 index 0000000000..48b9cd9fc5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/cmocka/files/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh + +cd tests +for i in `ls *`; do + if [ ./$i ] ; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done -- cgit v1.2.3