From 49e9566eb60669f7b1535f0653aa52a1c9ea8af0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 15 Sep 2021 16:19:36 -0700 Subject: meta-openembedded: subtree update:9fdc7960ba..e4a3c66505 Alexander Kanavin (4): msgpack-c: update 3.2.1 -> 4.0.0, add msgpack-cpp can-utils: rrecommend iproute2 to make it possible to configure can interfaces fmt: update 7.1.3 -> 8.0.1 spdlog: update 1.8.2 -> 1.9.2 Changqing Li (3): ndpi: upgrade 3.4 -> 4.0 ntopng: upgrade 4.2 -> 5.0 postgresql: upgrade 13.3 -> 13.4 Jan-Simon Moeller (1): Remove patch that produces a segfault in the ptest of lua Joe Slater (1): redis: advance to version 6.2.5 Khem Raj (10): gjs: Remove valgrind dependency on rv32/rv64 toybox-inittab: Use 0BSD for LIC_FILES_CHKSUM python3-kivy: Remove hardcoded include paths python3-kivy: Check for x11 and opengl before enabling the recipe packagegroup-meta-python: Add python3-kivy packagegroup-meta-python: Add python3-portalocker gst-shark: Define SRCREV_FORMAT android-tools: Define SRCREV_FORMAT packagegroup-meta-oe: Add pahole pahole: Add missing rdep for python Kristian Klausen (1): cryptsetup: Add runtime dependency on lvm2-udevrules for udev Martin Jansa (1): python3-regex: upgrade to 2021.8.28 Matteo Croce (2): recipes-devtools: add pahole libbpf: bump to 0.5.0 Mingli Yu (1): polkit: add the CVE tag Patrick Williams (2): gjs: fix typo in RDEPENDS variable name ndisc6: fix typo in DESCRIPTION variable name Peter Morrow (1): libbpf: remove kernel configuration dependency Samuel Dolt (4): python3-alembic: add native and nativesdk to BBCLASSEXTEND python3-editor: add native and nativesdk to BBCLASSEXTEND python3-sqlalchemy: add native and nativesdk to BBCLASSEXTEND python3-portalocker: add recipe Trevor Gamblin (2): python3-pytest-subtests: add recipe python3-pillow: upgrade 8.3.1 -> 8.3.2 Wang Mingyu (3): python3-cryptography-vectors: upgrade 3.4.7 -> 3.4.8 python3-google-api-python-client: upgrade 2.18.0 -> 2.19.1 dnf-plugin-tui: upgrade 1.2 -> 1.3 William A. Kennington III (1): ndisc6: Upgrade 1.0.4 -> 1.0.5 William Huang (1): recipes-devtools: python: add support for Kivy Yi Zhao (4): krb5: fix CVE-2021-36222 krb5: fix CVE-2021-37750 net-snmp: drop unused patch net-snmp: make sure snmpd always exit after displaying usage wangmy (10): cjson: upgrade 1.7.14 -> 1.7.15 libwebsockets: upgrade 4.2.1 -> 4.2.2 monit: upgrade 5.28.1 -> 5.29.0 nlohmann-json: upgrade 3.9.1 -> 3.10.2 cppzmq: upgrade 4.7.1 -> 4.8.0 dfu-util: upgrade 0.10 -> 0.11 libqmi: upgrade 1.30.0 -> 1.30.2 lockfile-progs: upgrade 0.1.18 -> 0.1.19 poppler-data: upgrade 0.4.10 -> 0.4.11 dnsmasq: upgrade 2.85 -> 2.86 zangrc (11): python3-ipython: upgrade 7.26.0 -> 7.27.0 python3-kiwisolver: upgrade 1.3.1 -> 1.3.2 python3-ruamel-yaml: upgrade 0.17.13 -> 0.17.16 python3-traitlets: upgrade 5.0.5 -> 5.1.0 gsl: upgrade 2.6 -> 2.7 crash: upgrade 7.2.9 -> 7.3.0 dash: upgrade 0.5.11.3 -> 0.5.11.5 python3-bitarray: upgrade 2.3.2 -> 2.3.3 python3-lrparsing: upgrade 1.0.16 -> 1.0.17 python3-transitions: upgrade 0.8.8 -> 0.8.9 libxmlb: upgrade 0.3.1 -> 0.3.2 zhengruoqin (15): wireshark: upgrade 3.4.7 -> 3.4.8 uhubctl: upgrade 2.3.0 -> 2.4.0 unclutter-xfixes: upgrade 1.5 -> 1.6 avro-c: upgrade 1.9.2 -> 1.10.2 ctags: upgrade 5.9.20210815 -> 5.9.20210905 xf86-video-nouveau: upgrade 1.0.16 -> 1.0.17 fuse3: upgrade 3.10.4 -> 3.10.5 mosquitto: upgrade 2.0.11 -> 2.0.12 poppler: upgrade 21.08.0 -> 21.09.0 libbytesize: upgrade 2.4 -> 2.6 libeigen: upgrade 3.3.9 -> 3.4.0 libjcat: upgrade 0.1.7 -> 0.1.8 unbound: upgrade 1.12.0 -> 1.13.2 xterm: upgrade 367 -> 368 zchunk: upgrade 1.1.9 -> 1.1.16 Change-Id: I5a866e7773b8c906bc2bd8a4ddf99f006534bf53 Signed-off-by: William A. Kennington III --- .../krb5/krb5/CVE-2021-36222.patch | 121 ++++++ .../krb5/krb5/CVE-2021-37750.patch | 53 +++ .../recipes-connectivity/krb5/krb5_1.17.2.bb | 2 + .../recipes-connectivity/libqmi/libqmi_1.30.0.bb | 21 - .../recipes-connectivity/libqmi/libqmi_1.30.2.bb | 21 + .../libwebsockets/libwebsockets_4.2.1.bb | 43 -- .../libwebsockets/libwebsockets_4.2.2.bb | 43 ++ .../recipes-connectivity/zeromq/cppzmq_git.bb | 6 +- .../packagegroups/packagegroup-meta-oe.bb | 7 +- .../recipes-core/toybox/toybox-inittab_0.8.2.bb | 4 +- .../recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb | 2 +- ...ure.in-bypass-autoconf-2.69-version-check.patch | 11 +- .../recipes-dbs/postgresql/postgresql_13.3.bb | 12 - .../recipes-dbs/postgresql/postgresql_13.4.bb | 12 + .../android-tools/android-tools_5.1.1.r37.bb | 1 + .../meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb | 21 - .../meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb | 21 + .../recipes-devtools/ctags/ctags_5.9.20210815.0.bb | 34 -- .../recipes-devtools/ctags/ctags_5.9.20210905.0.bb | 34 ++ .../dnf-plugin-tui/dnf-plugin-tui_git.bb | 4 +- .../recipes-devtools/lua/lua/CVE-2020-15945.patch | 167 -------- .../meta-oe/recipes-devtools/lua/lua_5.3.6.bb | 1 - .../recipes-devtools/msgpack/msgpack-c_3.2.1.bb | 21 - .../recipes-devtools/msgpack/msgpack-c_4.0.0.bb | 20 + .../recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb | 22 + .../nlohmann-json/nlohmann-json_3.10.2.bb | 28 ++ .../nlohmann-json/nlohmann-json_3.9.1.bb | 28 -- .../0001-CMakeList.txt-make-python-optional.patch | 44 ++ .../meta-oe/recipes-devtools/pahole/pahole_1.22.bb | 30 ++ .../lockfile-progs/lockfile-progs_0.1.18.bb | 24 -- .../lockfile-progs/lockfile-progs_0.1.19.bb | 23 ++ .../polkit/polkit/CVE-2021-3560.patch | 2 + .../meta-oe/recipes-extended/redis/redis_6.2.4.bb | 66 --- .../meta-oe/recipes-extended/redis/redis_6.2.5.bb | 66 +++ .../recipes-extended/socketcan/can-utils_git.bb | 5 + .../meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb | 34 -- .../meta-oe/recipes-gnome/libjcat/libjcat_0.1.8.bb | 34 ++ .../meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.1.bb | 19 - .../meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.2.bb | 19 + .../0001-build-use-autotools.patch | 2 +- .../unclutter-xfixes/unclutter-xfixes_1.5.bb | 23 -- .../unclutter-xfixes/unclutter-xfixes_1.6.bb | 23 ++ .../meta-oe/recipes-graphics/xorg-app/xterm_367.bb | 48 --- .../meta-oe/recipes-graphics/xorg-app/xterm_368.bb | 48 +++ .../xorg-driver/xf86-video-nouveau_1.0.16.bb | 19 - .../xorg-driver/xf86-video-nouveau_1.0.17.bb | 18 + ...rintk-add-support-for-lockless-ringbuffer.patch | 445 --------------------- ...intk-use-committed-finalized-state-values.patch | 103 ----- .../donnot-extract-gdb-during-do-compile.patch | 19 +- ...move-unrecognized-gcc-option-m32-for-mips.patch | 6 +- .../meta-oe/recipes-kernel/crash/crash_7.2.9.bb | 120 ------ .../meta-oe/recipes-kernel/crash/crash_7.3.0.bb | 118 ++++++ .../meta-oe/recipes-kernel/libbpf/libbpf_0.4.bb | 41 -- .../meta-oe/recipes-kernel/libbpf/libbpf_0.5.bb | 29 ++ .../meta-oe/recipes-shells/dash/dash_0.5.11.3.bb | 27 -- .../meta-oe/recipes-shells/dash/dash_0.5.11.5.bb | 26 ++ ...NUInstallDirs-instead-of-hard-coded-paths.patch | 70 ---- .../meta-oe/recipes-support/avro/avro-c_1.10.2.bb | 17 + .../meta-oe/recipes-support/avro/avro-c_1.9.2.bb | 18 - .../dfu-util/dfu-util-native_0.10.bb | 24 -- .../dfu-util/dfu-util-native_0.11.bb | 24 ++ .../recipes-support/dfu-util/dfu-util_0.10.bb | 13 - .../recipes-support/dfu-util/dfu-util_0.11.bb | 12 + .../meta-oe/recipes-support/fmt/fmt_7.1.3.bb | 17 - .../meta-oe/recipes-support/fmt/fmt_8.0.1.bb | 17 + .../meta-oe/recipes-support/gsl/gsl_2.6.bb | 5 - .../meta-oe/recipes-support/gsl/gsl_2.7.bb | 4 + .../recipes-support/libbytesize/libbytesize_2.4.bb | 30 -- .../recipes-support/libbytesize/libbytesize_2.6.bb | 30 ++ .../recipes-support/libeigen/libeigen_3.3.9.bb | 26 -- .../recipes-support/libeigen/libeigen_3.4.0.bb | 26 ++ .../meta-oe/recipes-support/monit/monit_5.28.1.bb | 52 --- .../meta-oe/recipes-support/monit/monit_5.29.0.bb | 52 +++ .../recipes-support/poppler/poppler-data_0.4.10.bb | 37 -- .../recipes-support/poppler/poppler-data_0.4.11.bb | 36 ++ ...0001-Do-not-overwrite-all-our-build-flags.patch | 52 +-- .../recipes-support/poppler/poppler_21.08.0.bb | 51 --- .../recipes-support/poppler/poppler_21.09.0.bb | 51 +++ .../meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb | 22 - .../meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb | 22 + .../recipes-support/uhubctl/uhubctl_2.3.0.bb | 21 - .../recipes-support/uhubctl/uhubctl_2.4.0.bb | 21 + .../recipes-support/zchunk/zchunk_1.1.16.bb | 22 + .../meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb | 22 - 84 files changed, 1257 insertions(+), 1778 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2021-36222.patch create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2021-37750.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210815.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210905.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/lua/lua/CVE-2020-15945.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_4.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/pahole/files/0001-CMakeList.txt-make-python-optional.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_367.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_368.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb delete mode 100644 meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch delete mode 100644 meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch delete mode 100644 meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.9.bb create mode 100644 meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.3.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/avro/avro-c/0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.10.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.9.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.10.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.1.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/fmt/fmt_8.0.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.7.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/monit/monit_5.29.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.08.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.09.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.4.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.16.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb (limited to 'meta-openembedded/meta-oe') diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2021-36222.patch b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2021-36222.patch new file mode 100644 index 000000000..fee6e64c1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2021-36222.patch @@ -0,0 +1,121 @@ +From fc98f520caefff2e5ee9a0026fdf5109944b3562 Mon Sep 17 00:00:00 2001 +From: Joseph Sutton +Date: Wed, 7 Jul 2021 11:47:44 +1200 +Subject: [PATCH] Fix KDC null deref on bad encrypted challenge + +The function ec_verify() in src/kdc/kdc_preauth_ec.c contains a check +to avoid further processing if the armor key is NULL. However, this +check is bypassed by a call to k5memdup0() which overwrites retval +with 0 if the allocation succeeds. If the armor key is NULL, a call +to krb5_c_fx_cf2_simple() will then dereference it, resulting in a +crash. Add a check before the k5memdup0() call to avoid overwriting +retval. + +CVE-2021-36222: + +In MIT krb5 releases 1.16 and later, an unauthenticated attacker can +cause a null dereference in the KDC by sending a request containing a +PA-ENCRYPTED-CHALLENGE padata element without using FAST. + +[ghudson@mit.edu: trimmed patch; added test case; edited commit +message] + +ticket: 9007 (new) +tags: pullup +target_version: 1.19-next +target_version: 1.18-next + +CVE: CVE-2021-36222 + +Upstream-Status: Backport +[https://github.com/krb5/krb5/commit/fc98f520caefff2e5ee9a0026fdf5109944b3562] + +Signed-off-by: Yi Zhao +--- + src/kdc/kdc_preauth_ec.c | 3 ++- + src/tests/Makefile.in | 1 + + src/tests/t_cve-2021-36222.py | 46 +++++++++++++++++++++++++++++++++++ + 3 files changed, 49 insertions(+), 1 deletion(-) + create mode 100644 src/tests/t_cve-2021-36222.py + +diff --git a/src/kdc/kdc_preauth_ec.c b/src/kdc/kdc_preauth_ec.c +index 7e636b3f9..43a9902cc 100644 +--- a/src/kdc/kdc_preauth_ec.c ++++ b/src/kdc/kdc_preauth_ec.c +@@ -87,7 +87,8 @@ ec_verify(krb5_context context, krb5_data *req_pkt, krb5_kdc_req *request, + } + + /* Check for a configured FAST ec auth indicator. */ +- realmstr = k5memdup0(realm.data, realm.length, &retval); ++ if (retval == 0) ++ realmstr = k5memdup0(realm.data, realm.length, &retval); + if (realmstr != NULL) + retval = profile_get_string(context->profile, KRB5_CONF_REALMS, + realmstr, +diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in +index fc6fcc0c3..1a1938306 100644 +--- a/src/tests/Makefile.in ++++ b/src/tests/Makefile.in +@@ -166,6 +166,7 @@ check-pytests: unlockiter s4u2self + $(RUNPYTEST) $(srcdir)/t_cve-2012-1015.py $(PYTESTFLAGS) + $(RUNPYTEST) $(srcdir)/t_cve-2013-1416.py $(PYTESTFLAGS) + $(RUNPYTEST) $(srcdir)/t_cve-2013-1417.py $(PYTESTFLAGS) ++ $(RUNPYTEST) $(srcdir)/t_cve-2021-36222.py $(PYTESTFLAGS) + $(RM) au.log + $(RUNPYTEST) $(srcdir)/t_audit.py $(PYTESTFLAGS) + $(RUNPYTEST) $(srcdir)/jsonwalker.py -d $(srcdir)/au_dict.json \ +diff --git a/src/tests/t_cve-2021-36222.py b/src/tests/t_cve-2021-36222.py +new file mode 100644 +index 000000000..57e04993b +--- /dev/null ++++ b/src/tests/t_cve-2021-36222.py +@@ -0,0 +1,46 @@ ++import socket ++from k5test import * ++ ++realm = K5Realm() ++ ++# CVE-2021-36222 KDC null dereference on encrypted challenge preauth ++# without FAST ++ ++s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) ++a = (hostname, realm.portbase) ++ ++m = ('6A81A0' '30819D' # [APPLICATION 10] SEQUENCE ++ 'A103' '0201' '05' # [1] pvno = 5 ++ 'A203' '0201' '0A' # [2] msg-type = 10 ++ 'A30E' '300C' # [3] padata = SEQUENCE OF ++ '300A' # SEQUENCE ++ 'A104' '0202' '008A' # [1] padata-type = PA-ENCRYPTED-CHALLENGE ++ 'A202' '0400' # [2] padata-value = "" ++ 'A48180' '307E' # [4] req-body = SEQUENCE ++ 'A007' '0305' '0000000000' # [0] kdc-options = 0 ++ 'A120' '301E' # [1] cname = SEQUENCE ++ 'A003' '0201' '01' # [0] name-type = NT-PRINCIPAL ++ 'A117' '3015' # [1] name-string = SEQUENCE-OF ++ '1B06' '6B7262746774' # krbtgt ++ '1B0B' '4B5242544553542E434F4D' ++ # KRBTEST.COM ++ 'A20D' '1B0B' '4B5242544553542E434F4D' ++ # [2] realm = KRBTEST.COM ++ 'A320' '301E' # [3] sname = SEQUENCE ++ 'A003' '0201' '01' # [0] name-type = NT-PRINCIPAL ++ 'A117' '3015' # [1] name-string = SEQUENCE-OF ++ '1B06' '6B7262746774' # krbtgt ++ '1B0B' '4B5242544553542E434F4D' ++ # KRBTEST.COM ++ 'A511' '180F' '31393934303631303036303331375A' ++ # [5] till = 19940610060317Z ++ 'A703' '0201' '00' # [7] nonce = 0 ++ 'A808' '3006' # [8] etype = SEQUENCE OF ++ '020112' '020111') # aes256-cts aes128-cts ++ ++s.sendto(bytes.fromhex(m), a) ++ ++# Make sure kinit still works. ++realm.kinit(realm.user_princ, password('user')) ++ ++success('CVE-2021-36222 regression test') +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2021-37750.patch b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2021-37750.patch new file mode 100644 index 000000000..c67bca32e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2021-37750.patch @@ -0,0 +1,53 @@ +From b3999be7ab59a5af4b2f1042ce0d6b03ecb17d4e Mon Sep 17 00:00:00 2001 +From: Greg Hudson +Date: Tue, 3 Aug 2021 01:15:27 -0400 +Subject: [PATCH] Fix KDC null deref on TGS inner body null server + +After the KDC decodes a FAST inner body, it does not check for a null +server. Prior to commit 39548a5b17bbda9eeb63625a201cfd19b9de1c5b this +would typically result in an error from krb5_unparse_name(), but with +the addition of get_local_tgt() it results in a null dereference. Add +a null check. + +Reported by Joseph Sutton of Catalyst. + +CVE-2021-37750: + +In MIT krb5 releases 1.14 and later, an authenticated attacker can +cause a null dereference in the KDC by sending a FAST TGS request with +no server field. + +ticket: 9008 (new) +tags: pullup +target_version: 1.19-next +target_version: 1.18-next + +CVE: CVE-2021-37750 + +Upstream-Status: Backport +[https://github.com/krb5/krb5/commit/d775c95af7606a51bf79547a94fa52ddd1cb7f49] + +Signed-off-by: Yi Zhao +--- + src/kdc/do_tgs_req.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c +index 587342a..622b48f 100644 +--- a/src/kdc/do_tgs_req.c ++++ b/src/kdc/do_tgs_req.c +@@ -201,6 +201,11 @@ process_tgs_req(krb5_kdc_req *request, krb5_data *pkt, + status = "FIND_FAST"; + goto cleanup; + } ++ if (sprinc == NULL) { ++ status = "NULL_SERVER"; ++ errcode = KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN; ++ goto cleanup; ++ } + + errcode = get_local_tgt(kdc_context, &sprinc->realm, header_server, + &local_tgt, &local_tgt_storage); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb index 6c4b4575e..6e0b2fdac 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb @@ -30,6 +30,8 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://etc/default/krb5-admin-server \ file://krb5-kdc.service \ file://krb5-admin-server.service \ + file://CVE-2021-36222.patch;striplevel=2 \ + file://CVE-2021-37750.patch;striplevel=2 \ " SRC_URI[md5sum] = "aa4337fffa3b61f22dbd0167f708818f" SRC_URI[sha256sum] = "1a4bba94df92f6d39a197a10687653e8bfbc9a2076e129f6eb92766974f86134" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.0.bb deleted file mode 100644 index 61fe0eef8..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" -DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ - devices which speak the Qualcomm MSM Interface (QMI) protocol" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = "glib-2.0 glib-2.0-native" - -inherit autotools pkgconfig bash-completion gobject-introspection - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" - -SRC_URI[sha256sum] = "c039cdb5d3522b45a50d2287ab6311cdc9f99d46a719a1ea4beb7591787b8a1b" - -PACKAGECONFIG ??= "udev mbim" -PACKAGECONFIG[udev] = ",--without-udev,libgudev" -PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.2.bb new file mode 100644 index 000000000..c337abde3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" +DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ + devices which speak the Qualcomm MSM Interface (QMI) protocol" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = "glib-2.0 glib-2.0-native" + +inherit autotools pkgconfig bash-completion gobject-introspection + +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" + +SRC_URI[sha256sum] = "be01ece0ea2c2194cbea5744bf5aaf06c04ba5fb7ec7887a13116c76d114fedd" + +PACKAGECONFIG ??= "udev mbim" +PACKAGECONFIG[udev] = ",--without-udev,libgudev" +PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb deleted file mode 100644 index 8601a2c04..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Canonical libwebsockets.org websocket library" -HOMEPAGE = "https://libwebsockets.org/" -LICENSE = "MIT & Zlib & BSD-3-Clause & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c8bea43a2eb5d713c338819a0be07797" - -DEPENDS = "zlib" - -S = "${WORKDIR}/git" -SRCREV = "8a580b59b23d204ca72028370e97a8f6aa0c9202" -SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.2-stable" - -UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" - -inherit cmake pkgconfig - -PACKAGECONFIG ?= "libuv client server http2 ssl" -PACKAGECONFIG[client] = "-DLWS_WITHOUT_CLIENT=OFF,-DLWS_WITHOUT_CLIENT=ON," -PACKAGECONFIG[http2] = "-DLWS_WITH_HTTP2=ON,-DLWS_WITH_HTTP2=OFF," -PACKAGECONFIG[ipv6] = "-DLWS_IPV6=ON,-DLWS_IPV6=OFF," -PACKAGECONFIG[libevent] = "-DLWS_WITH_LIBEVENT=ON,-DLWS_WITH_LIBEVENT=OFF,libevent" -PACKAGECONFIG[libev] = "-DLWS_WITH_LIBEV=ON,-DLWS_WITH_LIBEV=OFF,libev" -PACKAGECONFIG[libuv] = "-DLWS_WITH_LIBUV=ON,-DLWS_WITH_LIBUV=OFF,libuv" -PACKAGECONFIG[server] = "-DLWS_WITHOUT_SERVER=OFF,-DLWS_WITHOUT_SERVER=ON," -PACKAGECONFIG[ssl] = "-DLWS_WITH_SSL=ON,-DLWS_WITH_SSL=OFF,openssl" -PACKAGECONFIG[static] = "-DLWS_WITH_STATIC=ON,-DLWS_WITH_STATIC=OFF -DLWS_LINK_TESTAPPS_DYNAMIC=ON," - -EXTRA_OECMAKE += " \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ -" - -PACKAGES =+ "${PN}-testapps ${PN}-evlib-event ${PN}-evlib-uv ${PN}-evlib-ev" - -FILES:${PN}-testapps += "${datadir}/libwebsockets-test-server/* ${bindir}/libwebsockets-test-*" -FILES:${PN}-evlib-event += "${libdir}/libwebsockets-evlib_event.so" -FILES:${PN}-evlib-uv += "${libdir}/libwebsockets-evlib_uv.so" -FILES:${PN}-evlib-ev += "${libdir}/libwebsockets-evlib_ev.so" - -RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libevent', '${PN}-evlib-event', '', d)}" -RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libuv', '${PN}-evlib-uv', '', d)}" -RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libev', '${PN}-evlib-ev', '', d)}" - -RDEPENDS:${PN}-dev += " ${@bb.utils.contains('PACKAGECONFIG', 'static', '${PN}-staticdev', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.2.bb new file mode 100644 index 000000000..a5fcb8d72 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.2.bb @@ -0,0 +1,43 @@ +SUMMARY = "Canonical libwebsockets.org websocket library" +HOMEPAGE = "https://libwebsockets.org/" +LICENSE = "MIT & Zlib & BSD-3-Clause & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c8bea43a2eb5d713c338819a0be07797" + +DEPENDS = "zlib" + +S = "${WORKDIR}/git" +SRCREV = "8d605f0649ed1ab6d27a443c7688598ea21fdb75" +SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.2-stable" + +UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +inherit cmake pkgconfig + +PACKAGECONFIG ?= "libuv client server http2 ssl" +PACKAGECONFIG[client] = "-DLWS_WITHOUT_CLIENT=OFF,-DLWS_WITHOUT_CLIENT=ON," +PACKAGECONFIG[http2] = "-DLWS_WITH_HTTP2=ON,-DLWS_WITH_HTTP2=OFF," +PACKAGECONFIG[ipv6] = "-DLWS_IPV6=ON,-DLWS_IPV6=OFF," +PACKAGECONFIG[libevent] = "-DLWS_WITH_LIBEVENT=ON,-DLWS_WITH_LIBEVENT=OFF,libevent" +PACKAGECONFIG[libev] = "-DLWS_WITH_LIBEV=ON,-DLWS_WITH_LIBEV=OFF,libev" +PACKAGECONFIG[libuv] = "-DLWS_WITH_LIBUV=ON,-DLWS_WITH_LIBUV=OFF,libuv" +PACKAGECONFIG[server] = "-DLWS_WITHOUT_SERVER=OFF,-DLWS_WITHOUT_SERVER=ON," +PACKAGECONFIG[ssl] = "-DLWS_WITH_SSL=ON,-DLWS_WITH_SSL=OFF,openssl" +PACKAGECONFIG[static] = "-DLWS_WITH_STATIC=ON,-DLWS_WITH_STATIC=OFF -DLWS_LINK_TESTAPPS_DYNAMIC=ON," + +EXTRA_OECMAKE += " \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +" + +PACKAGES =+ "${PN}-testapps ${PN}-evlib-event ${PN}-evlib-uv ${PN}-evlib-ev" + +FILES:${PN}-testapps += "${datadir}/libwebsockets-test-server/* ${bindir}/libwebsockets-test-*" +FILES:${PN}-evlib-event += "${libdir}/libwebsockets-evlib_event.so" +FILES:${PN}-evlib-uv += "${libdir}/libwebsockets-evlib_uv.so" +FILES:${PN}-evlib-ev += "${libdir}/libwebsockets-evlib_ev.so" + +RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libevent', '${PN}-evlib-event', '', d)}" +RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libuv', '${PN}-evlib-uv', '', d)}" +RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libev', '${PN}-evlib-ev', '', d)}" + +RDEPENDS:${PN}-dev += " ${@bb.utils.contains('PACKAGECONFIG', 'static', '${PN}-staticdev', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb index 61ea68a60..270df6f0e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb @@ -4,10 +4,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94" DEPENDS = "zeromq" -SRCREV = "76bf169fd67b8e99c1b0e6490029d9cd5ef97666" -PV = "4.7.1" +SRCREV = "267d300d1c99381a0fbc7e060ae2899e51f5e425" +PV = "4.8.0" -SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=bugfix-4-7-1" +SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index c36feb334..efa7b7a66 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -278,6 +278,7 @@ RDEPENDS:packagegroup-meta-oe-devtools ="\ capnproto-compiler \ mpich \ msgpack-c \ + msgpack-cpp \ mercurial \ nodejs \ openocd \ @@ -305,10 +306,10 @@ RDEPENDS:packagegroup-meta-oe-devtools ="\ json-schema-validator \ poke \ " -RDEPENDS:packagegroup-meta-oe-devtools:append:x86 = " cpuid msr-tools pmtools" -RDEPENDS:packagegroup-meta-oe-devtools:append:x86-64 = " cpuid msr-tools pcimem pmtools" +RDEPENDS:packagegroup-meta-oe-devtools:append:x86 = " cpuid msr-tools pahole pmtools" +RDEPENDS:packagegroup-meta-oe-devtools:append:x86-64 = " cpuid msr-tools pahole pcimem pmtools" RDEPENDS:packagegroup-meta-oe-devtools:append:arm = " pcimem" -RDEPENDS:packagegroup-meta-oe-devtools:append:aarch64 = " pcimem" +RDEPENDS:packagegroup-meta-oe-devtools:append:aarch64 = " pahole pcimem" RDEPENDS:packagegroup-meta-oe-devtools:append:libc-musl = " musl-nscd" RDEPENDS:packagegroup-meta-oe-devtools:remove:arm = "concurrencykit" diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb index b91a1d864..603f365cf 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Toybox Inittab Configuration" -LICENSE = "BSD-0-Clause" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-0-Clause;md5=81eeb0083e31f11ab1e33ded846d521c" +LICENSE = "0BSD" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/0BSD;md5=f667a3c3830a55a17ec3067709f4526c" # Unpack to ${S}/orig # diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb index 50ffce2d7..806a05e8f 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb @@ -50,7 +50,7 @@ PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup" PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt" PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev lvm2-udevrules" PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" # gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't # recognized. diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch index 45f283a02..db9769f82 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch @@ -1,4 +1,4 @@ -From 7177d8334a3c28ab0ec5c90e0656f43414929659 Mon Sep 17 00:00:00 2001 +From eba2c940afcd83521f591ccf6b49eca06908ea8e Mon Sep 17 00:00:00 2001 From: Yi Fan Yu Date: Fri, 5 Feb 2021 17:15:42 -0500 Subject: [PATCH] configure.in: bypass autoconf 2.69 version check @@ -12,11 +12,13 @@ Signed-off-by: Yi Fan Yu configure.in | 4 ---- 1 file changed, 4 deletions(-) +diff --git a/configure.in b/configure.in +index fb14dcc..a2b4a4f 100644 --- a/configure.in +++ b/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un +@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [13.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [13.4], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not @@ -25,3 +27,6 @@ Signed-off-by: Yi Fan Yu AC_COPYRIGHT([Copyright (c) 1996-2020, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.3.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.3.bb deleted file mode 100644 index 862dd61bd..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=255f15687738db8068fbe9b938c90217" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ - file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \ -" - -SRC_URI[sha256sum] = "3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.4.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.4.bb new file mode 100644 index 000000000..f63d23dbe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.4.bb @@ -0,0 +1,12 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=255f15687738db8068fbe9b938c90217" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ + file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \ +" + +SRC_URI[sha256sum] = "ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd" diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index cabaf0efb..1195b7d9a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -19,6 +19,7 @@ SRCREV_libhardware = "be55eb1f4d840c82ffaf7c47460df17ff5bc4d9b" SRCREV_libselinux = "07e9e1339ad1ba608acfba9dce2d0f474b252feb" SRCREV_build = "16e987def3d7d8f7d30805eb95cef69e52a87dbc" +SRCREV_FORMAT = "core_extras_libhardware_libselinux_build" SRC_URI = " \ git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=git/system/core \ git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb deleted file mode 100644 index 0e33275e2..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Ultralightweight JSON parser in ANSI C" -AUTHOR = "Dave Gamble" -HOMEPAGE = "https://github.com/DaveGamble/cJSON" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" - -SRC_URI = "git://github.com/DaveGamble/cJSON.git" -SRCREV = "d2735278ed1c2e4556f53a7a782063b31331dbf7" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -EXTRA_OECMAKE += "\ - -DENABLE_CJSON_UTILS=On \ - -DENABLE_CUSTOM_COMPILER_FLAGS=OFF \ - -DBUILD_SHARED_AND_STATIC_LIBS=On \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb new file mode 100644 index 000000000..1a4e53d50 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Ultralightweight JSON parser in ANSI C" +AUTHOR = "Dave Gamble" +HOMEPAGE = "https://github.com/DaveGamble/cJSON" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" + +SRC_URI = "git://github.com/DaveGamble/cJSON.git" +SRCREV = "d348621ca93571343a56862df7de4ff3bc9b5667" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +EXTRA_OECMAKE += "\ + -DENABLE_CJSON_UTILS=On \ + -DENABLE_CUSTOM_COMPILER_FLAGS=OFF \ + -DBUILD_SHARED_AND_STATIC_LIBS=On \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210815.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210815.0.bb deleted file mode 100644 index 1d8a7ecf6..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210815.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2015 Igor Santos -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Universal Ctags" -DESCRIPTION = "Universal Ctags is a multilanguage reimplementation of the \ - Unix ctags utility. Ctags generates an index of source code \ - definitions which is used by numerous editors and utilities \ - to instantly locate the definitions." - -HOMEPAGE = "https://ctags.io/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -inherit autotools-brokensep pkgconfig manpages - -SRCREV = "24f852441bb12e2cfe4f6066bf85827b934e1469" -SRC_URI = "git://github.com/universal-ctags/ctags" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= " \ - readcmd \ - xml \ - json \ - yaml \ -" -PACKAGECONFIG[readcmd] = "--enable-readcmd,--disable-readcmd" -PACKAGECONFIG[etags] = "--enable-etags,--disable-etags" -PACKAGECONFIG[xml] = "--enable-xml,--disable-xml,libxml2" -PACKAGECONFIG[json] = "--enable-json,--disable-json,jansson" -PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" -PACKAGECONFIG[yaml] = "--enable-yaml,--disable-yaml,libyaml" -PACKAGECONFIG[manpages] = ",,python3-docutils-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210905.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210905.0.bb new file mode 100644 index 000000000..3289436fa --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210905.0.bb @@ -0,0 +1,34 @@ +# Copyright (C) 2015 Igor Santos +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Universal Ctags" +DESCRIPTION = "Universal Ctags is a multilanguage reimplementation of the \ + Unix ctags utility. Ctags generates an index of source code \ + definitions which is used by numerous editors and utilities \ + to instantly locate the definitions." + +HOMEPAGE = "https://ctags.io/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +inherit autotools-brokensep pkgconfig manpages + +SRCREV = "ca81123303640582358ce7b8a4e466615950a1f7" +SRC_URI = "git://github.com/universal-ctags/ctags" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= " \ + readcmd \ + xml \ + json \ + yaml \ +" +PACKAGECONFIG[readcmd] = "--enable-readcmd,--disable-readcmd" +PACKAGECONFIG[etags] = "--enable-etags,--disable-etags" +PACKAGECONFIG[xml] = "--enable-xml,--disable-xml,libxml2" +PACKAGECONFIG[json] = "--enable-json,--disable-json,jansson" +PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" +PACKAGECONFIG[yaml] = "--enable-yaml,--disable-yaml,libyaml" +PACKAGECONFIG[manpages] = ",,python3-docutils-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index 8835f3233..60ca2ab28 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -4,8 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master " -SRCREV = "6d3fab9b9559b6a483fe668e39c29126cdbb58d8" -PV = "1.2" +SRCREV = "b0d80b7129f1d84cc563a4098d869e7420bcf4bc" +PV = "1.3" SRC_URI:append:class-target = " file://oe-remote.repo.sample" diff --git a/meta-openembedded/meta-oe/recipes-devtools/lua/lua/CVE-2020-15945.patch b/meta-openembedded/meta-oe/recipes-devtools/lua/lua/CVE-2020-15945.patch deleted file mode 100644 index 89ce49148..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/lua/lua/CVE-2020-15945.patch +++ /dev/null @@ -1,167 +0,0 @@ -From d8d344365945a534f700c82c5dd26f704f89fef3 Mon Sep 17 00:00:00 2001 -From: Roberto Ierusalimschy -Date: Wed, 5 Aug 2020 16:59:58 +0800 -Subject: [PATCH] Fixed bug: invalid 'oldpc' when returning to a function - -The field 'L->oldpc' is not always updated when control returns to a -function; an invalid value can seg. fault when computing 'changedline'. -(One example is an error in a finalizer; control can return to -'luaV_execute' without executing 'luaD_poscall'.) Instead of trying to -fix all possible corner cases, it seems safer to be resilient to invalid -values for 'oldpc'. Valid but wrong values at most cause an extra call -to a line hook. - -CVE: CVE-2020-15945 - -[Adjust the code to be applicable to the tree] - -Upstream-Status: Backport [https://github.com/lua/lua/commit/a2195644d89812e5b157ce7bac35543e06db05e3] - -Signed-off-by: Wenlin Kang -Signed-off-by: Joe Slater - ---- - src/ldebug.c | 30 +++++++++++++++--------------- - src/ldebug.h | 4 ++++ - src/ldo.c | 2 +- - src/lstate.c | 1 + - src/lstate.h | 2 +- - 5 files changed, 22 insertions(+), 17 deletions(-) - -diff --git a/src/ldebug.c b/src/ldebug.c -index 239affb..832b16c 100644 ---- a/src/ldebug.c -+++ b/src/ldebug.c -@@ -34,9 +34,8 @@ - #define noLuaClosure(f) ((f) == NULL || (f)->c.tt == LUA_TCCL) - - --/* Active Lua function (given call info) */ --#define ci_func(ci) (clLvalue((ci)->func)) -- -+/* inverse of 'pcRel' */ -+#define invpcRel(pc, p) ((p)->code + (pc) + 1) - - static const char *funcnamefromcode (lua_State *L, CallInfo *ci, - const char **name); -@@ -71,20 +70,18 @@ static void swapextra (lua_State *L) { - - /* - ** This function can be called asynchronously (e.g. during a signal). --** Fields 'oldpc', 'basehookcount', and 'hookcount' (set by --** 'resethookcount') are for debug only, and it is no problem if they --** get arbitrary values (causes at most one wrong hook call). 'hookmask' --** is an atomic value. We assume that pointers are atomic too (e.g., gcc --** ensures that for all platforms where it runs). Moreover, 'hook' is --** always checked before being called (see 'luaD_hook'). -+** Fields 'basehookcount' and 'hookcount' (set by 'resethookcount') -+** are for debug only, and it is no problem if they get arbitrary -+** values (causes at most one wrong hook call). 'hookmask' is an atomic -+** value. We assume that pointers are atomic too (e.g., gcc ensures that -+** for all platforms where it runs). Moreover, 'hook' is always checked -+** before being called (see 'luaD_hook'). - */ - LUA_API void lua_sethook (lua_State *L, lua_Hook func, int mask, int count) { - if (func == NULL || mask == 0) { /* turn off hooks? */ - mask = 0; - func = NULL; - } -- if (isLua(L->ci)) -- L->oldpc = L->ci->u.l.savedpc; - L->hook = func; - L->basehookcount = count; - resethookcount(L); -@@ -665,7 +662,10 @@ l_noret luaG_runerror (lua_State *L, const char *fmt, ...) { - void luaG_traceexec (lua_State *L) { - CallInfo *ci = L->ci; - lu_byte mask = L->hookmask; -+ const Proto *p = ci_func(ci)->p; - int counthook = (--L->hookcount == 0 && (mask & LUA_MASKCOUNT)); -+ /* 'L->oldpc' may be invalid; reset it in this case */ -+ int oldpc = (L->oldpc < p->sizecode) ? L->oldpc : 0; - if (counthook) - resethookcount(L); /* reset count */ - else if (!(mask & LUA_MASKLINE)) -@@ -677,15 +677,15 @@ void luaG_traceexec (lua_State *L) { - if (counthook) - luaD_hook(L, LUA_HOOKCOUNT, -1); /* call count hook */ - if (mask & LUA_MASKLINE) { -- Proto *p = ci_func(ci)->p; - int npc = pcRel(ci->u.l.savedpc, p); - int newline = getfuncline(p, npc); - if (npc == 0 || /* call linehook when enter a new function, */ -- ci->u.l.savedpc <= L->oldpc || /* when jump back (loop), or when */ -- newline != getfuncline(p, pcRel(L->oldpc, p))) /* enter a new line */ -+ ci->u.l.savedpc <= invpcRel(oldpc, p) || /* when jump back (loop), or when */ -+ newline != getfuncline(p, oldpc)) /* enter a new line */ - luaD_hook(L, LUA_HOOKLINE, newline); /* call line hook */ -+ -+ L->oldpc = npc; /* 'pc' of last call to line hook */ - } -- L->oldpc = ci->u.l.savedpc; - if (L->status == LUA_YIELD) { /* did hook yield? */ - if (counthook) - L->hookcount = 1; /* undo decrement to zero */ -diff --git a/src/ldebug.h b/src/ldebug.h -index 0e31546..c224cc4 100644 ---- a/src/ldebug.h -+++ b/src/ldebug.h -@@ -13,6 +13,10 @@ - - #define pcRel(pc, p) (cast(int, (pc) - (p)->code) - 1) - -+/* Active Lua function (given call info) */ -+#define ci_func(ci) (clLvalue((ci)->func)) -+ -+ - #define getfuncline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : -1) - - #define resethookcount(L) (L->hookcount = L->basehookcount) -diff --git a/src/ldo.c b/src/ldo.c -index 90b695f..f66ac1a 100644 ---- a/src/ldo.c -+++ b/src/ldo.c -@@ -382,7 +382,7 @@ int luaD_poscall (lua_State *L, CallInfo *ci, StkId firstResult, int nres) { - luaD_hook(L, LUA_HOOKRET, -1); - firstResult = restorestack(L, fr); - } -- L->oldpc = ci->previous->u.l.savedpc; /* 'oldpc' for caller function */ -+ L->oldpc = pcRel(ci->u.l.savedpc, ci_func(ci)->p); /* 'oldpc' for caller function */ - } - res = ci->func; /* res == final position of 1st result */ - L->ci = ci->previous; /* back to caller */ -diff --git a/src/lstate.c b/src/lstate.c -index 9194ac3..3573e36 100644 ---- a/src/lstate.c -+++ b/src/lstate.c -@@ -236,6 +236,7 @@ static void preinit_thread (lua_State *L, global_State *g) { - L->nny = 1; - L->status = LUA_OK; - L->errfunc = 0; -+ L->oldpc = 0; - } - - -diff --git a/src/lstate.h b/src/lstate.h -index a469466..d75eadf 100644 ---- a/src/lstate.h -+++ b/src/lstate.h -@@ -164,7 +164,6 @@ struct lua_State { - StkId top; /* first free slot in the stack */ - global_State *l_G; - CallInfo *ci; /* call info for current function */ -- const Instruction *oldpc; /* last pc traced */ - StkId stack_last; /* last free slot in the stack */ - StkId stack; /* stack base */ - UpVal *openupval; /* list of open upvalues in this stack */ -@@ -174,6 +173,7 @@ struct lua_State { - CallInfo base_ci; /* CallInfo for first level (C calling Lua) */ - volatile lua_Hook hook; - ptrdiff_t errfunc; /* current error handling function (stack index) */ -+ int oldpc; /* last pc traced */ - int stacksize; - int basehookcount; - int hookcount; --- -2.13.3 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.6.bb b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.6.bb index f830e0925..af3054dcb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.6.bb @@ -8,7 +8,6 @@ SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ file://lua.pc.in \ file://0001-Allow-building-lua-without-readline-on-Linux.patch \ file://CVE-2020-15888.patch \ - file://CVE-2020-15945.patch \ file://0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb deleted file mode 100644 index 5224f32b0..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "MessagePack implementation for C and C++" -DESCRIPTION = "MessagePack is an efficient binary serialization format. It's like JSON. but fast and small" -HOMEPAGE = "http://msgpack.org/index.html" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ - file://COPYING;md5=0639c4209b6f2abf1437c813b208f2d3 \ - file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ - " - -PV .= "+git${SRCPV}" - -SRC_URI = "git://github.com/msgpack/msgpack-c \ - " -# cpp-3.2.1 -SRCREV = "8085ab8721090a447cf98bb802d1406ad7afe420" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_4.0.0.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_4.0.0.bb new file mode 100644 index 000000000..1bb371add --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_4.0.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "MessagePack implementation for C and C++" +DESCRIPTION = "MessagePack is an efficient binary serialization format. It's like JSON. but fast and small" +HOMEPAGE = "http://msgpack.org/index.html" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ + file://COPYING;md5=0639c4209b6f2abf1437c813b208f2d3 \ + file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ + " + +PV .= "+git${SRCPV}" + +SRC_URI = "git://github.com/msgpack/msgpack-c;branch=c_master \ + " +SRCREV = "a9a48cea3a78ba661ee8096b5dab456361b0ff23" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb new file mode 100644 index 000000000..f66a00bd8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb @@ -0,0 +1,22 @@ +SUMMARY = "MessagePack implementation for C and C++" +DESCRIPTION = "MessagePack is an efficient binary serialization format. It's like JSON. but fast and small" +HOMEPAGE = "http://msgpack.org/index.html" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ + file://COPYING;md5=0639c4209b6f2abf1437c813b208f2d3 \ + file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ + " + +PV .= "+git${SRCPV}" + +SRC_URI = "git://github.com/msgpack/msgpack-c;branch=cpp_master \ + " +SRCREV = "3bdbf0d2ee75d46d71afa691a594777d89a22cf7" + +DEPENDS += "boost" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.2.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.2.bb new file mode 100644 index 000000000..d2015771a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.2.bb @@ -0,0 +1,28 @@ +SUMMARY = "JSON for modern C++" +HOMEPAGE = "https://nlohmann.github.io/json/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=441793d25a658d58d79a1f87516a6ad1" + +SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1 \ + " + +SRCREV = "626e7d61e44dee32887126c8f437dd077dec09cf" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" + +# nlohmann-json is a header only C++ library, so the main package will be empty. + +RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + +# other packages commonly reference the file directly as "json.hpp" +# create symlink to allow this usage +do_install:append() { + ln -s nlohmann/json.hpp ${D}${includedir}/json.hpp +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.1.bb deleted file mode 100644 index c0a1560cd..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.1.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "JSON for modern C++" -HOMEPAGE = "https://nlohmann.github.io/json/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=dd0607f896f392c8b7d0290a676efc24" - -SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1 \ - " - -SRCREV = "db78ac1d7716f56fc9f1b030b715f872f93964e4" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" - -# nlohmann-json is a header only C++ library, so the main package will be empty. - -RDEPENDS:${PN}-dev = "" - -BBCLASSEXTEND = "native nativesdk" - -# other packages commonly reference the file directly as "json.hpp" -# create symlink to allow this usage -do_install:append() { - ln -s nlohmann/json.hpp ${D}${includedir}/json.hpp -} diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0001-CMakeList.txt-make-python-optional.patch b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0001-CMakeList.txt-make-python-optional.patch new file mode 100644 index 000000000..d64cba109 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0001-CMakeList.txt-make-python-optional.patch @@ -0,0 +1,44 @@ +From f6ca8c930d0fbd2491b3cc77169e32806a14e5e9 Mon Sep 17 00:00:00 2001 +From: Matteo Croce +Date: Mon, 30 Aug 2021 16:25:56 +0200 +Subject: [PATCH] CMakeList.txt: make python optional + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=88431099950ab3e8bc1645353508d7978a6cad35] + +ostra-cg, which requires python, is installed in the destination dir. +Make it optional for embedded distributions which doesn't have the +python interpreter available. + +Signed-off-by: Matteo Croce +--- + CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4140574..8523bce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -61,6 +61,7 @@ find_package(DWARF REQUIRED) + find_package(ZLIB REQUIRED) + find_package(argp REQUIRED) + find_package(obstack REQUIRED) ++find_package(Python3 QUIET) + + # make sure git submodule(s) are checked out + find_package(Git QUIET) +@@ -185,8 +186,10 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h + elfcreator.h elf_symtab.h hash.h libctf.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dwarves/) + install(FILES man-pages/pahole.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/) +-install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ++if(Python3_FOUND) ++ install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ++ install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python) ++endif() + install(PROGRAMS btfdiff fullcircle DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +-install(FILES ostra/python/ostra.py DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime/python) + install(FILES lib/Makefile lib/ctracer_relay.c lib/ctracer_relay.h lib/linux.blacklist.cu + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dwarves/runtime) +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb new file mode 100644 index 000000000..db7d88cdf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb @@ -0,0 +1,30 @@ +SUMMARY = "Shows and manipulates data structure layout" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "elfutils zlib libbpf" + +COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux" + +SRCREV = "f02af2553ea58ae1186226af0d0ec835a248358f" +SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git \ + file://0001-CMakeList.txt-make-python-optional.patch" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG[python3] = ",,python3-core,python3-core" + +EXTRA_OECMAKE = "-D__LIB=lib -DCMAKE_BUILD_TYPE=Release -DLIBBPF_EMBEDDED=OFF" + +FILES:${PN} = "${bindir}/pahole \ + ${libdir}/libdwarves.so* \ + ${libdir}/libdwarves_reorganize.so*" + +PACKAGES += "${PN}-extra" +FILES:${PN}-extra = "${datadir} ${bindir} ${libdir}/libdwarves_emit.so*" +RDEPENDS:${PN}-extra += "bash python3-core" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb b/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb deleted file mode 100644 index a82f10b91..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Command-line programs to safely lock and unlock files and mailboxes" -DESCRIPTION = "\ -lockfile-progs provide a method to lock and unlock mailboxes and files \ -safely (via liblockfile)." -HOMEPAGE = "http://packages.qa.debian.org/l/lockfile-progs.html" -SECTION = "Applications/System" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -DEPENDS = "liblockfile" - -SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.gz" -SRC_URI[md5sum] = "4eb83bdf88016db836b7cc09591fb0f3" -SRC_URI[sha256sum] = "a42995a4b97e6188efc90fcc1a761163c4b2cff5c81b936f85c84301ddb05ce6" - -do_compile() { - oe_runmake CFLAGS=' -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables' -} - -do_install() { - install -m 755 -d ${D}${bindir} - install bin/* ${D}${bindir} - install -m 755 -d ${D}${mandir}/man1 - install man/* ${D}${mandir}/man1 -} diff --git a/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb b/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb new file mode 100644 index 000000000..df88afa31 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb @@ -0,0 +1,23 @@ +SUMMARY = "Command-line programs to safely lock and unlock files and mailboxes" +DESCRIPTION = "\ +lockfile-progs provide a method to lock and unlock mailboxes and files \ +safely (via liblockfile)." +HOMEPAGE = "http://packages.qa.debian.org/l/lockfile-progs.html" +SECTION = "Applications/System" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" +DEPENDS = "liblockfile" + +SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.gz" +SRC_URI[sha256sum] = "2c5704b01c8f474f82921780e4592a927b2bf6a6d7616354a6c5d7cd5664857e" + +do_compile() { + oe_runmake CFLAGS=' -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables' +} + +do_install() { + install -m 755 -d ${D}${bindir} + install bin/* ${D}${bindir} + install -m 755 -d ${D}${mandir}/man1 + install man/* ${D}${mandir}/man1 +} diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch index daf0b1edb..76308ffdb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch @@ -5,6 +5,8 @@ Subject: [PATCH] GHSL-2021-074: authentication bypass vulnerability in polkit initial values returned if error caught +CVE: CVE-2021-3560 + Upstream-Status: Backport [https://gitlab.freedesktop.org/polkit/polkit/-/commit/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81] Signed-off-by: Mingli Yu diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb deleted file mode 100644 index 0db71240e..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Redis key-value store" -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=8ffdd6c926faaece928cf9d9640132d2" -DEPENDS = "readline lua ncurses" - -SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ - file://redis.conf \ - file://init-redis-server \ - file://redis.service \ - file://hiredis-use-default-CC-if-it-is-set.patch \ - file://lua-update-Makefile-to-use-environment-build-setting.patch \ - file://oe-use-libc-malloc.patch \ - file://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://GNU_SOURCE.patch \ - file://0006-Define-correct-gregs-for-RISCV32.patch \ - " -SRC_URI[sha256sum] = "ba32c406a10fc2c09426e2be2787d74ff204eb3a2e496d87cff76a476b6ae16e" - -inherit autotools-brokensep update-rc.d systemd useradd - -FINAL_LIBS:x86:toolchain-clang = "-latomic" -FINAL_LIBS:riscv32:toolchain-clang = "-latomic" -FINAL_LIBS:mips = "-latomic" -FINAL_LIBS:arm = "-latomic" -FINAL_LIBS:powerpc = "-latomic" - -export FINAL_LIBS - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" -GROUPADD_PARAM:${PN} = "--system redis" - -REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" - -do_compile:prepend() { - (cd deps && oe_runmake hiredis lua linenoise) -} - -do_install() { - export PREFIX=${D}/${prefix} - oe_runmake install - install -d ${D}/${sysconfdir}/redis - install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server - install -d ${D}/var/lib/redis/ - chown redis.redis ${D}/var/lib/redis/ - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service - - if [ "${REDIS_ON_SYSTEMD}" = true ]; then - sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf - fi -} - -CONFFILES:${PN} = "${sysconfdir}/redis/redis.conf" - -INITSCRIPT_NAME = "redis-server" -INITSCRIPT_PARAMS = "defaults 87" - -SYSTEMD_SERVICE:${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.5.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.5.bb new file mode 100644 index 000000000..58d759b59 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.5.bb @@ -0,0 +1,66 @@ +SUMMARY = "Redis key-value store" +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=8ffdd6c926faaece928cf9d9640132d2" +DEPENDS = "readline lua ncurses" + +SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ + file://redis.conf \ + file://init-redis-server \ + file://redis.service \ + file://hiredis-use-default-CC-if-it-is-set.patch \ + file://lua-update-Makefile-to-use-environment-build-setting.patch \ + file://oe-use-libc-malloc.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ + file://GNU_SOURCE.patch \ + file://0006-Define-correct-gregs-for-RISCV32.patch \ + " +SRC_URI[sha256sum] = "4b9a75709a1b74b3785e20a6c158cab94cf52298aa381eea947a678a60d551ae" + +inherit autotools-brokensep update-rc.d systemd useradd + +FINAL_LIBS:x86:toolchain-clang = "-latomic" +FINAL_LIBS:riscv32:toolchain-clang = "-latomic" +FINAL_LIBS:mips = "-latomic" +FINAL_LIBS:arm = "-latomic" +FINAL_LIBS:powerpc = "-latomic" + +export FINAL_LIBS + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" +GROUPADD_PARAM:${PN} = "--system redis" + +REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" + +do_compile:prepend() { + (cd deps && oe_runmake hiredis lua linenoise) +} + +do_install() { + export PREFIX=${D}/${prefix} + oe_runmake install + install -d ${D}/${sysconfdir}/redis + install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server + install -d ${D}/var/lib/redis/ + chown redis.redis ${D}/var/lib/redis/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service + + if [ "${REDIS_ON_SYSTEMD}" = true ]; then + sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf + fi +} + +CONFFILES:${PN} = "${sysconfdir}/redis/redis.conf" + +INITSCRIPT_NAME = "redis-server" +INITSCRIPT_PARAMS = "defaults 87" + +SYSTEMD_SERVICE:${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 8d63a10e5..1a2d33090 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -45,3 +45,8 @@ ALTERNATIVE:${PN} = "candump cansend cansequence" ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence" + +# busybox ip fails to configure can interfaces, so we need iproute2 to do so. +# See details in http://www.armadeus.com/wiki/index.php?title=CAN_bus_Linux_driver. +RRECOMMENDS:${PN} += "iproute2" + diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb deleted file mode 100644 index e96ef004a..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Library for reading and writing Jcat files" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" - -DEPENDS = "\ - glib-2.0 \ - json-glib \ -" - -SRC_URI = "\ - git://github.com/hughsie/libjcat.git \ - file://run-ptest \ -" -SRCREV = "e5307885528cf07058be073d0621624749cc10df" -S = "${WORKDIR}/git" - -inherit gobject-introspection gtk-doc meson ptest-gnome vala - -PACKAGECONFIG ??= "\ - gpg \ - pkcs7 \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ -" -PACKAGECONFIG[gpg] = "-Dgpg=true,-Dgpg=false,gpgme" -PACKAGECONFIG[pkcs7] = "-Dpkcs7=true,-Dpkcs7=false,gnutls gnutls-native" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" - -# manpage generation is broken because help2man needs to run the target binary on the host... -EXTRA_OEMESON = "-Dman=false" -GTKDOC_MESON_OPTION = "gtkdoc" - -RDEPENDS:${PN}:class-target = "\ - ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ -" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.8.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.8.bb new file mode 100644 index 000000000..977c3213f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.8.bb @@ -0,0 +1,34 @@ +SUMMARY = "Library for reading and writing Jcat files" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" + +DEPENDS = "\ + glib-2.0 \ + json-glib \ +" + +SRC_URI = "\ + git://github.com/hughsie/libjcat.git \ + file://run-ptest \ +" +SRCREV = "356cd2faf2d2197156b0dae7984482cf781d64db" +S = "${WORKDIR}/git" + +inherit gobject-introspection gtk-doc meson ptest-gnome vala + +PACKAGECONFIG ??= "\ + gpg \ + pkcs7 \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" +PACKAGECONFIG[gpg] = "-Dgpg=true,-Dgpg=false,gpgme" +PACKAGECONFIG[pkcs7] = "-Dpkcs7=true,-Dpkcs7=false,gnutls gnutls-native" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" + +# manpage generation is broken because help2man needs to run the target binary on the host... +EXTRA_OEMESON = "-Dman=false" +GTKDOC_MESON_OPTION = "gtkdoc" + +RDEPENDS:${PN}:class-target = "\ + ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ +" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.1.bb b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.1.bb deleted file mode 100644 index 72d3aba44..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A library to help create and query binary XML blobs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" - -SRC_URI = "\ - git://github.com/hughsie/libxmlb.git \ - file://run-ptest \ -" -SRCREV = "98fc241305306de9468249301474820696acb4be" -S = "${WORKDIR}/git" - -inherit gobject-introspection gtk-doc meson ptest-gnome - -PACKAGECONFIG ??= "\ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ -" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" - -GTKDOC_MESON_OPTION = "gtkdoc" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.2.bb b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.2.bb new file mode 100644 index 000000000..cacb493a1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "A library to help create and query binary XML blobs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" + +SRC_URI = "\ + git://github.com/hughsie/libxmlb.git \ + file://run-ptest \ +" +SRCREV = "994fd0ec3d28da82b5965949a9d925510f603562" +S = "${WORKDIR}/git" + +inherit gobject-introspection gtk-doc meson ptest-gnome + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" + +GTKDOC_MESON_OPTION = "gtkdoc" diff --git a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes/0001-build-use-autotools.patch b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes/0001-build-use-autotools.patch index 25771168c..0c9fe62b1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes/0001-build-use-autotools.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes/0001-build-use-autotools.patch @@ -60,7 +60,7 @@ index 6264da0..0000000 +++ /dev/null @@ -1,66 +0,0 @@ -TARGET = unclutter --VERSION = 1.5 +-VERSION = 1.6 -SDIR = src -IDIR = include -ODIR = obj diff --git a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb deleted file mode 100644 index e56803e4e..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Remove idle cursor image from screen." -DESCRIPTION = "This is a rewrite of the popular tool unclutter, but using the x11-xfixes extension." -AUTHOR = "Ingo Bürk" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b25d2c4cca175f44120d1b8e67cb358d" - -SRC_URI = "git://github.com/Airblader/unclutter-xfixes.git \ - file://0001-build-use-autotools.patch" -SRCREV = "10fd337bb77e4e93c3380f630a0555372778a948" - -inherit autotools pkgconfig features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -DEPENDS = "libev libx11 libxi libxfixes" - -S = "${WORKDIR}/git" - -do_install:append() { - # LICENSE is installed to /usr/share/licenses but we don't want it in the package - rm -rf ${D}${datadir} -} diff --git a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb new file mode 100644 index 000000000..8a6b6f814 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb @@ -0,0 +1,23 @@ +SUMMARY = "Remove idle cursor image from screen." +DESCRIPTION = "This is a rewrite of the popular tool unclutter, but using the x11-xfixes extension." +AUTHOR = "Ingo Bürk" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b25d2c4cca175f44120d1b8e67cb358d" + +SRC_URI = "git://github.com/Airblader/unclutter-xfixes.git \ + file://0001-build-use-autotools.patch" +SRCREV = "160ae3760a51126eb225ce77d83e4706eccd4ed9" + +inherit autotools pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS = "libev libx11 libxi libxfixes" + +S = "${WORKDIR}/git" + +do_install:append() { + # LICENSE is installed to /usr/share/licenses but we don't want it in the package + rm -rf ${D}${datadir} +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_367.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_367.bb deleted file mode 100644 index ee25dc872..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_367.bb +++ /dev/null @@ -1,48 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc -SUMMARY = "xterm is the standard terminal emulator for the X Window System" -DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" - -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=987de9787175385203a1ea2482246a17" - -SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ - file://0001-Add-configure-time-check-for-setsid.patch \ - " - -SRC_URI[sha256sum] = "27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f" - -PACKAGECONFIG ?= "" -PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" - -# Let xterm install .desktop files -inherit mime-xdg - -EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ - --disable-imake \ - --disable-rpath-hack \ - --disable-setuid \ - --with-app-defaults=${datadir}/X11/app-defaults \ - " - -B = "${S}" - -do_configure() { - gnu-configize --force - sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure - oe_runconf -} - -do_install:append() { - oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" -} - -RPROVIDES:${PN} = "virtual-x-terminal-emulator" - -# busybox can supply resize too -inherit update-alternatives - -ALTERNATIVE:${PN} = "resize x-terminal-emulator" -ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" -# rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. -ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_368.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_368.bb new file mode 100644 index 000000000..8f6a7ef76 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_368.bb @@ -0,0 +1,48 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc +SUMMARY = "xterm is the standard terminal emulator for the X Window System" +DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" + +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=987de9787175385203a1ea2482246a17" + +SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ + file://0001-Add-configure-time-check-for-setsid.patch \ + " + +SRC_URI[sha256sum] = "2ff5169930b6b49ef0bafb5e1331c94f1a98c310442bba7798add821c76ae712" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" + +# Let xterm install .desktop files +inherit mime-xdg + +EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ + FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ + --disable-imake \ + --disable-rpath-hack \ + --disable-setuid \ + --with-app-defaults=${datadir}/X11/app-defaults \ + " + +B = "${S}" + +do_configure() { + gnu-configize --force + sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure + oe_runconf +} + +do_install:append() { + oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" +} + +RPROVIDES:${PN} = "virtual-x-terminal-emulator" + +# busybox can supply resize too +inherit update-alternatives + +ALTERNATIVE:${PN} = "resize x-terminal-emulator" +ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" +# rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. +ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb deleted file mode 100644 index fb24c6384..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb +++ /dev/null @@ -1,19 +0,0 @@ -require recipes-graphics/xorg-driver/xorg-driver-video.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94" - -SUMMARY = "X.Org X server -- nouveau video driver" - -DESCRIPTION = "Open-source X.org graphics driver for NVIDIA graphics" - -DEPENDS += "virtual/libx11 libxvmc drm xorgproto \ - virtual/libgl libpciaccess" -RDEPENDS:${PN} += "xserver-xorg-module-exa" - -inherit features_check -REQUIRED_DISTRO_FEATURES += "opengl" - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -SRC_URI[md5sum] = "ecd9be89d853301167e3d564c49f7a8e" -SRC_URI[sha256sum] = "304060806415579cdb5c1f71f1c54d11cacb431b5552b170decbc883ed43bf06" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb new file mode 100644 index 000000000..d9d09a242 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb @@ -0,0 +1,18 @@ +require recipes-graphics/xorg-driver/xorg-driver-video.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94" + +SUMMARY = "X.Org X server -- nouveau video driver" + +DESCRIPTION = "Open-source X.org graphics driver for NVIDIA graphics" + +DEPENDS += "virtual/libx11 libxvmc drm xorgproto \ + virtual/libgl libpciaccess" +RDEPENDS:${PN} += "xserver-xorg-module-exa" + +inherit features_check +REQUIRED_DISTRO_FEATURES += "opengl" + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +SRC_URI[sha256sum] = "499322e27a55c8183166bf2dd1e47d085eb834143e0d7036baba8427b90c156b" diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch deleted file mode 100644 index 1aaf1e6b0..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch +++ /dev/null @@ -1,445 +0,0 @@ -From a5531b24750e7949c35640d996ea14c0587938bc Mon Sep 17 00:00:00 2001 -From: John Ogness -Date: Fri, 20 Nov 2020 05:56:59 +0000 -Subject: [PATCH 1/2] printk: add support for lockless ringbuffer - -Linux 5.10 introduces a new lockless ringbuffer. The new ringbuffer -is structured completely different to the previous iterations. -Add support for dumping the ringbuffer with the "log" command. -The new ringbuffer is detected based on the availability of -the "prb" symbol. - -Upstream-Status: Backport [https://github.com/crash-utility/crash/commit/a5531b24750e7949c35640d996ea14c0587938bc] - -Signed-off-by: John Ogness -Signed-off-by: Kazuhito Hagio -Signed-off-by: Mingli Yu ---- - Makefile | 5 ++ - defs.h | 30 +++++++ - kernel.c | 7 +- - printk.c | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - symbols.c | 27 ++++++ - 5 files changed, 324 insertions(+), 1 deletion(-) - create mode 100644 printk.c - -diff --git a/Makefile b/Makefile -index d185719..f66eba7 100644 ---- a/Makefile -+++ b/Makefile -@@ -61,6 +61,7 @@ VMWARE_HFILES=vmware_vmss.h - - CFILES=main.c tools.c global_data.c memory.c filesys.c help.c task.c \ - kernel.c test.c gdb_interface.c configure.c net.c dev.c bpf.c \ -+ printk.c \ - alpha.c x86.c ppc.c ia64.c s390.c s390x.c s390dbf.c ppc64.c x86_64.c \ - arm.c arm64.c mips.c sparc64.c \ - extensions.c remote.c va_server.c va_server_v1.c symbols.c cmdline.c \ -@@ -80,6 +81,7 @@ SOURCE_FILES=${CFILES} ${GENERIC_HFILES} ${MCORE_HFILES} \ - - OBJECT_FILES=main.o tools.o global_data.o memory.o filesys.o help.o task.o \ - build_data.o kernel.o test.o gdb_interface.o net.o dev.o bpf.o \ -+ printk.o \ - alpha.o x86.o ppc.o ia64.o s390.o s390x.o s390dbf.o ppc64.o x86_64.o \ - arm.o arm64.o mips.o sparc64.o \ - extensions.o remote.o va_server.o va_server_v1.o symbols.o cmdline.o \ -@@ -363,6 +365,9 @@ task.o: ${GENERIC_HFILES} task.c - kernel.o: ${GENERIC_HFILES} kernel.c - ${CC} -c ${CRASH_CFLAGS} kernel.c ${WARNING_OPTIONS} ${WARNING_ERROR} - -+printk.o: ${GENERIC_HFILES} printk.c -+ ${CC} -c ${CRASH_CFLAGS} printk.c ${WARNING_OPTIONS} ${WARNING_ERROR} -+ - gdb_interface.o: ${GENERIC_HFILES} gdb_interface.c - ${CC} -c ${CRASH_CFLAGS} gdb_interface.c ${WARNING_OPTIONS} ${WARNING_ERROR} - -diff --git a/defs.h b/defs.h -index 9594950..e1a18e9 100644 ---- a/defs.h -+++ b/defs.h -@@ -2106,6 +2106,28 @@ struct offset_table { /* stash of commonly-used offsets */ - long irq_common_data_affinity; - long irq_desc_irq_common_data; - long uts_namespace_name; -+ long printk_info_seq; -+ long printk_info_ts_nsec; -+ long printk_info_text_len; -+ long printk_info_level; -+ long printk_info_caller_id; -+ long printk_info_dev_info; -+ long dev_printk_info_subsystem; -+ long dev_printk_info_device; -+ long prb_desc_ring; -+ long prb_text_data_ring; -+ long prb_desc_ring_count_bits; -+ long prb_desc_ring_descs; -+ long prb_desc_ring_infos; -+ long prb_desc_ring_head_id; -+ long prb_desc_ring_tail_id; -+ long prb_desc_state_var; -+ long prb_desc_text_blk_lpos; -+ long prb_data_blk_lpos_begin; -+ long prb_data_blk_lpos_next; -+ long prb_data_ring_size_bits; -+ long prb_data_ring_data; -+ long atomic_long_t_counter; - }; - - struct size_table { /* stash of commonly-used sizes */ -@@ -2265,6 +2287,9 @@ struct size_table { /* stash of commonly-used sizes */ - long xa_node; - long zram_table_entry; - long irq_common_data; -+ long printk_info; -+ long printk_ringbuffer; -+ long prb_desc; - }; - - struct array_table { -@@ -6696,6 +6721,11 @@ int vmware_guestdump_memory_dump(FILE *); - */ - int calc_kaslr_offset(ulong *, ulong *); - -+/* -+ * printk.c -+ */ -+void dump_lockless_record_log(int); -+ - /* - * gnu_binutils.c - */ -diff --git a/kernel.c b/kernel.c -index 9871637..e722ff9 100644 ---- a/kernel.c -+++ b/kernel.c -@@ -5042,6 +5042,11 @@ dump_log(int msg_flags) - struct syment *nsp; - int log_wrap, loglevel, log_buf_len; - -+ if (kernel_symbol_exists("prb")) { -+ dump_lockless_record_log(msg_flags); -+ return; -+ } -+ - if (kernel_symbol_exists("log_first_idx") && - kernel_symbol_exists("log_next_idx")) { - dump_variable_length_record_log(msg_flags); -@@ -5289,7 +5294,7 @@ dump_log_entry(char *logptr, int msg_flags) - } - - /* -- * Handle the new variable-length-record log_buf. -+ * Handle the variable-length-record log_buf. - */ - static void - dump_variable_length_record_log(int msg_flags) -diff --git a/printk.c b/printk.c -new file mode 100644 -index 0000000..f6d54ce ---- /dev/null -+++ b/printk.c -@@ -0,0 +1,256 @@ -+#include "defs.h" -+#include -+ -+#define DESC_SV_BITS (sizeof(unsigned long) * 8) -+#define DESC_COMMITTED_MASK (1UL << (DESC_SV_BITS - 1)) -+#define DESC_REUSE_MASK (1UL << (DESC_SV_BITS - 2)) -+#define DESC_FLAGS_MASK (DESC_COMMITTED_MASK | DESC_REUSE_MASK) -+#define DESC_ID_MASK (~DESC_FLAGS_MASK) -+ -+/* convenience struct for passing many values to helper functions */ -+struct prb_map { -+ char *prb; -+ -+ char *desc_ring; -+ unsigned long desc_ring_count; -+ char *descs; -+ char *infos; -+ -+ char *text_data_ring; -+ unsigned long text_data_ring_size; -+ char *text_data; -+}; -+ -+static void -+init_offsets(void) -+{ -+ char *n; -+ -+ n = "printk_info"; -+ STRUCT_SIZE_INIT(printk_info, n); -+ MEMBER_OFFSET_INIT(printk_info_seq, n, "seq"); -+ MEMBER_OFFSET_INIT(printk_info_ts_nsec, n, "ts_nsec"); -+ MEMBER_OFFSET_INIT(printk_info_text_len, n, "text_len"); -+ MEMBER_OFFSET_INIT(printk_info_level, n, "level"); -+ MEMBER_OFFSET_INIT(printk_info_caller_id, n, "caller_id"); -+ MEMBER_OFFSET_INIT(printk_info_dev_info, n, "dev_info"); -+ -+ n = "dev_printk_info"; -+ MEMBER_OFFSET_INIT(dev_printk_info_subsystem, n, "subsystem"); -+ MEMBER_OFFSET_INIT(dev_printk_info_device, n, "device"); -+ -+ n = "printk_ringbuffer"; -+ STRUCT_SIZE_INIT(printk_ringbuffer, n); -+ MEMBER_OFFSET_INIT(prb_desc_ring, n, "desc_ring"); -+ MEMBER_OFFSET_INIT(prb_text_data_ring, n, "text_data_ring"); -+ -+ n = "prb_desc_ring"; -+ MEMBER_OFFSET_INIT(prb_desc_ring_count_bits, n, "count_bits"); -+ MEMBER_OFFSET_INIT(prb_desc_ring_descs, n, "descs"); -+ MEMBER_OFFSET_INIT(prb_desc_ring_infos, n, "infos"); -+ MEMBER_OFFSET_INIT(prb_desc_ring_head_id, n, "head_id"); -+ MEMBER_OFFSET_INIT(prb_desc_ring_tail_id, n, "tail_id"); -+ -+ n = "prb_desc"; -+ STRUCT_SIZE_INIT(prb_desc, n); -+ MEMBER_OFFSET_INIT(prb_desc_state_var, n, "state_var"); -+ MEMBER_OFFSET_INIT(prb_desc_text_blk_lpos, n, "text_blk_lpos"); -+ -+ n = "prb_data_blk_lpos"; -+ MEMBER_OFFSET_INIT(prb_data_blk_lpos_begin, n, "begin"); -+ MEMBER_OFFSET_INIT(prb_data_blk_lpos_next, n, "next"); -+ -+ n = "prb_data_ring"; -+ MEMBER_OFFSET_INIT(prb_data_ring_size_bits, n, "size_bits"); -+ MEMBER_OFFSET_INIT(prb_data_ring_data, n, "data"); -+ -+ n = "atomic_long_t"; -+ MEMBER_OFFSET_INIT(atomic_long_t_counter, n, "counter"); -+} -+ -+static void -+dump_record(struct prb_map *m, unsigned long id, int msg_flags) -+{ -+ unsigned short text_len; -+ unsigned long state_var; -+ unsigned int caller_id; -+ unsigned char level; -+ unsigned long begin; -+ unsigned long next; -+ char buf[BUFSIZE]; -+ uint64_t ts_nsec; -+ ulonglong nanos; -+ ulonglong seq; -+ int ilen = 0, i; -+ char *desc, *info, *text, *p; -+ ulong rem; -+ -+ desc = m->descs + ((id % m->desc_ring_count) * SIZE(prb_desc)); -+ -+ /* skip non-committed record */ -+ state_var = ULONG(desc + OFFSET(prb_desc_state_var) + -+ OFFSET(atomic_long_t_counter)); -+ if ((state_var & DESC_FLAGS_MASK) != DESC_COMMITTED_MASK) -+ return; -+ -+ info = m->infos + ((id % m->desc_ring_count) * SIZE(printk_info)); -+ -+ seq = ULONGLONG(info + OFFSET(printk_info_seq)); -+ caller_id = UINT(info + OFFSET(printk_info_caller_id)); -+ if (CRASHDEBUG(1)) -+ fprintf(fp, "seq: %llu caller_id: %x (%s: %u)\n", seq, caller_id, -+ caller_id & 0x80000000 ? "cpu" : "pid", caller_id & ~0x80000000); -+ -+ text_len = USHORT(info + OFFSET(printk_info_text_len)); -+ -+ begin = ULONG(desc + OFFSET(prb_desc_text_blk_lpos) + -+ OFFSET(prb_data_blk_lpos_begin)) % -+ m->text_data_ring_size; -+ next = ULONG(desc + OFFSET(prb_desc_text_blk_lpos) + -+ OFFSET(prb_data_blk_lpos_next)) % -+ m->text_data_ring_size; -+ -+ /* skip data-less text blocks */ -+ if (begin == next) -+ goto out; -+ -+ if ((msg_flags & SHOW_LOG_TEXT) == 0) { -+ ts_nsec = ULONGLONG(info + OFFSET(printk_info_ts_nsec)); -+ nanos = (ulonglong)ts_nsec / (ulonglong)1000000000; -+ rem = (ulonglong)ts_nsec % (ulonglong)1000000000; -+ if (msg_flags & SHOW_LOG_CTIME) { -+ time_t t = kt->boot_date.tv_sec + nanos; -+ sprintf(buf, "[%s] ", ctime_tz(&t)); -+ } else -+ sprintf(buf, "[%5lld.%06ld] ", nanos, rem/1000); -+ -+ ilen += strlen(buf); -+ fprintf(fp, "%s", buf); -+ } -+ -+ if (msg_flags & SHOW_LOG_LEVEL) { -+ level = UCHAR(info + OFFSET(printk_info_level)) >> 5; -+ sprintf(buf, "<%x>", level); -+ ilen += strlen(buf); -+ fprintf(fp, "%s", buf); -+ } -+ -+ /* handle wrapping data block */ -+ if (begin > next) -+ begin = 0; -+ -+ /* skip over descriptor ID */ -+ begin += sizeof(unsigned long); -+ -+ /* handle truncated messages */ -+ if (next - begin < text_len) -+ text_len = next - begin; -+ -+ text = m->text_data + begin; -+ -+ for (i = 0, p = text; i < text_len; i++, p++) { -+ if (*p == '\n') -+ fprintf(fp, "\n%s", space(ilen)); -+ else if (isprint(*p) || isspace(*p)) -+ fputc(*p, fp); -+ else -+ fputc('.', fp); -+ } -+ -+ if (msg_flags & SHOW_LOG_DICT) { -+ text = info + OFFSET(printk_info_dev_info) + -+ OFFSET(dev_printk_info_subsystem); -+ if (strlen(text)) -+ fprintf(fp, "\n%sSUBSYSTEM=%s", space(ilen), text); -+ -+ text = info + OFFSET(printk_info_dev_info) + -+ OFFSET(dev_printk_info_device); -+ if (strlen(text)) -+ fprintf(fp, "\n%sDEVICE=%s", space(ilen), text); -+ } -+out: -+ fprintf(fp, "\n"); -+} -+ -+/* -+ * Handle the lockless printk_ringbuffer. -+ */ -+void -+dump_lockless_record_log(int msg_flags) -+{ -+ unsigned long head_id; -+ unsigned long tail_id; -+ unsigned long kaddr; -+ unsigned long id; -+ struct prb_map m; -+ -+ if (INVALID_SIZE(printk_info)) -+ init_offsets(); -+ -+ /* setup printk_ringbuffer */ -+ get_symbol_data("prb", sizeof(char *), &kaddr); -+ m.prb = GETBUF(SIZE(printk_ringbuffer)); -+ if (!readmem(kaddr, KVADDR, m.prb, SIZE(printk_ringbuffer), -+ "printk_ringbuffer contents", RETURN_ON_ERROR|QUIET)) { -+ error(WARNING, "\ncannot read printk_ringbuffer contents\n"); -+ goto out_prb; -+ } -+ -+ /* setup descriptor ring */ -+ m.desc_ring = m.prb + OFFSET(prb_desc_ring); -+ m.desc_ring_count = 1 << UINT(m.desc_ring + OFFSET(prb_desc_ring_count_bits)); -+ -+ kaddr = ULONG(m.desc_ring + OFFSET(prb_desc_ring_descs)); -+ m.descs = GETBUF(SIZE(prb_desc) * m.desc_ring_count); -+ if (!readmem(kaddr, KVADDR, m.descs, SIZE(prb_desc) * m.desc_ring_count, -+ "prb_desc_ring contents", RETURN_ON_ERROR|QUIET)) { -+ error(WARNING, "\ncannot read prb_desc_ring contents\n"); -+ goto out_descs; -+ } -+ -+ kaddr = ULONG(m.desc_ring + OFFSET(prb_desc_ring_infos)); -+ m.infos = GETBUF(SIZE(printk_info) * m.desc_ring_count); -+ if (!readmem(kaddr, KVADDR, m.infos, SIZE(printk_info) * m.desc_ring_count, -+ "prb_info_ring contents", RETURN_ON_ERROR|QUIET)) { -+ error(WARNING, "\ncannot read prb_info_ring contents\n"); -+ goto out_infos; -+ } -+ -+ /* setup text data ring */ -+ m.text_data_ring = m.prb + OFFSET(prb_text_data_ring); -+ m.text_data_ring_size = 1 << UINT(m.text_data_ring + OFFSET(prb_data_ring_size_bits)); -+ -+ kaddr = ULONG(m.text_data_ring + OFFSET(prb_data_ring_data)); -+ m.text_data = GETBUF(m.text_data_ring_size); -+ if (!readmem(kaddr, KVADDR, m.text_data, m.text_data_ring_size, -+ "prb_text_data_ring contents", RETURN_ON_ERROR|QUIET)) { -+ error(WARNING, "\ncannot read prb_text_data_ring contents\n"); -+ goto out_text_data; -+ } -+ -+ /* ready to go */ -+ -+ tail_id = ULONG(m.desc_ring + OFFSET(prb_desc_ring_tail_id) + -+ OFFSET(atomic_long_t_counter)); -+ head_id = ULONG(m.desc_ring + OFFSET(prb_desc_ring_head_id) + -+ OFFSET(atomic_long_t_counter)); -+ -+ hq_open(); -+ -+ for (id = tail_id; id != head_id; id = (id + 1) & DESC_ID_MASK) -+ dump_record(&m, id, msg_flags); -+ -+ /* dump head record */ -+ dump_record(&m, id, msg_flags); -+ -+ hq_close(); -+ -+out_text_data: -+ FREEBUF(m.text_data); -+out_infos: -+ FREEBUF(m.infos); -+out_descs: -+ FREEBUF(m.descs); -+out_prb: -+ FREEBUF(m.prb); -+} -diff --git a/symbols.c b/symbols.c -index b2f4eb5..a51078d 100644 ---- a/symbols.c -+++ b/symbols.c -@@ -10426,6 +10426,30 @@ dump_offset_table(char *spec, ulong makestruct) - OFFSET(log_level)); - fprintf(fp, " log_flags_level: %ld\n", - OFFSET(log_flags_level)); -+ -+ fprintf(fp, " printk_info_seq: %ld\n", OFFSET(printk_info_seq)); -+ fprintf(fp, " printk_info_ts_nseq: %ld\n", OFFSET(printk_info_ts_nsec)); -+ fprintf(fp, " printk_info_text_len: %ld\n", OFFSET(printk_info_text_len)); -+ fprintf(fp, " printk_info_level: %ld\n", OFFSET(printk_info_level)); -+ fprintf(fp, " printk_info_caller_id: %ld\n", OFFSET(printk_info_caller_id)); -+ fprintf(fp, " printk_info_dev_info: %ld\n", OFFSET(printk_info_dev_info)); -+ fprintf(fp, " dev_printk_info_subsystem: %ld\n", OFFSET(dev_printk_info_subsystem)); -+ fprintf(fp, " dev_printk_info_device: %ld\n", OFFSET(dev_printk_info_device)); -+ fprintf(fp, " prb_desc_ring: %ld\n", OFFSET(prb_desc_ring)); -+ fprintf(fp, " prb_text_data_ring: %ld\n", OFFSET(prb_text_data_ring)); -+ fprintf(fp, " prb_desc_ring_count_bits: %ld\n", OFFSET(prb_desc_ring_count_bits)); -+ fprintf(fp, " prb_desc_ring_descs: %ld\n", OFFSET(prb_desc_ring_descs)); -+ fprintf(fp, " prb_desc_ring_infos: %ld\n", OFFSET(prb_desc_ring_infos)); -+ fprintf(fp, " prb_desc_ring_head_id: %ld\n", OFFSET(prb_desc_ring_head_id)); -+ fprintf(fp, " prb_desc_ring_tail_id: %ld\n", OFFSET(prb_desc_ring_tail_id)); -+ fprintf(fp, " prb_desc_state_var: %ld\n", OFFSET(prb_desc_state_var)); -+ fprintf(fp, " prb_desc_text_blk_lpos: %ld\n", OFFSET(prb_desc_text_blk_lpos)); -+ fprintf(fp, " prb_data_blk_lpos_begin: %ld\n", OFFSET(prb_data_blk_lpos_begin)); -+ fprintf(fp, " prb_data_blk_lpos_next: %ld\n", OFFSET(prb_data_blk_lpos_next)); -+ fprintf(fp, " prb_data_ring_size_bits: %ld\n", OFFSET(prb_data_ring_size_bits)); -+ fprintf(fp, " prb_data_ring_data: %ld\n", OFFSET(prb_data_ring_data)); -+ fprintf(fp, " atomit_long_t_counter: %ld\n", OFFSET(atomic_long_t_counter)); -+ - fprintf(fp, " sched_rt_entity_my_q: %ld\n", - OFFSET(sched_rt_entity_my_q)); - fprintf(fp, " task_group_parent: %ld\n", -@@ -10850,6 +10874,9 @@ dump_offset_table(char *spec, ulong makestruct) - SIZE(xarray)); - fprintf(fp, " xa_node: %ld\n", - SIZE(xa_node)); -+ fprintf(fp, " printk_info: %ld\n", SIZE(printk_info)); -+ fprintf(fp, " printk_ringbuffer: %ld\n", SIZE(printk_ringbuffer)); -+ fprintf(fp, " prb_desc: %ld\n", SIZE(prb_desc)); - - - fprintf(fp, "\n array_table:\n"); --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch deleted file mode 100644 index 5213195c7..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 71e159c64000467e94e08aefc144f5e1cdaa4aa0 Mon Sep 17 00:00:00 2001 -From: John Ogness -Date: Wed, 25 Nov 2020 05:27:53 +0106 -Subject: [PATCH 2/2] printk: use committed/finalized state values - -An addendum to the previous crash commit a5531b24750e. -The ringbuffer entries use 2 state values (committed and finalized) -rather than a single flag to represent being available for reading. -Copy the definitions and state lookup function directly from the -kernel source and use the new states. - -Upstream-Status: Backport [https://github.com/crash-utility/crash/commit/71e159c64000467e94e08aefc144f5e1cdaa4aa0] - -Signed-off-by: John Ogness -Signed-off-by: Nikolay Borisov -Signed-off-by: Mingli Yu ---- - printk.c | 48 +++++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 41 insertions(+), 7 deletions(-) - -diff --git a/printk.c b/printk.c -index f6d54ce..8658016 100644 ---- a/printk.c -+++ b/printk.c -@@ -1,12 +1,6 @@ - #include "defs.h" - #include - --#define DESC_SV_BITS (sizeof(unsigned long) * 8) --#define DESC_COMMITTED_MASK (1UL << (DESC_SV_BITS - 1)) --#define DESC_REUSE_MASK (1UL << (DESC_SV_BITS - 2)) --#define DESC_FLAGS_MASK (DESC_COMMITTED_MASK | DESC_REUSE_MASK) --#define DESC_ID_MASK (~DESC_FLAGS_MASK) -- - /* convenience struct for passing many values to helper functions */ - struct prb_map { - char *prb; -@@ -21,6 +15,44 @@ struct prb_map { - char *text_data; - }; - -+/* -+ * desc_state and DESC_* definitions taken from kernel source: -+ * -+ * kernel/printk/printk_ringbuffer.h -+ */ -+ -+/* The possible responses of a descriptor state-query. */ -+enum desc_state { -+ desc_miss = -1, /* ID mismatch (pseudo state) */ -+ desc_reserved = 0x0, /* reserved, in use by writer */ -+ desc_committed = 0x1, /* committed by writer, could get reopened */ -+ desc_finalized = 0x2, /* committed, no further modification allowed */ -+ desc_reusable = 0x3, /* free, not yet used by any writer */ -+}; -+ -+#define DESC_SV_BITS (sizeof(unsigned long) * 8) -+#define DESC_FLAGS_SHIFT (DESC_SV_BITS - 2) -+#define DESC_FLAGS_MASK (3UL << DESC_FLAGS_SHIFT) -+#define DESC_STATE(sv) (3UL & (sv >> DESC_FLAGS_SHIFT)) -+#define DESC_ID_MASK (~DESC_FLAGS_MASK) -+#define DESC_ID(sv) ((sv) & DESC_ID_MASK) -+ -+/* -+ * get_desc_state() taken from kernel source: -+ * -+ * kernel/printk/printk_ringbuffer.c -+ */ -+ -+/* Query the state of a descriptor. */ -+static enum desc_state get_desc_state(unsigned long id, -+ unsigned long state_val) -+{ -+ if (id != DESC_ID(state_val)) -+ return desc_miss; -+ -+ return DESC_STATE(state_val); -+} -+ - static void - init_offsets(void) - { -@@ -74,6 +106,7 @@ dump_record(struct prb_map *m, unsigned long id, int msg_flags) - unsigned short text_len; - unsigned long state_var; - unsigned int caller_id; -+ enum desc_state state; - unsigned char level; - unsigned long begin; - unsigned long next; -@@ -90,7 +123,8 @@ dump_record(struct prb_map *m, unsigned long id, int msg_flags) - /* skip non-committed record */ - state_var = ULONG(desc + OFFSET(prb_desc_state_var) + - OFFSET(atomic_long_t_counter)); -- if ((state_var & DESC_FLAGS_MASK) != DESC_COMMITTED_MASK) -+ state = get_desc_state(id, state_var); -+ if (state != desc_committed && state != desc_finalized) - return; - - info = m->infos + ((id % m->desc_ring_count) * SIZE(printk_info)); --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch index e254fe877..7133cf0aa 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch @@ -9,7 +9,7 @@ diff --git a/Makefile b/Makefile index bb0a34e..5eb7604 100644 --- a/Makefile +++ b/Makefile -@@ -226,7 +226,7 @@ all: make_configure +@@ -228,7 +228,7 @@ all: make_configure # @make --no-print-directory extensions gdb_merge: force @@ -18,15 +18,16 @@ index bb0a34e..5eb7604 100644 make --no-print-directory gdb_unzip; fi @echo "${LDFLAGS} -lz -ldl -rdynamic" > ${GDB}/gdb/mergelibs @echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj -@@ -253,11 +253,6 @@ gdb_unzip: - @rm -f gdb.files - @for FILE in ${GDB_FILES} dummy; do\ - echo $$FILE >> gdb.files; done +@@ -255,12 +255,6 @@ gdb_unzip: + @rm -f gdb.files + @for FILE in ${GDB_FILES} dummy; do\ + echo $$FILE >> gdb.files; done - @if [ ! -f ${GDB}.tar.gz ] && [ ! -f /usr/bin/wget ]; then \ - echo /usr/bin/wget is required to download ${GDB}.tar.gz; echo; exit 1; fi - @if [ ! -f ${GDB}.tar.gz ] && [ -f /usr/bin/wget ]; then \ -- wget http://ftp.gnu.org/gnu/gdb/${GDB}.tar.gz; fi -- @tar --exclude-from gdb.files -xvzmf ${GDB}.tar.gz - @make --no-print-directory gdb_patch - +- [ ! -t 2 ] && WGET_OPTS="--progress=dot:mega"; \ +- wget $$WGET_OPTS http://ftp.gnu.org/gnu/gdb/${GDB}.tar.gz; fi +- @tar --exclude-from gdb.files -xzmf ${GDB}.tar.gz + @make --no-print-directory gdb_patch + gdb_patch: diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch index 905b4c2cd..37d43b888 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch @@ -13,16 +13,16 @@ diff --git a/configure.c b/configure.c index cf1973b..71e97b3 100644 --- a/configure.c +++ b/configure.c -@@ -151,7 +151,7 @@ void add_extra_lib(char *); +@@ -155,7 +155,7 @@ void add_extra_lib(char *); #define TARGET_CFLAGS_PPC64_ON_X86_64 "TARGET_CFLAGS=" #define TARGET_CFLAGS_MIPS "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" #define TARGET_CFLAGS_MIPS_ON_X86 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" -#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-m32 -D_FILE_OFFSET_BITS=64" +#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" + #define TARGET_CFLAGS_MIPS64 "TARGET_CFLAGS=" #define TARGET_CFLAGS_SPARC64 "TARGET_CFLAGS=" - #define GDB_TARGET_DEFAULT "GDB_CONF_FLAGS=" -@@ -162,7 +162,7 @@ void add_extra_lib(char *); +@@ -167,7 +167,7 @@ void add_extra_lib(char *); #define GDB_TARGET_ARM64_ON_X86_64 "GDB_CONF_FLAGS=--target=aarch64-elf-linux" /* TBD */ #define GDB_TARGET_PPC64_ON_X86_64 "GDB_CONF_FLAGS=--target=powerpc64le-unknown-linux-gnu" #define GDB_TARGET_MIPS_ON_X86 "GDB_CONF_FLAGS=--target=mipsel-elf-linux" diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.9.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.9.bb deleted file mode 100644 index c2d83cb4f..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.9.bb +++ /dev/null @@ -1,120 +0,0 @@ -SUMMARY = "Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles" -DESCRIPTION = "The core analysis suite is a self-contained tool that can be used to\ -investigate either live systems, kernel core dumps created from the\ -netdump, diskdump and kdump packages from Red Hat Linux, the mcore kernel patch\ -offered by Mission Critical Linux, or the LKCD kernel patch." - -HOMEPAGE = "http://people.redhat.com/anderson" -SECTION = "devel" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING3;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "zlib readline coreutils-native ncurses-native" - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/crash-utility/${BPN}.git \ - ${GNU_MIRROR}/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ - file://7001force_define_architecture.patch \ - file://7003cross_ranlib.patch \ - file://0001-cross_add_configure_option.patch \ - file://sim-ppc-drop-LIBS-from-psim-dependency.patch \ - file://sim-common-sim-arange-fix-extern-inline-handling.patch \ - file://donnot-extract-gdb-during-do-compile.patch \ - file://gdb_build_jobs_and_not_write_crash_target.patch \ - file://remove-unrecognized-gcc-option-m32-for-mips.patch \ - file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ - file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ - file://0001-printk-add-support-for-lockless-ringbuffer.patch \ - file://0002-printk-use-committed-finalized-state-values.patch \ - " -SRCREV = "a25aa4b649d339dd25c20d5413d81b851a77e0b2" - -SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" -SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" - -UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases" - -inherit gettext - -BBCLASSEXTEND = "native cross" -TARGET_CC_ARCH:append = " ${SELECTED_OPTIMIZATION}" - -# crash 7.1.3 and before don't support mips64/riscv64 -COMPATIBLE_HOST:riscv64 = "null" -COMPATIBLE_HOST:riscv32 = "null" -COMPATIBLE_HOST:mipsarchn64 = "null" -COMPATIBLE_HOST:mipsarchn32 = "null" - - -EXTRA_OEMAKE = 'RPMPKG="${PV}" \ - GDB_TARGET="${TARGET_SYS}" \ - GDB_HOST="${BUILD_SYS}" \ - GDB_MAKE_JOBS="${PARALLEL_MAKE}" \ - LDFLAGS="${LDFLAGS}" \ - ' - -EXTRA_OEMAKE:class-cross = 'RPMPKG="${PV}" \ - GDB_TARGET="${BUILD_SYS} --target=${TARGET_SYS}" \ - GDB_HOST="${BUILD_SYS}" \ - GDB_MAKE_JOBS="${PARALLEL_MAKE}" \ - ' - -EXTRA_OEMAKE:append:class-native = " LDFLAGS='${BUILD_LDFLAGS}'" -EXTRA_OEMAKE:append:class-cross = " LDFLAGS='${BUILD_LDFLAGS}'" - -do_configure() { - : -} - -do_compile:prepend() { - case ${TARGET_ARCH} in - aarch64*) ARCH=ARM64 ;; - arm*) ARCH=ARM ;; - i*86*) ARCH=X86 ;; - x86_64*) ARCH=X86_64 ;; - powerpc64*) ARCH=PPC64 ;; - powerpc*) ARCH=PPC ;; - mips*) ARCH=MIPS ;; - esac - - sed -i s/FORCE_DEFINE_ARCH/"${ARCH}"/g ${S}/configure.c - sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g' ${S}/configure.c - sed -i 's/>/>/g' ${S}/Makefile -} - -do_compile() { - oe_runmake ${EXTRA_OEMAKE} RECIPE_SYSROOT=${RECIPE_SYSROOT} -} - -do_install:prepend () { - install -d ${D}${bindir} - install -d ${D}/${mandir}/man8 - install -d ${D}${includedir}/crash - - install -m 0644 ${S}/crash.8 ${D}/${mandir}/man8/ - install -m 0644 ${S}/defs.h ${D}${includedir}/crash -} - -do_install:class-target () { - oe_runmake DESTDIR=${D} install -} - -do_install:class-native () { - oe_runmake DESTDIR=${D}${STAGING_DIR_NATIVE} install -} - -do_install:class-cross () { - install -m 0755 ${S}/crash ${D}/${bindir} -} - -RDEPENDS:${PN} += "liblzma" -RDEPENDS:${PN}:class-native = "" -RDEPENDS:${PN}:class-cross = "" - -# Causes gcc to get stuck and eat all available memory in qemuarm builds -# jenkins 15161 100 12.5 10389596 10321284 ? R 11:40 28:17 /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.2/cc1 -quiet -I . -I . -I ./common -I ./config -I ./../include/opcode -I ./../opcodes/.. -I ./../readline/.. -I ../bfd -I ./../bfd -I ./../include -I ../libdecnumber -I ./../libdecnumber -I ./gnulib/import -I build-gnulib/import -isysroot /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm -MMD eval.d -MF .deps/eval.Tpo -MP -MT eval.o -D LOCALEDIR="/usr/local/share/locale" -D CRASH_MERGE -D HAVE_CONFIG_H -D TUI=1 eval.c -quiet -dumpbase eval.c -march=armv5te -mthumb -mthumb-interwork -mtls-dialect=gnu -auxbase-strip eval.o -g -O2 -Wall -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -Wdeclaration-after-statement -Wempty-body -feliminate-unused-debug-types -o - -ARM_INSTRUCTION_SET = "arm" - -# http://errors.yoctoproject.org/Errors/Details/186964/ -COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.3.0.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.3.0.bb new file mode 100644 index 000000000..4b228bbd9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.3.0.bb @@ -0,0 +1,118 @@ +SUMMARY = "Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles" +DESCRIPTION = "The core analysis suite is a self-contained tool that can be used to\ +investigate either live systems, kernel core dumps created from the\ +netdump, diskdump and kdump packages from Red Hat Linux, the mcore kernel patch\ +offered by Mission Critical Linux, or the LKCD kernel patch." + +HOMEPAGE = "http://people.redhat.com/anderson" +SECTION = "devel" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING3;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "zlib readline coreutils-native ncurses-native" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/crash-utility/${BPN}.git \ + ${GNU_MIRROR}/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ + file://7001force_define_architecture.patch \ + file://7003cross_ranlib.patch \ + file://0001-cross_add_configure_option.patch \ + file://sim-ppc-drop-LIBS-from-psim-dependency.patch \ + file://sim-common-sim-arange-fix-extern-inline-handling.patch \ + file://donnot-extract-gdb-during-do-compile.patch \ + file://gdb_build_jobs_and_not_write_crash_target.patch \ + file://remove-unrecognized-gcc-option-m32-for-mips.patch \ + file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ + file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ + " +SRCREV = "2a3e546942ab560f050ab77e8c7828b06513b3f0" + +SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" +SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" + +UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases" + +inherit gettext + +BBCLASSEXTEND = "native cross" +TARGET_CC_ARCH:append = " ${SELECTED_OPTIMIZATION}" + +# crash 7.1.3 and before don't support mips64/riscv64 +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" +COMPATIBLE_HOST:mipsarchn64 = "null" +COMPATIBLE_HOST:mipsarchn32 = "null" + + +EXTRA_OEMAKE = 'RPMPKG="${PV}" \ + GDB_TARGET="${TARGET_SYS}" \ + GDB_HOST="${BUILD_SYS}" \ + GDB_MAKE_JOBS="${PARALLEL_MAKE}" \ + LDFLAGS="${LDFLAGS}" \ + ' + +EXTRA_OEMAKE:class-cross = 'RPMPKG="${PV}" \ + GDB_TARGET="${BUILD_SYS} --target=${TARGET_SYS}" \ + GDB_HOST="${BUILD_SYS}" \ + GDB_MAKE_JOBS="${PARALLEL_MAKE}" \ + ' + +EXTRA_OEMAKE:append:class-native = " LDFLAGS='${BUILD_LDFLAGS}'" +EXTRA_OEMAKE:append:class-cross = " LDFLAGS='${BUILD_LDFLAGS}'" + +do_configure() { + : +} + +do_compile:prepend() { + case ${TARGET_ARCH} in + aarch64*) ARCH=ARM64 ;; + arm*) ARCH=ARM ;; + i*86*) ARCH=X86 ;; + x86_64*) ARCH=X86_64 ;; + powerpc64*) ARCH=PPC64 ;; + powerpc*) ARCH=PPC ;; + mips*) ARCH=MIPS ;; + esac + + sed -i s/FORCE_DEFINE_ARCH/"${ARCH}"/g ${S}/configure.c + sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g' ${S}/configure.c + sed -i 's/>/>/g' ${S}/Makefile +} + +do_compile() { + oe_runmake ${EXTRA_OEMAKE} RECIPE_SYSROOT=${RECIPE_SYSROOT} +} + +do_install:prepend () { + install -d ${D}${bindir} + install -d ${D}/${mandir}/man8 + install -d ${D}${includedir}/crash + + install -m 0644 ${S}/crash.8 ${D}/${mandir}/man8/ + install -m 0644 ${S}/defs.h ${D}${includedir}/crash +} + +do_install:class-target () { + oe_runmake DESTDIR=${D} install +} + +do_install:class-native () { + oe_runmake DESTDIR=${D}${STAGING_DIR_NATIVE} install +} + +do_install:class-cross () { + install -m 0755 ${S}/crash ${D}/${bindir} +} + +RDEPENDS:${PN} += "liblzma" +RDEPENDS:${PN}:class-native = "" +RDEPENDS:${PN}:class-cross = "" + +# Causes gcc to get stuck and eat all available memory in qemuarm builds +# jenkins 15161 100 12.5 10389596 10321284 ? R 11:40 28:17 /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.2/cc1 -quiet -I . -I . -I ./common -I ./config -I ./../include/opcode -I ./../opcodes/.. -I ./../readline/.. -I ../bfd -I ./../bfd -I ./../include -I ../libdecnumber -I ./../libdecnumber -I ./gnulib/import -I build-gnulib/import -isysroot /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm -MMD eval.d -MF .deps/eval.Tpo -MP -MT eval.o -D LOCALEDIR="/usr/local/share/locale" -D CRASH_MERGE -D HAVE_CONFIG_H -D TUI=1 eval.c -quiet -dumpbase eval.c -march=armv5te -mthumb -mthumb-interwork -mtls-dialect=gnu -auxbase-strip eval.o -g -O2 -Wall -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -Wdeclaration-after-statement -Wempty-body -feliminate-unused-debug-types -o - +ARM_INSTRUCTION_SET = "arm" + +# http://errors.yoctoproject.org/Errors/Details/186964/ +COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.4.bb b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.4.bb deleted file mode 100644 index 27559ba29..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.4.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Library for BPF handling" -DESCRIPTION = "Library for BPF handling" -HOMEPAGE = "https://github.com/libbpf/libbpf" -SECTION = "libs" -LICENSE = "LGPLv2.1+" - -LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" - -DEPENDS = "zlib elfutils" - -do_compile[depends] += "virtual/kernel:do_shared_workdir" - -SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https" -SRCREV = "db9614b6bd69746809d506c2786f914b0f812c37" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64).*-linux" - -S = "${WORKDIR}/git/src" - -EXTRA_OEMAKE += "DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir}" - -inherit pkgconfig - -do_compile() { - if grep -q "CONFIG_BPF_SYSCALL=y" ${STAGING_KERNEL_BUILDDIR}/.config - then - oe_runmake - else - bbnote "BFP syscall is not enabled" - fi -} - -do_install() { - if grep -q "CONFIG_BPF_SYSCALL=y" ${STAGING_KERNEL_BUILDDIR}/.config - then - oe_runmake install - else - bbnote "no files to install" - fi -} diff --git a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.bb b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.bb new file mode 100644 index 000000000..7ce723452 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_0.5.bb @@ -0,0 +1,29 @@ +SUMMARY = "Library for BPF handling" +DESCRIPTION = "Library for BPF handling" +HOMEPAGE = "https://github.com/libbpf/libbpf" +SECTION = "libs" +LICENSE = "LGPLv2.1+" + +LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" + +DEPENDS = "zlib elfutils" + +SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https" +SRCREV = "5579664205e42194e1921d69d0839f660c801a4d" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux" + +S = "${WORKDIR}/git/src" + +EXTRA_OEMAKE += "DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir}" + +inherit pkgconfig + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install +} diff --git a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb deleted file mode 100644 index 53d018358..000000000 --- a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Small and fast POSIX-compliant shell" -HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/" -SECTION = "System Environment/Shells" - -LICENSE = "BSD & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" - -inherit autotools update-alternatives - -SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz" -SRC_URI[md5sum] = "c7016b513f701d88c70b3082eb183581" -SRC_URI[sha256sum] = "62b9f1676ba6a7e8eaec541a39ea037b325253240d1f378c72360baa1cbcbc2a" - -EXTRA_OECONF += "--bindir=${base_bindir}" - -ALTERNATIVE:${PN} = "sh" -ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" -ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" -ALTERNATIVE_PRIORITY = "10" - -pkg_postinst:${PN} () { - grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells -} - -pkg_postrm:${PN} () { - printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells -} diff --git a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb new file mode 100644 index 000000000..8fe601a2d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb @@ -0,0 +1,26 @@ +SUMMARY = "Small and fast POSIX-compliant shell" +HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/" +SECTION = "System Environment/Shells" + +LICENSE = "BSD & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" + +inherit autotools update-alternatives + +SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz" +SRC_URI[sha256sum] = "db778110891f7937985f29bf23410fe1c5d669502760f584e54e0e7b29e123bd" + +EXTRA_OECONF += "--bindir=${base_bindir}" + +ALTERNATIVE:${PN} = "sh" +ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" +ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" +ALTERNATIVE_PRIORITY = "10" + +pkg_postinst:${PN} () { + grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells +} + +pkg_postrm:${PN} () { + printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells +} diff --git a/meta-openembedded/meta-oe/recipes-support/avro/avro-c/0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch b/meta-openembedded/meta-oe/recipes-support/avro/avro-c/0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch deleted file mode 100644 index 6496b92df..000000000 --- a/meta-openembedded/meta-oe/recipes-support/avro/avro-c/0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch +++ /dev/null @@ -1,70 +0,0 @@ -From f24f863f3a8ca86f44123a58613f62c3b511da1e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 19 Dec 2019 18:23:41 -0800 -Subject: [PATCH] cmake: Use GNUInstallDirs instead of hard-coded paths - -This ensures that it can be built on platforms where libdir is not -/usr/lib e.g. ppc64 - -Upstream-Status: Submitted [https://github.com/apache/avro/pull/749] -Signed-off-by: Khem Raj ---- - lang/c/CMakeLists.txt | 2 +- - lang/c/src/CMakeLists.txt | 16 +++++++++------- - 2 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/lang/c/CMakeLists.txt b/lang/c/CMakeLists.txt -index 11cbf018e..6c8d7aaf3 100644 ---- a/lang/c/CMakeLists.txt -+++ b/lang/c/CMakeLists.txt -@@ -16,7 +16,7 @@ - # specific language governing permissions and limitations - # under the License. - # --cmake_minimum_required(VERSION 2.4) -+cmake_minimum_required(VERSION 3.1) - project(AvroC) - enable_testing() - -diff --git a/lang/c/src/CMakeLists.txt b/lang/c/src/CMakeLists.txt -index 6f5659750..c1761c8de 100644 ---- a/lang/c/src/CMakeLists.txt -+++ b/lang/c/src/CMakeLists.txt -@@ -106,17 +106,19 @@ install(DIRECTORY - DESTINATION include - FILES_MATCHING PATTERN "*.h") - -+include(GNUInstallDirs) -+ - if (WIN32) - install(TARGETS avro-static -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - else(WIN32) - install(TARGETS avro-static avro-shared -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - endif(WIN32) - -@@ -126,7 +128,7 @@ set(prefix ${CMAKE_INSTALL_PREFIX}) - set(VERSION ${AVRO_VERSION}) - configure_file(avro-c.pc.in avro-c.pc) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/avro-c.pc -- DESTINATION lib/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - - add_executable(avrocat avrocat.c) - target_link_libraries(avrocat avro-static) --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.10.2.bb b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.10.2.bb new file mode 100644 index 000000000..b86bfead7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.10.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Apache Avro data serialization system." +HOMEPAGE = "http://apr.apache.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" + +DEPENDS = "jansson zlib xz" + +BRANCH = "branch-1.10" +SRCREV = "8111cdc35430ff68dcb644306362859de40999d9" +SRC_URI = "git://github.com/apache/avro;branch=${BRANCH} \ + " + +S = "${WORKDIR}/git/lang/c" + +inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.9.2.bb b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.9.2.bb deleted file mode 100644 index 0642179fb..000000000 --- a/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.9.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Apache Avro data serialization system." -HOMEPAGE = "http://apr.apache.org/" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" - -DEPENDS = "jansson zlib xz" - -BRANCH = "branch-1.9" -SRCREV = "bf20128ca6138a830b2ea13e0490f3df6b035639" -SRC_URI = "git://github.com/apache/avro;branch=${BRANCH} \ - file://0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch;patchdir=../../ \ - " - -S = "${WORKDIR}/git/lang/c" - -inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb deleted file mode 100644 index 4641b0181..000000000 --- a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb +++ /dev/null @@ -1,24 +0,0 @@ -require dfu-util_${PV}.bb - -inherit deploy native - -DEPENDS = "libusb1-native" - -PACKAGECONFIG ??= "" - -PACKAGECONFIG[static] = "CFLAGS='${CFLAGS} -pthread -static',," - -do_deploy() { - install -m 0755 src/dfu-util ${DEPLOYDIR}/dfu-util-${PV} - rm -f ${DEPLOYDIR}/dfu-util - ln -sf ./dfu-util-${PV} ${DEPLOYDIR}/dfu-util -} - -addtask deploy before do_package after do_install - -# cleandirs should possibly be in deploy.bbclass but we need it -do_deploy[cleandirs] = "${DEPLOYDIR}" -# clear stamp-extra-info since MACHINE_ARCH is normally put there by -# deploy.bbclass -do_deploy[stamp-extra-info] = "" - diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb new file mode 100644 index 000000000..4641b0181 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb @@ -0,0 +1,24 @@ +require dfu-util_${PV}.bb + +inherit deploy native + +DEPENDS = "libusb1-native" + +PACKAGECONFIG ??= "" + +PACKAGECONFIG[static] = "CFLAGS='${CFLAGS} -pthread -static',," + +do_deploy() { + install -m 0755 src/dfu-util ${DEPLOYDIR}/dfu-util-${PV} + rm -f ${DEPLOYDIR}/dfu-util + ln -sf ./dfu-util-${PV} ${DEPLOYDIR}/dfu-util +} + +addtask deploy before do_package after do_install + +# cleandirs should possibly be in deploy.bbclass but we need it +do_deploy[cleandirs] = "${DEPLOYDIR}" +# clear stamp-extra-info since MACHINE_ARCH is normally put there by +# deploy.bbclass +do_deploy[stamp-extra-info] = "" + diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.10.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.10.bb deleted file mode 100644 index 86353712d..000000000 --- a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.10.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "USB Device Firmware Upgrade utility" -AUTHOR = "Harald Welte " -HOMEPAGE = "http://dfu-util.sourceforge.net" -SECTION = "devel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libusb1" - -SRC_URI = "http://dfu-util.sourceforge.net/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "8cf55663703cdc6b40f377f999eb8d3d" -SRC_URI[sha256sum] = "a03dc58dfc79c056819c0544b2a5970537566460102b3d82cfb038c60e619b42" - -inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb new file mode 100644 index 000000000..5a1e4aac5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "USB Device Firmware Upgrade utility" +AUTHOR = "Harald Welte " +HOMEPAGE = "http://dfu-util.sourceforge.net" +SECTION = "devel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "libusb1" + +SRC_URI = "http://dfu-util.sourceforge.net/releases/${BP}.tar.gz" +SRC_URI[sha256sum] = "b4b53ba21a82ef7e3d4c47df2952adf5fa494f499b6b0b57c58c5d04ae8ff19e" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.1.3.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.1.3.bb deleted file mode 100644 index 9820b8647..000000000 --- a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.1.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "open-source formatting library for C++" -DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." -HOMEPAGE = "https://fmt.dev" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" - -SRC_URI += "git://github.com/fmtlib/fmt" -SRCREV = "7bdf0628b1276379886c7f6dda2cef2b3b374f0b" - -S = "${WORKDIR}/git" - -inherit cmake -inherit ptest - -EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_8.0.1.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_8.0.1.bb new file mode 100644 index 000000000..0dc8e038d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_8.0.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "open-source formatting library for C++" +DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." +HOMEPAGE = "https://fmt.dev" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" + +SRC_URI = "git://github.com/fmtlib/fmt" +SRCREV = "d141cdbeb0fb422a3fb7173b285fd38e0d1772dc" + +S = "${WORKDIR}/git" + +inherit cmake +inherit ptest + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.6.bb b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.6.bb deleted file mode 100644 index 367a08321..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.6.bb +++ /dev/null @@ -1,5 +0,0 @@ -include gsl.inc - -SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" -SRC_URI[md5sum] = "bda73a3dd5ff2f30b5956764399db6e7" -SRC_URI[sha256sum] = "b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8" diff --git a/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.7.bb b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.7.bb new file mode 100644 index 000000000..d40eebb4c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_2.7.bb @@ -0,0 +1,4 @@ +include gsl.inc + +SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" +SRC_URI[sha256sum] = "efbbf3785da0e53038be7907500628b466152dbc3c173a87de1b5eba2e23602b" diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb deleted file mode 100644 index ba21ffaf0..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "The goal of this project is to provide a tiny library that would \ -facilitate the common operations with sizes in bytes." -HOMEPAGE = "https://github.com/rhinstaller/libbytesize" -LICENSE = "LGPLv2+" -SECTION = "devel/lib" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" - -S = "${WORKDIR}/git" -B = "${S}" - -SRCREV = "732ee8d28492e4bc9b52c29bcb81a5c19388d002" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" - -inherit gettext autotools python3native - -DEPENDS += " \ - libpcre2 \ - gmp \ - mpfr \ - gettext-native \ -" - -FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" - -PACKAGECONFIG ??= "python3" -PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core" - -EXTRA_OECONF = "--without-gtk-doc" -EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb new file mode 100644 index 000000000..118259e4f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "The goal of this project is to provide a tiny library that would \ +facilitate the common operations with sizes in bytes." +HOMEPAGE = "https://github.com/rhinstaller/libbytesize" +LICENSE = "LGPLv2+" +SECTION = "devel/lib" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" + +S = "${WORKDIR}/git" +B = "${S}" + +SRCREV = "c9864f4dd03736839f40d225da494cb1eb64e654" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" + +inherit gettext autotools python3native + +DEPENDS += " \ + libpcre2 \ + gmp \ + mpfr \ + gettext-native \ +" + +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" + +PACKAGECONFIG ??= "python3" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core" + +EXTRA_OECONF = "--without-gtk-doc" +EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb deleted file mode 100644 index 8ce26ff63..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." -AUTHOR = "Benoît Jacob and Gaël Guennebaud and others" -HOMEPAGE = "http://eigen.tuxfamily.org/" -LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPLv3 & LGPLv2.1 & MINPACK" -LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ - file://COPYING.BSD;md5=543367b8e11f07d353ef894f71b574a0 \ - file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING.MINPACK;md5=5fe4603e80ef7390306f51ef74449bbd \ -" - -SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" - -SRCREV = "0fd6b4f71dd85b2009ee4d1aeb296e2c11fc9d68" - -S = "${WORKDIR}/git" - -inherit cmake - -FILES:${PN}-dev += "${datadir}/eigen3/cmake" - -# ${PN} is empty so we need to tweak -dev and -dbg package dependencies -RDEPENDS:${PN}-dev = "" -RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb new file mode 100644 index 000000000..54b6f74d8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." +AUTHOR = "Benoît Jacob and Gaël Guennebaud and others" +HOMEPAGE = "http://eigen.tuxfamily.org/" +LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPLv3 & LGPLv2.1 & MINPACK" +LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ + file://COPYING.BSD;md5=2dd0510ee95e59ca28834b875bc96596 \ + file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MINPACK;md5=71d91b0f75ce79a75d3108a72bef8116 \ +" + +SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" + +SRCREV = "3147391d946bb4b6c68edd901f2add6ac1f31f8c" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN}-dev += "${datadir}/eigen3/cmake" + +# ${PN} is empty so we need to tweak -dev and -dbg package dependencies +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.1.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.1.bb deleted file mode 100644 index 9833c0cec..000000000 --- a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.1.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \ -processes, programs, files, directories and filesystems on a UNIX system. \ -Monit conducts automatic maintenance and repair and can execute meaningful \ -causal actions in error situations." - -HOMEPAGE = "http://mmonit.com/monit/" - -LICENSE = "AGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ - file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" - -SRC_URI = " \ - https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ - file://monit \ - file://monitrc \ -" - -SRC_URI[sha256sum] = "57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c" - -DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" - -inherit autotools-brokensep systemd update-rc.d - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" - -EXTRA_OECONF = "\ - libmonit_cv_setjmp_available=no \ - libmonit_cv_vsnprintf_c99_conformant=no \ - --with-ssl-lib-dir=${STAGING_LIBDIR} \ - --with-ssl-incl-dir=${STAGING_INCDIR} \ -" - -SYSTEMD_SERVICE:${PN} = "monit.service" -SYSTEMD_AUTO_ENABLE = "enable" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME:${PN} = "monit" -INITSCRIPT_PARAMS:${PN} = "defaults 89" - -do_install:append() { - - # Configuration file - install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc - - # SystemD - install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service - sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service - - # SysV - install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit -} diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.29.0.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.29.0.bb new file mode 100644 index 000000000..9528fe735 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.29.0.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \ +processes, programs, files, directories and filesystems on a UNIX system. \ +Monit conducts automatic maintenance and repair and can execute meaningful \ +causal actions in error situations." + +HOMEPAGE = "http://mmonit.com/monit/" + +LICENSE = "AGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ + file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" + +SRC_URI = " \ + https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ + file://monit \ + file://monitrc \ +" + +SRC_URI[sha256sum] = "f665e6dd1f26a74b5682899a877934167de2b2582e048652ecf036318477885f" + +DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" + +inherit autotools-brokensep systemd update-rc.d + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" + +EXTRA_OECONF = "\ + libmonit_cv_setjmp_available=no \ + libmonit_cv_vsnprintf_c99_conformant=no \ + --with-ssl-lib-dir=${STAGING_LIBDIR} \ + --with-ssl-incl-dir=${STAGING_INCDIR} \ +" + +SYSTEMD_SERVICE:${PN} = "monit.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "monit" +INITSCRIPT_PARAMS:${PN} = "defaults 89" + +do_install:append() { + + # Configuration file + install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc + + # SystemD + install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service + sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service + + # SysV + install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit +} diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb deleted file mode 100644 index 7574c7b5b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Encoding files for Poppler" -DESCRIPTION = "Encoding files for use with poppler that enable poppler to \ - correctly render CJK and Cyrrilic." -HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "BSD & GPLv2 & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=96287d49ec274d9c3222b5f966c132fd \ - file://COPYING.adobe;md5=a790726a74164c30b5de1ef93fd69e99 \ - file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe \ -" - -inherit allarch - -INHIBIT_DEFAULT_DEPS = "1" - -CMAP_RESOURCES_BASE = "https://github.com/adobe-type-tools/cmap-resources/raw/0561ebca035813ed04c3485bca636a0aa7abdc1d/cmapresources_identity-0/CMap" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.gz \ - ${CMAP_RESOURCES_BASE}/Identity-H;name=idh \ - ${CMAP_RESOURCES_BASE}/Identity-V;name=idv" - -SRC_URI[md5sum] = "a7f15fb2f26c60a7a92093cfdf2378d5" -SRC_URI[sha256sum] = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30" -SRC_URI[idh.md5sum] = "009c93cf0141ab7bd6acb7eea14306cc" -SRC_URI[idh.sha256sum] = "ae702c203a82ea124e9b96590f821db6fbf8754e2c4547a9dba0e82f94739e95" -SRC_URI[idv.md5sum] = "2f32a45d43d001c26eeac6b878855fbf" -SRC_URI[idv.sha256sum] = "89a85daf7031e93c883e76b9168a226dfd585bf5506e9e1956772163f15cb082" - -do_compile() { -} - -do_install() { - oe_runmake install DESTDIR=${D} prefix=${prefix} datadir=${datadir} - install -d ${D}${datadir}/poppler/cMap - install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ -} - -FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.11.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.11.bb new file mode 100644 index 000000000..3b65083d0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.11.bb @@ -0,0 +1,36 @@ +SUMMARY = "Encoding files for Poppler" +DESCRIPTION = "Encoding files for use with poppler that enable poppler to \ + correctly render CJK and Cyrrilic." +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "BSD & GPLv2 & GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=96287d49ec274d9c3222b5f966c132fd \ + file://COPYING.adobe;md5=a790726a74164c30b5de1ef93fd69e99 \ + file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe \ +" + +inherit allarch + +INHIBIT_DEFAULT_DEPS = "1" + +CMAP_RESOURCES_BASE = "https://github.com/adobe-type-tools/cmap-resources/raw/0561ebca035813ed04c3485bca636a0aa7abdc1d/cmapresources_identity-0/CMap" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.gz \ + ${CMAP_RESOURCES_BASE}/Identity-H;name=idh \ + ${CMAP_RESOURCES_BASE}/Identity-V;name=idv" + +SRC_URI[sha256sum] = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c" +SRC_URI[idh.md5sum] = "009c93cf0141ab7bd6acb7eea14306cc" +SRC_URI[idh.sha256sum] = "ae702c203a82ea124e9b96590f821db6fbf8754e2c4547a9dba0e82f94739e95" +SRC_URI[idv.md5sum] = "2f32a45d43d001c26eeac6b878855fbf" +SRC_URI[idv.sha256sum] = "89a85daf7031e93c883e76b9168a226dfd585bf5506e9e1956772163f15cb082" + +do_compile() { +} + +do_install() { + oe_runmake install DESTDIR=${D} prefix=${prefix} datadir=${datadir} + install -d ${D}${datadir}/poppler/cMap + install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ +} + +FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch index afb0b5df0..e07da387b 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch @@ -10,46 +10,46 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller --- - cmake/modules/PopplerMacros.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + cmake/modules/PopplerMacros.cmake | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake +index 2aed028..3c30f3f 100644 --- a/cmake/modules/PopplerMacros.cmake +++ b/cmake/modules/PopplerMacros.cmake -@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) +@@ -117,13 +117,13 @@ if(CMAKE_COMPILER_IS_GNUCXX) + set(DEFAULT_COMPILE_WARNINGS "${_warn}") set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") + - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") - set(_save_cflags "${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") - set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") - set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") -@@ -149,7 +149,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") +@@ -161,14 +161,14 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set(DEFAULT_COMPILE_WARNINGS "${_warn}") set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") + - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 -@@ -157,7 +157,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") - set(_save_cflags "${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS_DEBUG "-g") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") - set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 --- +-- 2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.08.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.08.0.bb deleted file mode 100644 index 1fc3bf3f4..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.08.0.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-Do-not-overwrite-all-our-build-flags.patch \ - file://basename-include.patch \ - " -SRC_URI[sha256sum] = "e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" -PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" -PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" -PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" -PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost" - -# surprise - did not expect this to work :) -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECMAKE += " \ - -DENABLE_CMS=lcms2 \ - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ - -DBUILD_GTK_TESTS=OFF \ - -DENABLE_ZLIB=ON \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ -" - -do_configure:append() { - # poppler macro uses pkg-config to check for g-ir runtimes. Something - # makes them point to /usr/bin. Align them to sysroot - that's where the - # gir-wrappers are: - sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja -} - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES:libpoppler = "${libdir}/libpoppler.so.*" -FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS:libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.09.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.09.0.bb new file mode 100644 index 000000000..0ecf19973 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.09.0.bb @@ -0,0 +1,51 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://basename-include.patch \ + " +SRC_URI[sha256sum] = "5a47fef738c2b99471f9b459a8bf8b40aefb7eed92caa4861c3798b2e126d05b" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" +PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_CMS=lcms2 \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DENABLE_ZLIB=ON \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ +" + +do_configure:append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # gir-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES:libpoppler = "${libdir}/libpoppler.so.*" +FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS:libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb deleted file mode 100644 index 40ef4646b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Very fast, header only, C++ logging library." -HOMEPAGE = "https://github.com/gabime/spdlog/wiki" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRCREV = "de0dbfa3596a18cd70a4619b6a9766847a941276" -SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x; \ - file://0001-Enable-use-of-external-fmt-library.patch" - -DEPENDS += "fmt" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" -# no need to build example&text&benchmarks on pure yocto -EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" - -inherit cmake - -# Header-only library -RDEPENDS:${PN}-dev = "" -RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb new file mode 100644 index 000000000..c103c3493 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Very fast, header only, C++ logging library." +HOMEPAGE = "https://github.com/gabime/spdlog/wiki" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRCREV = "eb3220622e73a4889eee355ffa37972b3cac3df5" +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x; \ + file://0001-Enable-use-of-external-fmt-library.patch" + +DEPENDS += "fmt" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" +# no need to build example&text&benchmarks on pure yocto +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" + +inherit cmake + +# Header-only library +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb deleted file mode 100644 index 9926ad4f0..000000000 --- a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "USB hub per-port power control" -HOMEPAGE = "https://github.com/mvp/uhubctl" -BUGTRACKER = "https://github.com/mvp/uhubctl/issues" -DEPENDS = "libusb1" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRCREV = "1b52efddbd68b4395df3ac9cd10eeb984af22439" -SRC_URI = "git://github.com/mvp/${BPN}" -S = "${WORKDIR}/git" - -# uhubctl gets its program version from "git describe". As we use the source -# archive do reduce download size replace the call with our hardcoded version. -do_configure:append() { - sed -i "s/^\(GIT_VERSION :=\).*$/\1 ${PV}/g" ${S}/Makefile -} - -do_install () { - oe_runmake install DESTDIR=${D} -} diff --git a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.4.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.4.0.bb new file mode 100644 index 000000000..44aeaed09 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.4.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "USB hub per-port power control" +HOMEPAGE = "https://github.com/mvp/uhubctl" +BUGTRACKER = "https://github.com/mvp/uhubctl/issues" +DEPENDS = "libusb1" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV = "014b55ac5d1d7fb46a8f1eefe9fc3b87ea65a75f" +SRC_URI = "git://github.com/mvp/${BPN}" +S = "${WORKDIR}/git" + +# uhubctl gets its program version from "git describe". As we use the source +# archive do reduce download size replace the call with our hardcoded version. +do_configure:append() { + sed -i "s/^\(GIT_VERSION :=\).*$/\1 ${PV}/g" ${S}/Makefile +} + +do_install () { + oe_runmake install DESTDIR=${D} +} diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.16.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.16.bb new file mode 100644 index 000000000..59a0dfff2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.16.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A file format designed for highly efficient deltas while maintaining good compression" +AUTHOR = "Jonathan Dieter" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" + +SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" + +SRCREV = "ff34ee911f7d78d66b97894a773276babd63144c" +S = "${WORKDIR}/git" + +DEPENDS = "\ + curl \ + zstd \ + " + +DEPENDS:append:libc-musl = " argp-standalone" +LDFLAGS:append:libc-musl = " -largp" + +inherit meson + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb deleted file mode 100644 index 9ac205afe..000000000 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "A file format designed for highly efficient deltas while maintaining good compression" -AUTHOR = "Jonathan Dieter" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" - -SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" - -SRCREV = "fe3e3af49fd30b68c21a9fcaac340ad8e7f91055" -S = "${WORKDIR}/git" - -DEPENDS = "\ - curl \ - zstd \ - " - -DEPENDS:append:libc-musl = " argp-standalone" -LDFLAGS:append:libc-musl = " -largp" - -inherit meson - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3