From 2f9739240bcb1cfd0675bbe77c02b5f7c32219b1 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 11 Nov 2019 07:58:48 -0500 Subject: meta-openembedded: subtree update:e0daf6f8e0..3a9262866d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (1): xfce-polkit: Upgrade 0.2 -> 0.3 Alex Kiernan (2): ostree: Add support for ptest ostree: Upgrade 2019.4 -> 2019.5 Alistair Francis (1): openocd: Update to latest git version Anders Roxell (1): s-suite: install missing create_config.sh Andreas Müller (6): mm-common: upgrade 0.9.12 -> 1.0.0 / meson build / add SUMMARY mm-common: do really build with meson libpeas: upgrade 1.22.0 -> 1.24.1 xfce4-screenshooter: upgrade 1.9.6 -> 1.9.7 xfce4-time-out-plugin: upgrade 1.0.3 -> 1.1.0 xfce4-whiskermenu-plugin: upgrade 2.3.3 -> 2.3.4 Andreas Oberritter (4): haveged: Fix missing initscript when both systemd and sysvinit are enabled samba: fix installation for minimal build autofs: set some paths for configure script autofs: install sysvinit script manually if systemd is enabled André Draszik (8): jansson: allow to build a -native package cunit: allow to build a -native package libev: allow to build a -native package nghttp2: fix UPSTREAM_CHECK_URI nghttp2: update to 1.39.2 nghttp2: build more of this & fix packaging nghttp2: allow to build a -native package nodejs: allow use of system nghttp2 Hongxu Jia (10): python-pluggy: add python-importlib-metadata to RDEPENDS python-more-itertools.inc: fix python2 package not incorrectly generated python-more-itertools: downgrade 7.2.0 -> 5.0.0 python-importlib-metadata: add missing runtime depends python-pathlib2: add python-scandir and python-misc to runtime depends python-scandir: add version 1.10.0 python-contextlib2/python3-contextlib2: add version 0.6.0 python3-importlib-metadata: add python3-misc to runtime depends python-importlib-metadata: add python-compression to runtime depends python-configparser: add python-pkgutil to runtime depends Kai Kang (4): xfce4-genmon-plugin: 4.0.1 -> 4.0.2 xfce-panel-plugin.bbclass: correct SRC_URI with xfce_verdir xfce4-weather-plugin: 0.9.1 -> 0.10.0 xfce4-screensaver: 0.1.5 -> 0.1.8 Khem Raj (8): iwd: Fix installed-vs-shipped QA errors on systemd units iwd: Fix build race during documentation build ifplugd: Include stdint.h for uintXX_t netkit-rwho: Include stdint.h for int32_t libowfat: Fix parallel build grpc: Add dep on libnsl gtkwave: Upgrade to 3.3.102 syslog-ng: Do not install non-existing systemd file Ming Liu (2): python-jsonschema: RDEPENDS on python-importlib-metadata ostree: fix some invalid condition checking Oleksandr Kravchuk (1): iwd: update to 1.0 Stefan Agner (2): zstd: Upgrade 1.4.3 -> 1.4.4 zstd: move recipe to oe-core Yi Zhao (2): libldb: upgrade 1.5.5 -> 1.5.6 samba: upgrade 4.10.8 -> 4.10.10 Zang Ruochen (20): python-pyjks: upgrade 17.1.1 -> 19.0.0 python-pyjwt: upgrade 1.6.4 -> 1.7.1 python-pymisp: upgrade 2.4.93 -> 2.4.117.2 xorriso: upgrade 1.5.0 -> 1.5.3 python-cython: upgrade 0.29.13 -> 0.29.14 python-decorator: upgrade 4.4.0 -> 4.4.1 python-dominate: upgrade 2.3.1 -> 2.4.0 python-flask-babel: upgrade 0.11.2 -> 0.12.2 python-flask-migrate: upgrade 2.2.1 -> 2.5.2 python-flask-restful: upgrade 0.3.6 -> 0.3.7 python-flask-socketio: upgrade 3.3.2 -> 4.2.1 python-flask-sqlalchemy: upgrade 2.3.2 -> 2.4.1 python-paho-mqtt: upgrade 1.4.0 -> 1.5.0 python-pyroute2: upgrade 0.5.2 -> 0.5.7 python-pyrsistent: upgrade 0.15.4 -> 0.15.5 python-pysmi: upgrade 0.2.2 -> 0.3.4 python-pytest: upgrade 5.2.1 -> 5.2.2 python-serpent: upgrade 1.25 -> 1.28 python-smbus: upgrade 4.0 -> 4.1 python-snimpy: upgrade 0.8.12 -> 0.8.13 Zheng Ruoqin (19): mdns: upgrade 878.200.35 -> 878.260.1 ledmon: Modify the Upstream-Status to Submitted. byacc: upgrade 20190617 -> 20191103 ccid: upgrade 1.4.30 -> 1.4.31 dialog: upgrade 1.3-20190728 -> 1.3-20190808 cryptsetup: upgrade 2.2.1 -> 2.2.2 lvm2/libdevmapper: 2.03.05 -> 2.03.06 libssh2: upgrade 1.8.2 -> 1.9.0 mariadb: upgrade 10.3.16 -> 10.3.18 mcelog: upgrade 164 -> 165 mce-test: Update to latest git version postgresql: upgrade 11.5 -> 12.0 protobuf: upgrade 3.10.0 -> 3.10.1 sshfs-fuse: upgrade 3.5.2 -> 3.6.0 syslog-ng: upgrade 3.19.1 -> 3.24.1 tslib: upgrade 1.16 -> 1.21 xkbprint: upgrade 1.0.4 -> 1.0.5 xterm: upgrade 349 -> 350 zabbix: upgrade 4.2.7 -> 4.2.8 Zhixiong Chi (1): gtkwave: add the libtirpc dependence and config Change-Id: I7dd3609b2d3166e5ba2f977e26026f2b675dc108 Signed-off-by: Brad Bishop --- .../recipes-benchmark/s-suite/s-suite_git.bb | 1 + ...-t-build-with-Werror-to-fix-compile-error.patch | 3 +- .../ifplugd/ifplugd/Fix-build-with-musl.patch | 12 +- ...-Avoid-redirection-of-input-and-output-fi.patch | 40 +++++ .../meta-oe/recipes-connectivity/iwd/iwd_0.23.bb | 37 ---- .../meta-oe/recipes-connectivity/iwd/iwd_1.0.bb | 39 +++++ .../recipes-connectivity/libev/libev_4.27.bb | 2 + .../recipes-connectivity/zabbix/zabbix_4.2.7.bb | 79 --------- .../recipes-connectivity/zabbix/zabbix_4.2.8.bb | 79 +++++++++ ...-do-not-ask-for-python-installation-versi.patch | 41 +++++ .../recipes-core/mm-common/mm-common_0.9.12.bb | 9 - .../recipes-core/mm-common/mm-common_1.0.0.bb | 13 ++ .../recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb | 92 ---------- .../recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb | 92 ++++++++++ .../recipes-dbs/mysql/mariadb-native_10.3.16.bb | 20 --- .../recipes-dbs/mysql/mariadb-native_10.3.18.bb | 20 +++ .../meta-oe/recipes-dbs/mysql/mariadb.inc | 4 +- .../meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb | 27 --- .../meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb | 27 +++ ...0001-Use-pkg-config-for-libxml2-detection.patch | 14 +- .../recipes-dbs/postgresql/postgresql_11.5.bb | 12 -- .../recipes-dbs/postgresql/postgresql_12.0.bb | 12 ++ .../recipes-devtools/nodejs/nodejs_10.17.0.bb | 1 + ...flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch | 59 ------- .../recipes-devtools/openocd/openocd_git.bb | 9 +- .../recipes-devtools/protobuf/protobuf_3.10.0.bb | 90 ---------- .../recipes-devtools/protobuf/protobuf_3.10.1.bb | 90 ++++++++++ .../0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | 35 ++-- .../recipes-extended/byacc/byacc_20190617.bb | 12 -- .../recipes-extended/byacc/byacc_20191103.bb | 12 ++ .../recipes-extended/dialog/dialog_1.3-20190728.bb | 29 ---- .../recipes-extended/dialog/dialog_1.3-20190808.bb | 29 ++++ .../recipes-extended/haveged/haveged_1.9.6.bb | 6 + .../recipes-extended/jansson/jansson_2.12.bb | 1 + ...001-Always-enable-trivial-httpd-for-tests.patch | 59 ------- ...d-create-tests-directory-for-split-builds.patch | 43 +++++ ...andle-EPIPE-failures-when-head-terminates.patch | 51 ++++++ ...tests-core-Fallback-to-en_US.UTF-8-locale.patch | 42 +++++ ...e-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch | 51 ------ ...core-Assume-C.UTF-8-if-locale-isn-t-found.patch | 40 +++++ .../0003-tests-Avoid-musl-failure-with-cp-a.patch | 52 ++++++ .../recipes-extended/ostree/ostree/run-ptest | 3 + .../recipes-extended/ostree/ostree_2019.4.bb | 157 ----------------- .../recipes-extended/ostree/ostree_2019.5.bb | 192 +++++++++++++++++++++ .../meta-oe/recipes-extended/zstd/zstd_1.4.3.bb | 35 ---- .../recipes-gnome/libpeas/libpeas_1.22.0.bb | 28 --- .../recipes-gnome/libpeas/libpeas_1.24.1.bb | 25 +++ .../recipes-graphics/gtkwave/gtkwave_3.3.102.bb | 23 +++ .../recipes-graphics/gtkwave/gtkwave_3.3.98.bb | 23 --- .../meta-oe/recipes-graphics/tslib/tslib_1.16.bb | 82 --------- .../meta-oe/recipes-graphics/tslib/tslib_1.21.bb | 82 +++++++++ .../recipes-graphics/xorg-app/xkbprint_1.0.4.bb | 13 -- .../recipes-graphics/xorg-app/xkbprint_1.0.5.bb | 13 ++ .../meta-oe/recipes-graphics/xorg-app/xterm_349.bb | 34 ---- .../meta-oe/recipes-graphics/xorg-app/xterm_350.bb | 34 ++++ .../ccid/ccid/0001-Add-build-rule-for-README.patch | 22 +++ .../meta-oe/recipes-support/ccid/ccid_1.4.30.bb | 19 -- .../meta-oe/recipes-support/ccid/ccid_1.4.31.bb | 20 +++ .../recipes-support/libssh2/libssh2_1.8.2.bb | 27 --- .../recipes-support/libssh2/libssh2_1.9.0.bb | 27 +++ ...configure-Fix-setting-of-CLDFLAGS-default.patch | 78 --------- .../recipes-support/lvm2/libdevmapper_2.03.05.bb | 17 -- .../recipes-support/lvm2/libdevmapper_2.03.06.bb | 17 ++ .../meta-oe/recipes-support/lvm2/lvm2.inc | 3 +- ...0001-activation-add-synchronization-point.patch | 82 --------- ...ve-unsupported-OPTIONS-event_timeout-rule.patch | 39 ----- ...ivation-extend-handling-of-pending_delete.patch | 124 ------------- .../lvm2/lvm2/0003-snapshot-always-activate.patch | 40 ----- .../meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb | 92 ---------- .../meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb | 88 ++++++++++ .../meta-oe/recipes-support/mcelog/mce-test_git.bb | 4 +- .../meta-oe/recipes-support/mcelog/mcelog_164.bb | 35 ---- .../meta-oe/recipes-support/mcelog/mcelog_165.bb | 35 ++++ ...ng-fix-segment-fault-during-service-start.patch | 27 ++- .../syslog-ng/files/fix-config-libnet.patch | 44 ++--- .../syslog-ng.service-the-syslog-ng-service.patch | 24 +-- .../recipes-support/syslog-ng/syslog-ng.inc | 1 - .../recipes-support/syslog-ng/syslog-ng_3.19.1.bb | 14 -- .../recipes-support/syslog-ng/syslog-ng_3.24.1.bb | 14 ++ .../meta-oe/recipes-test/cunit/cunit_2.1-3.bb | 2 + 80 files changed, 1422 insertions(+), 1603 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch delete mode 100644 meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20190617.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20191103.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree/run-ptest delete mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_349.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_350.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.30.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.31.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_164.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_165.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb (limited to 'meta-openembedded/meta-oe') diff --git a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb index 71483d88b..d6852e29f 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb @@ -19,6 +19,7 @@ do_install() { install -m0755 ${S}/def_config.sh ${D}/opt/S-suite install -m0755 ${S}/config_params.sh ${D}/opt/S-suite + install -m0755 ${S}/create_config.sh ${D}/opt/S-suite install -m0755 ${S}/process_config.sh ${D}/opt/S-suite } diff --git a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch index b65f1a732..09f4993a2 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch +++ b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch @@ -5,7 +5,8 @@ Subject: [PATCH] Don't build with -Werror to fix compile error. | amd_sgpio.c: In function '_write_amd_register': | amd_sgpio.c:558:18: error: taking address of packed member of 'struct amd_register' may result in an unaligned pointer value [-Werror=address-of-packed-member] -Upstream-Status: Pending +Upstream-Status: Submitted +https://github.com/intel/ledmon/pull/48/commits Signed-off-by: Zheng Ruoqin --- diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch index 4bd40606b..35665bd3f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch @@ -9,13 +9,14 @@ Signed-off-by: Fabio Berton src/ethtool-local.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/ethtool-local.h b/src/ethtool-local.h -index 200476b..0edc7a9 100644 --- a/src/ethtool-local.h +++ b/src/ethtool-local.h -@@ -22,9 +22,9 @@ +@@ -20,11 +20,11 @@ + * along with ifplugd; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ - +- ++#include typedef unsigned long long u64; -typedef __uint32_t u32; -typedef __uint16_t u16; @@ -26,6 +27,3 @@ index 200476b..0edc7a9 100644 #include "ethtool-kernel.h" --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch new file mode 100644 index 000000000..93ef007f8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch @@ -0,0 +1,40 @@ +From f2a2b9f445ab1e31fbb27a74744e9a2ededfce17 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 4 Nov 2019 16:38:04 -0800 +Subject: [PATCH] Makefile.am: Avoid redirection of input and output files + +Ensure that directory is created before its written to + +This can cause a build race in a highly parallelised build where a directory is not yet created but +output file is being written using redirection e.g. + +rst2man.py --strict --no-raw --no-generator --no-datestamp < ../git/monitor/iwmon.rst > monitor/iwmon.1 +/bin/sh: monitor/iwmon.1: No such file or directory +make[1]: *** [Makefile:3544: monitor/iwmon.1] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 823b7d02..1bd0005c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -626,8 +626,9 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ + < $< > $@ + + if RUN_RST2MAN +-RST2MAN_PROCESS = $(AM_V_GEN)$(RST2MAN) --strict --no-raw --no-generator \ +- --no-datestamp < $< > $@ ++RST2MAN_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ ++ $(AM_V_GEN)$(RST2MAN) --strict --no-raw \ ++ --no-generator --no-datestamp $< $@ + else + RST2MAN_PROCESS = $(AM_V_GEN)test -f $@ || \ + { echo "Generated manual page $@ does not exist"; false; } +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb deleted file mode 100644 index 20c6d04f7..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Wireless daemon for Linux" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -inherit autotools pkgconfig systemd python3native - -DEPENDS = "ell readline dbus python3-docutils-native" - -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "77f16ae26fc013477f6362a0c33f0e52e82863e0" -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" -PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" - -EXTRA_OECONF += "--enable-external-ell" - -do_configure_prepend () { - mkdir -p ${S}/build-aux -} - -do_install_append() { - mkdir --parents ${D}${docdir}/${BPN} - install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} -} - -FILES_${PN} += "${datadir}/dbus-1 ${libdir}/modules-load.d" - -SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}" - -RRECOMMENDS_${PN} = "\ - kernel-module-pkcs7-message \ - kernel-module-pkcs8-key-parser \ - kernel-module-x509-key-parser \ -" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb new file mode 100644 index 000000000..d11e0d4ae --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Wireless daemon for Linux" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +inherit autotools pkgconfig systemd python3native + +DEPENDS = "ell readline dbus python3-docutils-native" + +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ + file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \ + " +SRCREV = "971e1d2038a203ad43bd2278a811a9e5ec8d52db" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" +PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" + +EXTRA_OECONF += "--enable-external-ell" + +do_configure_prepend () { + mkdir -p ${S}/build-aux +} + +do_install_append() { + mkdir --parents ${D}${docdir}/${BPN} + install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} +} + +FILES_${PN} += "${datadir}/dbus-1 ${libdir}/modules-load.d ${systemd_unitdir}/network/" + +SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}" + +RRECOMMENDS_${PN} = "\ + kernel-module-pkcs7-message \ + kernel-module-pkcs8-key-parser \ + kernel-module-x509-key-parser \ +" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb index b72b7af4f..be4536b9c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb @@ -17,3 +17,5 @@ do_install_append() { # still basic so drop it for now. rm ${D}${includedir}/event.h } + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb deleted file mode 100644 index ed6c55bba..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "Open-source monitoring solution for your IT infrastructure" -DESCRIPTION = "\ -ZABBIX is software that monitors numerous parameters of a network and the \ -health and integrity of servers. ZABBIX uses a flexible notification \ -mechanism that allows users to configure e-mail based alerts for virtually \ -any event. This allows a fast reaction to server problems. ZABBIX offers \ -excellent reporting and data visualisation features based on the stored \ -data. This makes ZABBIX ideal for capacity planning. \ -\ -ZABBIX supports both polling and trapping. All ZABBIX reports and \ -statistics, as well as configuration parameters are accessed through a \ -web-based front end. A web-based front end ensures that the status of \ -your network and the health of your servers can be assessed from any \ -location. Properly configured, ZABBIX can play an important role in \ -monitoring IT infrastructure. This is equally true for small \ -organisations with a few servers and for large companies with a \ -multitude of servers." -HOMEPAGE = "http://www.zabbix.com/" -SECTION = "Applications/Internet" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=300e938ad303147fede2294ed78fe02e" -DEPENDS = "libevent libpcre openldap virtual/libiconv zlib" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-Fix-configure.ac.patch \ - file://zabbix-agent.service \ -" - -SRC_URI[md5sum] = "601d3c29322c720c72018950ed969d0a" -SRC_URI[sha256sum] = "9d9bdf1d858048d72811de04269a429aba257fac2e4b6e782d5a2b1d3a82f627" - -inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "zabbix-agent.service" -SYSTEMD_AUTO_ENABLE = "enable" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r zabbix" -USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ - -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \ -" - -KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}" - -EXTRA_OECONF = " \ - --enable-dependency-tracking \ - --enable-agent \ - --enable-ipv6 \ - --with-net-snmp \ - --with-ldap=${STAGING_EXECPREFIXDIR} \ - --with-jabber \ - --with-unixodbc \ - --with-ssh2 \ - --with-sqlite3 \ - --with-zlib \ - --with-libpthread \ - --with-libevent \ - --with-libpcre \ -" -CFLAGS_append = " -lldap -llber -pthread" - -do_configure_prepend() { - export KERNEL_VERSION="${KERNEL_VERSION}" -} - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service - fi -} - -FILES_${PN} += "${libdir}" - -RDEPENDS_${PN} = "logrotate" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.8.bb new file mode 100644 index 000000000..489ab0b63 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.8.bb @@ -0,0 +1,79 @@ +SUMMARY = "Open-source monitoring solution for your IT infrastructure" +DESCRIPTION = "\ +ZABBIX is software that monitors numerous parameters of a network and the \ +health and integrity of servers. ZABBIX uses a flexible notification \ +mechanism that allows users to configure e-mail based alerts for virtually \ +any event. This allows a fast reaction to server problems. ZABBIX offers \ +excellent reporting and data visualisation features based on the stored \ +data. This makes ZABBIX ideal for capacity planning. \ +\ +ZABBIX supports both polling and trapping. All ZABBIX reports and \ +statistics, as well as configuration parameters are accessed through a \ +web-based front end. A web-based front end ensures that the status of \ +your network and the health of your servers can be assessed from any \ +location. Properly configured, ZABBIX can play an important role in \ +monitoring IT infrastructure. This is equally true for small \ +organisations with a few servers and for large companies with a \ +multitude of servers." +HOMEPAGE = "http://www.zabbix.com/" +SECTION = "Applications/Internet" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=300e938ad303147fede2294ed78fe02e" +DEPENDS = "libevent libpcre openldap virtual/libiconv zlib" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ + file://0001-Fix-configure.ac.patch \ + file://zabbix-agent.service \ +" + +SRC_URI[md5sum] = "9a816afd4f7984a841bed64a25ba523c" +SRC_URI[sha256sum] = "57dbc2a95a09581b5196d2abc86ee1aaf65f3c909d6b4bc53d260dc4dd69b9c6" + +inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "zabbix-agent.service" +SYSTEMD_AUTO_ENABLE = "enable" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "-r zabbix" +USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ + -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \ +" + +KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}" + +EXTRA_OECONF = " \ + --enable-dependency-tracking \ + --enable-agent \ + --enable-ipv6 \ + --with-net-snmp \ + --with-ldap=${STAGING_EXECPREFIXDIR} \ + --with-jabber \ + --with-unixodbc \ + --with-ssh2 \ + --with-sqlite3 \ + --with-zlib \ + --with-libpthread \ + --with-libevent \ + --with-libpcre \ +" +CFLAGS_append = " -lldap -llber -pthread" + +do_configure_prepend() { + export KERNEL_VERSION="${KERNEL_VERSION}" +} + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service + fi +} + +FILES_${PN} += "${libdir}" + +RDEPENDS_${PN} = "logrotate" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch new file mode 100644 index 000000000..6031eaa78 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch @@ -0,0 +1,41 @@ +From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 4 Nov 2019 19:19:47 +0100 +Subject: [PATCH] meson.build: do not ask for python installation / version +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Even by adding python3-setuptools-native the following error is not fixed so +just ask for python3 executable. + +| meson.build:9:0: ERROR: ['<...>/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller +--- + meson.build | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 3255328..7a6094c 100644 +--- a/meson.build ++++ b/meson.build +@@ -6,12 +6,7 @@ project('mm-common', + license: 'GPLv2+' + ) + +-python3 = import('python').find_installation('python3') +-python_version = python3.language_version() +-python_version_req = '>= 3.5' +-if not python_version.version_compare(python_version_req) +- error('Requires Python @0@, found @1@.'.format(python_version_req, python_version)) +-endif ++python3 = import('python3').find_python() + + # Use these instead of meson.source_root() and meson.build_root(). + # source_root() and build_root() are not useful, if this is a subproject. +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb deleted file mode 100644 index 4f91f31e4..000000000 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb +++ /dev/null @@ -1,9 +0,0 @@ -inherit gnomebase - -SRC_URI[archive.md5sum] = "be1c61587db989c7677375a729b94672" -SRC_URI[archive.sha256sum] = "ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb new file mode 100644 index 000000000..c7d1f2b73 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Common GNOME build files for C++ bindings" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase + +SRC_URI[archive.md5sum] = "9087b8612d75cbc1fad0c99e15c2a718" +SRC_URI[archive.sha256sum] = "b97d9b041e5952486cab620b44ab09f6013a478f43b6699ae899b8a4da189cd4" +SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb deleted file mode 100644 index ae5988b57..000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb +++ /dev/null @@ -1,92 +0,0 @@ -SUMMARY = "Manage plain dm-crypt and LUKS encrypted volumes" -DESCRIPTION = "Cryptsetup is used to conveniently setup dm-crypt managed \ -device-mapper mappings. These include plain dm-crypt volumes and \ -LUKS volumes. The difference is that LUKS uses a metadata header \ -and can hence offer more features than plain dm-crypt. On the other \ -hand, the header is visible and vulnerable to damage." -HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" -SECTION = "console" -LICENSE = "GPL-2.0-with-OpenSSL-exception" -LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" - -DEPENDS = " \ - json-c \ - libdevmapper \ - popt \ - util-linux \ -" - -RDEPENDS_${PN} = " \ - libdevmapper \ -" - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "1654c8d2aa0dac51c8d1d755df61ae6c" -SRC_URI[sha256sum] = "94e79a31ed38bdb0acd9af7ccca1605a2ac62ca850ed640202876b1ee11c1c61" - -inherit autotools gettext pkgconfig - -# Use openssl because libgcrypt drops root privileges -# if libgcrypt is linked with libcap support -PACKAGECONFIG ??= " \ - keyring \ - cryptsetup \ - veritysetup \ - cryptsetup-reencrypt \ - integritysetup \ - ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - kernel_crypto \ - internal-argon2 \ - blkid \ - luks-adjust-xts-keysize \ - openssl \ -" -PACKAGECONFIG_append_class-target = " \ - udev \ -" - -PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring" -PACKAGECONFIG[fips] = "--enable-fips,--disable-fips" -PACKAGECONFIG[pwquality] = "--enable-pwquality,--disable-pwquality,libpwquality" -PACKAGECONFIG[passwdqc] = "--enable-passwdqc,--disable-passwdqc,passwdqc" -PACKAGECONFIG[cryptsetup] = "--enable-cryptsetup,--disable-cryptsetup" -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[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" -# gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't -# recognized. -PACKAGECONFIG[gcrypt-pbkdf2] = "--enable-gcrypt-pbkdf2" -PACKAGECONFIG[internal-argon2] = "--enable-internal-argon2,--disable-internal-argon2" -PACKAGECONFIG[internal-sse-argon2] = "--enable-internal-sse-argon2,--disable-internal-sse-argon2" -PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux" -PACKAGECONFIG[dev-random] = "--enable-dev-random,--disable-dev-random" -PACKAGECONFIG[luks-adjust-xts-keysize] = "--enable-luks-adjust-xts-keysize,--disable-luks-adjust-xts-keysize" -PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl" -PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt" -PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss" -PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" -PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" -PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" - -RRECOMMENDS_${PN} = "kernel-module-aes-generic \ - kernel-module-dm-crypt \ - kernel-module-md5 \ - kernel-module-cbc \ - kernel-module-sha256-generic \ - kernel-module-xts \ -" - -EXTRA_OECONF = "--enable-static" -# Building without largefile is not supported by upstream -EXTRA_OECONF += "--enable-largefile" -# Requires a static popt library -EXTRA_OECONF += "--disable-static-cryptsetup" -# There's no recipe for libargon2 yet -EXTRA_OECONF += "--disable-libargon2" - -FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb new file mode 100644 index 000000000..479b9eb37 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb @@ -0,0 +1,92 @@ +SUMMARY = "Manage plain dm-crypt and LUKS encrypted volumes" +DESCRIPTION = "Cryptsetup is used to conveniently setup dm-crypt managed \ +device-mapper mappings. These include plain dm-crypt volumes and \ +LUKS volumes. The difference is that LUKS uses a metadata header \ +and can hence offer more features than plain dm-crypt. On the other \ +hand, the header is visible and vulnerable to damage." +HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" +SECTION = "console" +LICENSE = "GPL-2.0-with-OpenSSL-exception" +LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" + +DEPENDS = " \ + json-c \ + libdevmapper \ + popt \ + util-linux \ +" + +RDEPENDS_${PN} = " \ + libdevmapper \ +" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" +SRC_URI[md5sum] = "2b64ca9ea16e823df359eacf9c02414b" +SRC_URI[sha256sum] = "2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46" + +inherit autotools gettext pkgconfig + +# Use openssl because libgcrypt drops root privileges +# if libgcrypt is linked with libcap support +PACKAGECONFIG ??= " \ + keyring \ + cryptsetup \ + veritysetup \ + cryptsetup-reencrypt \ + integritysetup \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ + kernel_crypto \ + internal-argon2 \ + blkid \ + luks-adjust-xts-keysize \ + openssl \ +" +PACKAGECONFIG_append_class-target = " \ + udev \ +" + +PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring" +PACKAGECONFIG[fips] = "--enable-fips,--disable-fips" +PACKAGECONFIG[pwquality] = "--enable-pwquality,--disable-pwquality,libpwquality" +PACKAGECONFIG[passwdqc] = "--enable-passwdqc,--disable-passwdqc,passwdqc" +PACKAGECONFIG[cryptsetup] = "--enable-cryptsetup,--disable-cryptsetup" +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[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" +# gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't +# recognized. +PACKAGECONFIG[gcrypt-pbkdf2] = "--enable-gcrypt-pbkdf2" +PACKAGECONFIG[internal-argon2] = "--enable-internal-argon2,--disable-internal-argon2" +PACKAGECONFIG[internal-sse-argon2] = "--enable-internal-sse-argon2,--disable-internal-sse-argon2" +PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux" +PACKAGECONFIG[dev-random] = "--enable-dev-random,--disable-dev-random" +PACKAGECONFIG[luks-adjust-xts-keysize] = "--enable-luks-adjust-xts-keysize,--disable-luks-adjust-xts-keysize" +PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl" +PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt" +PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss" +PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" +PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" +PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" + +RRECOMMENDS_${PN} = "kernel-module-aes-generic \ + kernel-module-dm-crypt \ + kernel-module-md5 \ + kernel-module-cbc \ + kernel-module-sha256-generic \ + kernel-module-xts \ +" + +EXTRA_OECONF = "--enable-static" +# Building without largefile is not supported by upstream +EXTRA_OECONF += "--enable-largefile" +# Requires a static popt library +EXTRA_OECONF += "--disable-static-cryptsetup" +# There's no recipe for libargon2 yet +EXTRA_OECONF += "--disable-libargon2" + +FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb deleted file mode 100644 index e1a038dfa..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb +++ /dev/null @@ -1,20 +0,0 @@ -require mariadb.inc -inherit native - -PROVIDES += "mysql5-native" -DEPENDS = "ncurses-native zlib-native bison-native" - -RDEPENDS_${PN} = "" -PACKAGES = "" -EXTRA_OEMAKE = "" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ - install -m 0755 sql/gen_lex_token ${D}${bindir}/ - install -m 0755 extra/comp_err ${D}${bindir}/ - install -m 0755 scripts/comp_sql ${D}${bindir}/ -} - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb new file mode 100644 index 000000000..e1a038dfa --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb @@ -0,0 +1,20 @@ +require mariadb.inc +inherit native + +PROVIDES += "mysql5-native" +DEPENDS = "ncurses-native zlib-native bison-native" + +RDEPENDS_${PN} = "" +PACKAGES = "" +EXTRA_OEMAKE = "" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + + install -d ${D}${bindir} + install -m 0755 sql/gen_lex_hash ${D}${bindir}/ + install -m 0755 sql/gen_lex_token ${D}${bindir}/ + install -m 0755 extra/comp_err ${D}${bindir}/ + install -m 0755 scripts/comp_sql ${D}${bindir}/ +} + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index f1c71feeb..e1ae58ae7 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -19,8 +19,8 @@ SRC_URI = "http://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ " -SRC_URI[md5sum] = "11220d0b94c5c24caa2e1e9eaba38e31" -SRC_URI[sha256sum] = "39e9723eaf620afd99b0925b2c2a5a50a89110ba50040adf14cce7cf89e5e21b" +SRC_URI[md5sum] = "b3524c0825c3a1c255496daea38304a0" +SRC_URI[sha256sum] = "69456ca85bf9d96c6d28b4ade2a9f6787d79a602e27ef941f9ba4e0b55dddedc" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb deleted file mode 100644 index de24c920f..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" - -DEPENDS += "mariadb-native bison-native openssl ncurses zlib readline libaio libevent libxml2" - -PROVIDES += "mysql5 libmysqlclient" - -RPROVIDES_${PN} += "mysql5" -RREPLACES_${PN} += "mysql5" -RCONFLICTS_${PN} += "mysql5" - -RPROVIDES_${PN}-dbg += "mysql5-dbg" -RREPLACES_${PN}-dbg += "mysql5-dbg" -RCONFLICTS_${PN}-dbg += "mysql5-dbg" - -RPROVIDES_${PN}-leftovers += "mysql5-leftovers" -RREPLACES_${PN}-leftovers += "mysql5-leftovers" -RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" - -RPROVIDES_${PN}-client += "mysql5-client" -RREPLACES_${PN}-client += "mysql5-client" -RCONFLICTS_${PN}-client += "mysql5-client" - -RPROVIDES_${PN}-server += "mysql5-server" -RREPLACES_${PN}-server += "mysql5-server" -RCONFLICTS_${PN}-server += "mysql5-server" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb new file mode 100644 index 000000000..de24c920f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb @@ -0,0 +1,27 @@ +require mariadb.inc + +EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" + +DEPENDS += "mariadb-native bison-native openssl ncurses zlib readline libaio libevent libxml2" + +PROVIDES += "mysql5 libmysqlclient" + +RPROVIDES_${PN} += "mysql5" +RREPLACES_${PN} += "mysql5" +RCONFLICTS_${PN} += "mysql5" + +RPROVIDES_${PN}-dbg += "mysql5-dbg" +RREPLACES_${PN}-dbg += "mysql5-dbg" +RCONFLICTS_${PN}-dbg += "mysql5-dbg" + +RPROVIDES_${PN}-leftovers += "mysql5-leftovers" +RREPLACES_${PN}-leftovers += "mysql5-leftovers" +RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" + +RPROVIDES_${PN}-client += "mysql5-client" +RREPLACES_${PN}-client += "mysql5-client" +RCONFLICTS_${PN}-client += "mysql5-client" + +RPROVIDES_${PN}-server += "mysql5-server" +RREPLACES_${PN}-server += "mysql5-server" +RCONFLICTS_${PN}-server += "mysql5-server" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch index f14da06d9..84cd5c157 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch @@ -9,21 +9,25 @@ xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS. Signed-off-by: Philip Balister -upate to version 10.4 +update to version 10.4 Signed-off-by: Changqing Li + +Update for version 12.0 +Signed-off-by: Zheng Ruoqin --- - configure.in | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) + configure.in | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/configure.in b/configure.in -index d9fe56e..3e2cd3a 100644 +index 6942f81..7fd3e78 100644 --- a/configure.in +++ b/configure.in -@@ -816,19 +816,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], +@@ -923,20 +923,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) if test "$with_libxml" = yes ; then - PGAC_PATH_PROGS(XML2_CONFIG, xml2-config) +- AC_ARG_VAR(XML2_CONFIG, [path to xml2-config utility])dnl - if test -n "$XML2_CONFIG"; then - for pgac_option in `$XML2_CONFIG --cflags`; do - case $pgac_option in diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb deleted file mode 100644 index fd4200a73..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ -" - -SRC_URI[md5sum] = "580da94f6d85046ff2a228785ab2cc89" -SRC_URI[sha256sum] = "7fdf23060bfc715144cbf2696cf05b0fa284ad3eb21f0c378591c6bca99ad180" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb new file mode 100644 index 000000000..d5b1ebdb5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb @@ -0,0 +1,12 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ +" + +SRC_URI[md5sum] = "87545416ef021eee8621d31a93fcc899" +SRC_URI[sha256sum] = "cda2397215f758b793f741c86be05468257b0e6bcb1a6113882ab5d0df0855c6" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index 4afe341f9..4013c6931 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb @@ -55,6 +55,7 @@ PACKAGECONFIG ??= "ares icu libuv zlib" PACKAGECONFIG[ares] = "--shared-cares,,c-ares" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" +PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch deleted file mode 100644 index c80d9f19f..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch +++ /dev/null @@ -1,59 +0,0 @@ -From bee22f143ffa0457aefcf31053f76416e6d242e5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 20 May 2019 23:24:26 -0700 -Subject: [PATCH] esirisc_flash: Rename PAGE_SIZE to FLASH_PAGE_SIZE - -PAGE_SIZE is defined in system includes on some systems, this would -avoid the unintended conflict - -Fixes -| src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined [-Werror,-Wmacro-redefined] -| #define PAGE_SIZE 4096 -| ^ -| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu -de/limits.h:89:9: note: previous definition is here -| #define PAGE_SIZE PAGESIZE - -Upstream-Status: Submitted [http://openocd.zylin.com/#/c/5180/2] -Change-Id: I195b303fc88a7c848ca4e55fd6ba893796df55cc -Signed-off-by: Khem Raj ---- - src/flash/nor/esirisc_flash.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/flash/nor/esirisc_flash.c b/src/flash/nor/esirisc_flash.c -index 4e33b942..3bed0658 100644 ---- a/src/flash/nor/esirisc_flash.c -+++ b/src/flash/nor/esirisc_flash.c -@@ -92,7 +92,7 @@ - #endif - - #define CONTROL_TIMEOUT 5000 /* 5s */ --#define PAGE_SIZE 4096 -+#define FLASH_PAGE_SIZE 4096 - #define PB_MAX 32 - - #define NUM_NS_PER_S 1000000000ULL -@@ -264,7 +264,7 @@ static int esirisc_flash_erase(struct flash_bank *bank, int first, int last) - (void)esirisc_flash_disable_protect(bank); - - for (int page = first; page < last; ++page) { -- uint32_t address = page * PAGE_SIZE; -+ uint32_t address = page * FLASH_PAGE_SIZE; - - target_write_u32(target, esirisc_info->cfg + ADDRESS, address); - -@@ -464,8 +464,8 @@ static int esirisc_flash_probe(struct flash_bank *bank) - if (target->state != TARGET_HALTED) - return ERROR_TARGET_NOT_HALTED; - -- bank->num_sectors = bank->size / PAGE_SIZE; -- bank->sectors = alloc_block_array(0, PAGE_SIZE, bank->num_sectors); -+ bank->num_sectors = bank->size / FLASH_PAGE_SIZE; -+ bank->sectors = alloc_block_array(0, FLASH_PAGE_SIZE, bank->num_sectors); - - retval = esirisc_flash_init(bank); - if (retval != ERROR_OK) { --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index 241b4baa3..9ec77fdc4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -9,22 +9,21 @@ SRC_URI = " \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ - file://0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch \ file://0001-Do-not-include-syscrtl.h-with-glibc.patch \ " SRCREV_FORMAT = "openocd" -SRCREV_openocd = "7ee618692f56b0efea864890da45d73d28e393d9" +SRCREV_openocd = "ded67990255cc1e63c77832ffd6e6bef9120873d" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" -SRCREV_jimtcl = "a9bf5975fd0f89974d689a2d9ebd0873c8d64787" -SRCREV_libjaylink = "8645845c1abebd004e991ba9a7f808f4fd0c608b" +SRCREV_jimtcl = "dc4ba7770d580800634f90b67a24e077b4a26d98" +SRCREV_libjaylink = "cfccbc9d6763733f1d14dff3c2dc5b75aaef136b" PV = "0.10+gitr${SRCPV}" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep gettext -BBCLASSEXTEND += "nativesdk" +BBCLASSEXTEND += "native nativesdk" EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html --disable-werror" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb deleted file mode 100644 index 928454117..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY = "Protocol Buffers - structured data serialisation mechanism" -DESCRIPTION = "Protocol Buffers are a way of encoding structured data in an \ -efficient yet extensible format. Google uses Protocol Buffers for almost \ -all of its internal RPC protocols and file formats." -HOMEPAGE = "https://github.com/google/protobuf" -SECTION = "console/tools" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" - -DEPENDS = "zlib" -DEPENDS_append_class-target = " protobuf-native" - -SRCREV = "6d4e7fd7966c989e38024a8ea693db83758944f1" - -SRC_URI = "git://github.com/google/protobuf.git;branch=3.10.x \ - file://run-ptest \ - file://0001-protobuf-fix-configure-error.patch \ - file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ - file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ -" -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig ptest - -PACKAGECONFIG ??= "" -PACKAGECONFIG[python] = ",," - -EXTRA_OECONF += "--with-protoc=echo" - -TEST_SRC_DIR = "examples" -LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" - -do_compile_ptest() { - mkdir -p "${B}/${TEST_SRC_DIR}" - - # Add the location of the cross-compiled header and library files - # which haven't been installed yet. - cp "${B}/protobuf.pc" "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Libs:|Libs: -L${B}/src/.libs|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}" - - # Save the pkgcfg sysroot variable, and update it to nothing so - # that it doesn't append the sysroot to the beginning of paths. - # The header and library files aren't installed to the target - # system yet. So the absolute paths were specified above. - save_pkg_config_sysroot_dir=$PKG_CONFIG_SYSROOT_DIR - export PKG_CONFIG_SYSROOT_DIR= - - # Compile the tests - for lang in ${LANG_SUPPORT}; do - oe_runmake -C "${S}/${TEST_SRC_DIR}" ${lang} - done - - # Restore the pkgconfig sysroot variable - export PKG_CONFIG_SYSROOT_DIR=$save_pkg_config_sysroot_dir -} - -do_install_ptest() { - local olddir=`pwd` - - cd "${S}/${TEST_SRC_DIR}" - install -d "${D}/${PTEST_PATH}" - for i in add_person* list_people*; do - if [ -x "$i" ]; then - install "$i" "${D}/${PTEST_PATH}" - fi - done - cp "${S}/${TEST_SRC_DIR}/addressbook_pb2.py" "${D}/${PTEST_PATH}" - cd "$olddir" -} - -PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite" - -FILES_${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}" -FILES_${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" - -RDEPENDS_${PN}-compiler = "${PN}" -RDEPENDS_${PN}-dev += "${PN}-compiler" -RDEPENDS_${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-protobuf', '', d)}" - -MIPS_INSTRUCTION_SET = "mips" - -BBCLASSEXTEND = "native nativesdk" - -LDFLAGS_append_arm = " -latomic" -LDFLAGS_append_mips = " -latomic" -LDFLAGS_append_powerpc = " -latomic" -LDFLAGS_append_mipsel = " -latomic" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.1.bb new file mode 100644 index 000000000..58526f131 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.1.bb @@ -0,0 +1,90 @@ +SUMMARY = "Protocol Buffers - structured data serialisation mechanism" +DESCRIPTION = "Protocol Buffers are a way of encoding structured data in an \ +efficient yet extensible format. Google uses Protocol Buffers for almost \ +all of its internal RPC protocols and file formats." +HOMEPAGE = "https://github.com/google/protobuf" +SECTION = "console/tools" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" + +DEPENDS = "zlib" +DEPENDS_append_class-target = " protobuf-native" + +SRCREV = "d09d649aea36f02c03f8396ba39a8d4db8a607e4" + +SRC_URI = "git://github.com/google/protobuf.git;branch=3.10.x \ + file://run-ptest \ + file://0001-protobuf-fix-configure-error.patch \ + file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ + file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ +" +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig ptest + +PACKAGECONFIG ??= "" +PACKAGECONFIG[python] = ",," + +EXTRA_OECONF += "--with-protoc=echo" + +TEST_SRC_DIR = "examples" +LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" + +do_compile_ptest() { + mkdir -p "${B}/${TEST_SRC_DIR}" + + # Add the location of the cross-compiled header and library files + # which haven't been installed yet. + cp "${B}/protobuf.pc" "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Libs:|Libs: -L${B}/src/.libs|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}" + + # Save the pkgcfg sysroot variable, and update it to nothing so + # that it doesn't append the sysroot to the beginning of paths. + # The header and library files aren't installed to the target + # system yet. So the absolute paths were specified above. + save_pkg_config_sysroot_dir=$PKG_CONFIG_SYSROOT_DIR + export PKG_CONFIG_SYSROOT_DIR= + + # Compile the tests + for lang in ${LANG_SUPPORT}; do + oe_runmake -C "${S}/${TEST_SRC_DIR}" ${lang} + done + + # Restore the pkgconfig sysroot variable + export PKG_CONFIG_SYSROOT_DIR=$save_pkg_config_sysroot_dir +} + +do_install_ptest() { + local olddir=`pwd` + + cd "${S}/${TEST_SRC_DIR}" + install -d "${D}/${PTEST_PATH}" + for i in add_person* list_people*; do + if [ -x "$i" ]; then + install "$i" "${D}/${PTEST_PATH}" + fi + done + cp "${S}/${TEST_SRC_DIR}/addressbook_pb2.py" "${D}/${PTEST_PATH}" + cd "$olddir" +} + +PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite" + +FILES_${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}" +FILES_${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" + +RDEPENDS_${PN}-compiler = "${PN}" +RDEPENDS_${PN}-dev += "${PN}-compiler" +RDEPENDS_${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-protobuf', '', d)}" + +MIPS_INSTRUCTION_SET = "mips" + +BBCLASSEXTEND = "native nativesdk" + +LDFLAGS_append_arm = " -latomic" +LDFLAGS_append_mips = " -latomic" +LDFLAGS_append_powerpc = " -latomic" +LDFLAGS_append_mipsel = " -latomic" diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch index 24864ea60..c7830ed90 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch @@ -12,16 +12,19 @@ Signed-off-by: Chen Qi Update for 20190617. Signed-off-by: Zheng Ruoqin + +Update for 20191103. +Signed-off-by: Zheng Ruoqin --- aclocal.m4 | 1 - configure | 259 ------------------------------------------------------------- 2 files changed, 260 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 -index 338465f..3311057 100644 +index b90cfe6..413ea9c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1231,7 +1231,6 @@ CF_GCC_VERSION +@@ -1232,7 +1232,6 @@ CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, [AC_PROG_CC_STDC], [CF_ANSI_CC_REQD]) @@ -30,20 +33,20 @@ index 338465f..3311057 100644 dnl --------------------------------------------------------------------------- dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 diff --git a/configure b/configure -index ebb1f0f..a56cb17 100755 +index ec77bba..234f271 100755 --- a/configure +++ b/configure -@@ -1957,265 +1957,6 @@ esac +@@ -2059,265 +2059,6 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} --echo "$as_me:1960: checking \$CFLAGS variable" >&5 +-echo "$as_me:2062: checking \$CFLAGS variable" >&5 -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 -case "x$CFLAGS" in -(*-[IUD]*) -- echo "$as_me:1964: result: broken" >&5 +- echo "$as_me:2066: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:1966: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 +- { echo "$as_me:2068: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} - cf_flags="$CFLAGS" - CFLAGS= @@ -151,18 +154,18 @@ index ebb1f0f..a56cb17 100755 - done - ;; -(*) -- echo "$as_me:2074: result: ok" >&5 +- echo "$as_me:2176: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - --echo "$as_me:2079: checking \$CC variable" >&5 +-echo "$as_me:2181: checking \$CC variable" >&5 -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 -case "$CC" in -(*[\ \ ]-*) -- echo "$as_me:2083: result: broken" >&5 +- echo "$as_me:2185: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2085: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +- { echo "$as_me:2187: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} - # humor him... - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -279,24 +282,24 @@ index ebb1f0f..a56cb17 100755 - done - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - --echo "${as_me:-configure}:2202: testing resulting CC: '$CC' ..." 1>&5 +-echo "${as_me:-configure}:2304: testing resulting CC: '$CC' ..." 1>&5 - - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 - --echo "${as_me:-configure}:2206: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2308: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - --echo "${as_me:-configure}:2210: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2312: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 - - ;; -(*) -- echo "$as_me:2214: result: ok" >&5 +- echo "$as_me:2316: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - - echo "$as_me:2219: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo "$as_me:2321: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -- diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20190617.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20190617.bb deleted file mode 100644 index 2834b7c5e..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20190617.bb +++ /dev/null @@ -1,12 +0,0 @@ -# Sigh. This is one of those places where everyone licenses it differently. Someone -# even apply UCB to it (Free/Net/OpenBSD). The maintainer states that: -# "I've found no reliable source which states that byacc must bear a UCB copyright." -# Setting to PD as this is what the upstream has it as. - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=3eb7c635434fafe23ef30fc263e63b2f" -require byacc.inc - -SRC_URI[md5sum] = "17b3f7e7ed570d785b145064d99df615" -SRC_URI[sha256sum] = "f87868167b920bf2cb30fc32b62f63ae15671181ef329226d1063100be02518d" - diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20191103.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20191103.bb new file mode 100644 index 000000000..eae4618e2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20191103.bb @@ -0,0 +1,12 @@ +# Sigh. This is one of those places where everyone licenses it differently. Someone +# even apply UCB to it (Free/Net/OpenBSD). The maintainer states that: +# "I've found no reliable source which states that byacc must bear a UCB copyright." +# Setting to PD as this is what the upstream has it as. + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=3eb7c635434fafe23ef30fc263e63b2f" +require byacc.inc + +SRC_URI[md5sum] = "84ffe59166f67bbe147a6f502c7af309" +SRC_URI[sha256sum] = "d291fb34816f45079067366b7f7300ffbf9f7e3f1aaf6d509b84442d065d11b9" + diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb deleted file mode 100644 index d414bc683..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "display dialog boxes from shell scripts" -DESCRIPTION = "Dialog lets you to present a variety of questions \ -or display messages using dialog boxes from a shell \ -script (or any scripting language)." -HOMEPAGE = "http://invisible-island.net/dialog/" -SECTION = "console/utils" -DEPENDS = "ncurses" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ - " -SRC_URI[md5sum] = "e9d7f8b5e7b17183b0fb9297c0f57840" -SRC_URI[sha256sum] = "e5eb0eaaef9cae8c822887bd998e33c2c3b94ebadd37b4f6aba018c0194a2a87" - -# hardcoded here for use in dialog-static recipe -S = "${WORKDIR}/dialog-${PV}" - -inherit autotools-brokensep pkgconfig - -EXTRA_OECONF = "--with-ncurses \ - --disable-rpath-hack" - -do_configure() { - gnu-configize --force - sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure - sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure - oe_runconf -} diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb new file mode 100644 index 000000000..a1acfcd00 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb @@ -0,0 +1,29 @@ +SUMMARY = "display dialog boxes from shell scripts" +DESCRIPTION = "Dialog lets you to present a variety of questions \ +or display messages using dialog boxes from a shell \ +script (or any scripting language)." +HOMEPAGE = "http://invisible-island.net/dialog/" +SECTION = "console/utils" +DEPENDS = "ncurses" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ + " +SRC_URI[md5sum] = "f48b597251a26c522002736652e0300c" +SRC_URI[sha256sum] = "886e12f2cf3df36cde65f32f6ae52bc598eb2599a611b1d8ce5dfdea599e47e2" + +# hardcoded here for use in dialog-static recipe +S = "${WORKDIR}/dialog-${PV}" + +inherit autotools-brokensep pkgconfig + +EXTRA_OECONF = "--with-ncurses \ + --disable-rpath-hack" + +do_configure() { + gnu-configize --force + sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure + sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure + oe_runconf +} diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb index 0189e19c0..a2f0d07f2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb @@ -35,6 +35,12 @@ do_install_append() { # The exit status is 143 when the service is stopped if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then sed -i '/ExecStart/a SuccessExitStatus=143' ${D}${systemd_system_unitdir}/haveged.service + # Hybrid systemd-sysvinit distros must install the initscript manually + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${INIT_D_DIR} + sed -e "s,@SBINDIR@,${sbindir},g" <${S}/init.d/sysv.redhat >${D}${INIT_D_DIR}/haveged + chmod 755 ${D}${INIT_D_DIR}/haveged + fi fi } diff --git a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb index 3cc353ee7..f47fe5725 100644 --- a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb @@ -11,3 +11,4 @@ SRC_URI[sha256sum] = "5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c70 inherit autotools pkgconfig +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch deleted file mode 100644 index c9e1306af..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 44e0647230b22cd136ae2fb252ce90eed4751970 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Wed, 4 Sep 2019 17:29:15 +0100 -Subject: [PATCH 1/2] Always enable trivial-httpd for tests - -When running tests we always need ostree-trivial-httpd, so enable it -unconditionally - -Signed-off-by: Alex Kiernan -Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] ---- - Makefile.am | 1 + - ci/build.sh | 5 +++++ - ci/travis-build.sh | 1 + - 3 files changed, 7 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index cd04a055045a..673dbf88de55 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -39,6 +39,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \ - --enable-gtk-doc \ - --enable-man \ - --disable-maintainer-mode \ -+ --enable-trivial-httpd-cmdline \ - $(NULL) - - GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make -diff --git a/ci/build.sh b/ci/build.sh -index 0901507498f2..806af050b780 100755 ---- a/ci/build.sh -+++ b/ci/build.sh -@@ -22,6 +22,11 @@ case "${CONFIGOPTS:-}" in - fi - ;; - esac -+# unless libsoup is disabled, enable trivial-httpd for the tests -+case "${CONFIGOPTS:-}" in -+ *--without-soup*) ;; -+ *) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;; -+esac - - # always fail on warnings; https://github.com/ostreedev/ostree/pull/971 - # NB: this disables the default set of flags from configure.ac -diff --git a/ci/travis-build.sh b/ci/travis-build.sh -index 3fd969bdced6..7c85313a2d32 100755 ---- a/ci/travis-build.sh -+++ b/ci/travis-build.sh -@@ -85,6 +85,7 @@ make="make -j${ci_parallel} V=1 VERBOSE=1" - - ../configure \ - --enable-always-build-tests \ -+ --enable-trivial-httpd-cmdline \ - ${ci_configopts} - "$@" - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch new file mode 100644 index 000000000..d94b3ded9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch @@ -0,0 +1,43 @@ +From 114fe5067b58a2434b44855eee48f865186fe0fa Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Tue, 5 Nov 2019 22:26:23 +0000 +Subject: [PATCH] build: create tests directory for split builds + +When `--disable-dependency-tracking` is in effect with separate build +directory, the tests directory isn't created as a result of the +dependency generation, which leads to a build race for the tests +directory being created and failures: + + Making all in . + make[2]: Entering directory 'TOPDIR/build/tmp/work/riscv64-yoe-linux-musl/ostree/2019.5-r0/build' + (echo '[Test]' > tests/test-local-pull-depth.sh.test.tmp; \ + echo 'Type=session' >> tests/test-local-pull-depth.sh.test.tmp; \ + echo 'Exec=env G_TEST_SRCDIR=/usr/libexec/installed-tests/libostree G_TEST_BUILDDIR=/usr/libexec/installed-tests/libostree /usr/libexec/installed-tests/libostree/test-local-pull-depth.sh' >> tests/test-local-pull-depth.sh.test.tmp; \ + mv tests/test-local-pull-depth.sh.test.tmp tests/test-local-pull-depth.sh.test) + /bin/sh: tests/test-local-pull-depth.sh.test.tmp: No such file or directory + /bin/sh: line 1: tests/test-local-pull-depth.sh.test.tmp: No such file or directory + /bin/sh: line 2: tests/test-local-pull-depth.sh.test.tmp: No such file or directory + mv: cannot stat 'tests/test-local-pull-depth.sh.test.tmp': No such file or directory + make[2]: *** [Makefile:9282: tests/test-local-pull-depth.sh.test] Error 1 + +Signed-off-by: Alex Kiernan +Upstream-Status: Pending +--- + buildutil/glib-tap.mk | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/buildutil/glib-tap.mk b/buildutil/glib-tap.mk +index 34b8f21ea26a..9a944a0acc88 100644 +--- a/buildutil/glib-tap.mk ++++ b/buildutil/glib-tap.mk +@@ -116,6 +116,7 @@ installed_testcases = $(test_programs) $(installed_test_programs) \ + installed_test_meta_DATA = $(installed_testcases:=.test) + + %.test: %$(EXEEXT) Makefile ++ @$(MKDIR_P) $(dir $@) + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=env G_TEST_SRCDIR=$(installed_testdir) G_TEST_BUILDDIR=$(installed_testdir) $(installed_testdir)/$(notdir $<)' >> $@.tmp; \ +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch new file mode 100644 index 000000000..fdb733ebe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch @@ -0,0 +1,51 @@ +From fb519f0361565cad0d340095263a1e8866ec4f89 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 31 Oct 2019 11:30:00 +0000 +Subject: [PATCH 1/3] tests: Handle EPIPE failures when head terminates + +When using musl, it appears that the default is line buffered output, so +when `head -1` reads from a pipe we have to handle the source end of the +pipe getting EPIPE. + +Signed-off-by: Alex Kiernan +Upstream-Status: Accepted [v2019.6] +--- + tests/pull-test.sh | 2 +- + tests/test-pull-mirrorlist.sh | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/pull-test.sh b/tests/pull-test.sh +index 0a97a1195582..2cfd8e02f790 100644 +--- a/tests/pull-test.sh ++++ b/tests/pull-test.sh +@@ -177,7 +177,7 @@ if ! skip_one_without_user_xattrs; then + ${CMD_PREFIX} ostree --repo=cacherepo pull-local ostree-srv/gnomerepo main + rev=$(ostree --repo=cacherepo rev-parse main) + ${CMD_PREFIX} ostree --repo=cacherepo ls -R -C main > ls.txt +- regfile_hash=$(grep -E -e '^-0' ls.txt | head -1 | awk '{ print $5 }') ++ regfile_hash=$((grep -E -e '^-0' ls.txt || true) | head -1 | awk '{ print $5 }') + ${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false corruptrepo $(cat httpd-address)/ostree/corruptrepo + # Make this a loop so in the future we can add more object types like commit etc. + for object in ${regfile_hash}.file; do +diff --git a/tests/test-pull-mirrorlist.sh b/tests/test-pull-mirrorlist.sh +index 4e44852d3971..85ff66e99f8e 100755 +--- a/tests/test-pull-mirrorlist.sh ++++ b/tests/test-pull-mirrorlist.sh +@@ -47,12 +47,12 @@ setup_mirror content_mirror3 + + # Let's delete a file from 1 so that it falls back on 2 + cd ${test_tmpdir}/content_mirror1/ostree/gnomerepo +-filez=$(find objects/ -name '*.filez' | head -n 1) ++filez=$((find objects/ -name '*.filez' || true) | head -n 1) + rm ${filez} + + # Let's delete a file from 1 and 2 so that it falls back on 3 + cd ${test_tmpdir}/content_mirror1/ostree/gnomerepo +-filez=$(find objects/ -name '*.filez' | head -n 1) ++filez=$((find objects/ -name '*.filez' || true) | head -n 1) + rm ${filez} + cd ${test_tmpdir}/content_mirror2/ostree/gnomerepo + rm ${filez} +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch new file mode 100644 index 000000000..dcafb0995 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch @@ -0,0 +1,42 @@ +From 4d17cd917fe4fb67d2f9e4881b6693ac7289f423 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Wed, 30 Oct 2019 07:55:41 +0000 +Subject: [PATCH 1/4] tests/core: Fallback to en_US.UTF-8 locale + +A number of tests expect explicit left/right single quotes in their +messages, which will never happen in the C locale. Change so we pick a +likely UTF-8 locale, or fail if we can't find one. + +Signed-off-by: Alex Kiernan +Upstream-Status: Accepted [v2019.6] +--- + tests/libtest-core.sh | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh +index f6f94288fc61..bc191332c916 100644 +--- a/tests/libtest-core.sh ++++ b/tests/libtest-core.sh +@@ -35,15 +35,11 @@ assert_not_reached () { + } + + # Some tests look for specific English strings. Use a UTF-8 version +-# of the C (POSIX) locale if we have one, or fall back to POSIX ++# of the C (POSIX) locale if we have one, or fall back to en_US.UTF-8 + # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) +-if locale -a | grep '^C.UTF-8$' >/dev/null; then +- export LC_ALL=C.UTF-8 +-elif locale -a | grep '^C.utf8$' >/dev/null; then +- export LC_ALL=C.utf8 +-else +- export LC_ALL=C +-fi ++export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) ++if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi ++ + # A GNU extension, used whenever LC_ALL is not C + unset LANGUAGE + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch deleted file mode 100644 index 362b2f36a..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2629328b39ae117876f4854409c2231220a30b9c Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Thu, 5 Sep 2019 13:22:15 +0100 -Subject: [PATCH 2/2] Gate ostree-trivial-httpd on BUILDOPT_TRIVIAL_HTTPD - -When building without --enable-trivial-httpd-cmdline, don't build or install -the ostree-trivial-httpd binary. - -Signed-off-by: Alex Kiernan -Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] ---- - Makefile-ostree.am | 3 ++- - configure.ac | 3 +++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile-ostree.am b/Makefile-ostree.am -index 76f39cad4b74..7b53cb148960 100644 ---- a/Makefile-ostree.am -+++ b/Makefile-ostree.am -@@ -143,12 +143,13 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c - endif - - if USE_LIBSOUP --# Eventually once we stop things from using this, we should support disabling this -+if BUILDOPT_TRIVIAL_HTTPD - ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c - pkglibexec_PROGRAMS += ostree-trivial-httpd - ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c - ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) - ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) -+endif - - if !USE_CURL - # This is necessary for the cookie jar bits -diff --git a/configure.ac b/configure.ac -index 069bab01752e..ffc67980d507 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -192,6 +192,9 @@ AC_ARG_ENABLE(trivial-httpd-cmdline, - [Continue to support "ostree trivial-httpd" [default=no]])],, - enable_trivial_httpd_cmdline=no) - AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) -+AS_IF([test x$with_soup = xno && test x$enable_trivial_httpd_cmdline = xyes], [ -+ AC_MSG_ERROR([trivial-httpd enabled, but libsoup is not; libsoup is needed for trivial-httpd]) -+]) - AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, - [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] - ) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch new file mode 100644 index 000000000..5ab9c8f6d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch @@ -0,0 +1,40 @@ +From 3d48021fb0892721fab8359b49470e521aaed493 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 31 Oct 2019 11:28:07 +0000 +Subject: [PATCH 2/3] tests/core: Assume C.UTF-8 if locale isn't found + +When building with musl there's no locale command, also its default +locale is C.UTF-8, so just get C.UTF-8 if we can't find locale. + +Signed-off-by: Alex Kiernan +Upstream-Status: Accepted [v2019.6] +--- + tests/libtest-core.sh | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh +index bc191332c916..46aafab03cc8 100644 +--- a/tests/libtest-core.sh ++++ b/tests/libtest-core.sh +@@ -37,9 +37,15 @@ assert_not_reached () { + # Some tests look for specific English strings. Use a UTF-8 version + # of the C (POSIX) locale if we have one, or fall back to en_US.UTF-8 + # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) +-export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) +-if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi +- ++# ++# If we can't find the locale command assume we have support for C.UTF-8 ++# (e.g. musl based systems) ++if type -p locale >/dev/null; then ++ export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) ++ if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi ++else ++ export LC_ALL=C.UTF-8 ++fi + # A GNU extension, used whenever LC_ALL is not C + unset LANGUAGE + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch new file mode 100644 index 000000000..834617c12 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch @@ -0,0 +1,52 @@ +From abf1a7392b2fa1945286a39a35190d74fe141e52 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 31 Oct 2019 17:09:36 +0000 +Subject: [PATCH 3/3] tests: Avoid musl failure with `cp -a` + +When copying the tree, using musl and GNU coreutils, something gets confused +when setting the ownership of symlinks and the copy fails with: + + cp: failed to preserve ownership for osdata-devel/bin: Not supported + +Rework using tar to avoid the problem. + +Signed-off-by: Alex Kiernan +Upstream-Status: Accepted [v2019.6] +--- + tests/libtest.sh | 4 +++- + tests/test-admin-gpg.sh | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/tests/libtest.sh b/tests/libtest.sh +index ba00073a10a7..3f5fd931bc1e 100755 +--- a/tests/libtest.sh ++++ b/tests/libtest.sh +@@ -440,7 +440,9 @@ EOF + ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build" + + cd ${test_tmpdir} +- cp -a osdata osdata-devel ++ rm -rf osdata-devel ++ mkdir osdata-devel ++ tar -C osdata -cf - . | tar -C osdata-devel -xf - + cd osdata-devel + mkdir -p usr/include + echo "a development header" > usr/include/foo.h +diff --git a/tests/test-admin-gpg.sh b/tests/test-admin-gpg.sh +index 1f50c8a9a508..dc776743776c 100755 +--- a/tests/test-admin-gpg.sh ++++ b/tests/test-admin-gpg.sh +@@ -90,7 +90,9 @@ EOF + ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build" --gpg-sign=$keyid --gpg-homedir=${test_tmpdir}/gpghome + + cd ${test_tmpdir} +- cp -a osdata osdata-devel ++ rm -rf osdata-devel ++ mkdir osdata-devel ++ tar -C osdata -cf - . | tar -C osdata-devel -xf - + cd osdata-devel + mkdir -p usr/include + echo "a development header" > usr/include/foo.h +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/run-ptest b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/run-ptest new file mode 100644 index 000000000..963d1f692 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner libostree diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.4.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.4.bb deleted file mode 100644 index 505c9fccc..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.4.bb +++ /dev/null @@ -1,157 +0,0 @@ -SUMMARY = "Versioned Operating System Repository." -DESCRIPTION = "libostree is both a shared library and suite of command line \ -tools that combines a \"git-like\" model for committing and downloading \ -bootable filesystem trees, along with a layer for deploying them and managing \ -the bootloader configuration." -HOMEPAGE = "https://ostree.readthedocs.io" -LICENSE = "LGPLv2.1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -DEPENDS = " \ - glib-2.0 \ - gpgme \ - e2fsprogs \ - libcap \ - zlib \ - xz \ - bison-native \ -" - -# The Yocto mirror has an old export of ostree: -# http://downloads.yoctoproject.org/mirror/sources/git2_github.com.ostreedev.ostree.tar.gz -PREMIRRORS = "" - -SRC_URI = " \ - gitsm://github.com/ostreedev/ostree \ - file://0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch \ - file://0001-Always-enable-trivial-httpd-for-tests.patch \ - file://0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch \ -" -SRCREV = "9d39e7d91e8497987cad69a3fbed5c5fc91eebdc" - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" - -S = "${WORKDIR}/git" - -inherit autotools bash-completion gobject-introspection gtk-doc pkgconfig systemd - -# package configuration - match ostree defaults, but without rofiles-fuse -# otherwise we introduce a dependendency on meta-filesystems -PACKAGECONFIG ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ - soup \ -" - -# We include soup because ostree can't (currently) be built without -# soup or curl - https://github.com/ostreedev/ostree/issues/1897 -PACKAGECONFIG_class-native ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ - soup \ -" - -PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" -PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" -PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" -PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" -PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" -PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" -PACKAGECONFIG[man] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native" -PACKAGECONFIG[mkinitcpio] = "--with-mkinitcpio, --without-mkinitcpio" -PACKAGECONFIG[no-http2] = "--disable-http2, --enable-http2" -PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl" -PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse" -PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux" -PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" -PACKAGECONFIG[soup] = "--with-soup, --without-soup --disable-glibtest, libsoup-2.4" -PACKAGECONFIG[static] = "" -PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_unitdir}/system, --without-libsystemd, systemd" -PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" - -EXTRA_OECONF = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ -" - -# Makefile-libostree.am overrides this to avoid a build problem with clang, -# but that fix breaks cross compilation and we don't need it -EXTRA_OEMAKE = " \ - INTROSPECTION_SCANNER_ENV= \ -" - -EXTRA_OECONF_class-native = " \ - --with-builtin-grub2-mkconfig \ - --enable-wrpseudo-compat \ - --disable-otmpfile \ -" - -# Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the -# do_configure stage so we do depend on it -SYSROOT_DIR = "${STAGING_DIR_TARGET}" -SYSROOT_DIR_class-native = "${STAGING_DIR_NATIVE}" -do_configure[vardeps] += "SYSROOT_DIR" - -do_configure_prepend() { - # this reflects what autogen.sh does, but the OE wrappers for autoreconf - # allow it to work without the other gyrations which exist there - cp ${S}/libglnx/Makefile-libglnx.am ${S}/libglnx/Makefile-libglnx.am.inc - cp ${S}/bsdiff/Makefile-bsdiff.am ${S}/bsdiff/Makefile-bsdiff.am.inc -} - -do_install_append_class-native() { - create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" -} - -PACKAGES += " \ - ${PN}-dracut \ - ${PN}-grub \ - ${PN}-mkinitcpio \ - ${PN}-switchroot \ -" - -FILES_${PN} = " \ - ${bindir}/ostree \ - ${bindir}/rofiles-fuse \ - ${datadir}/${BPN} \ - ${datadir}/gir-1.0 \ - ${libdir}/${BPN}/ostree-remount \ - ${libdir}/girepository-1.0 \ - ${libdir}/lib*${SOLIBS} \ - ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \ - ${libexecdir}/libostree/ostree-trivial-httpd \ - ${sysconfdir}/ostree/remotes.d \ - ${systemd_unitdir}/system-generators/ostree-system-generator \ - ${systemd_unitdir}/system/ostree-finalize-staged.path \ - ${systemd_unitdir}/system/ostree-finalize-staged.service \ - ${systemd_unitdir}/system/ostree-remount.service \ -" -FILES_${PN}-dracut = " \ - ${sysconfdir}/dracut.conf.d \ - ${libdir}/dracut \ -" -FILES_${PN}-grub = " \ - ${sysconfdir}/grub.d \ - ${libexecdir}/libostree/grub2-15_ostree \ -" -FILES_${PN}-mkinitcpio = " \ - ${sysconfdir}/ostree-mkinitcpio.conf \ - ${libdir}/initcpio \ -" -FILES_${PN}-switchroot = " \ - ${libdir}/ostree/ostree-prepare-root \ - ${systemd_unitdir}/system/ostree-prepare-root.service \ -" - -RDEPENDS_${PN}-dracut = "bash" -RDEPENDS_${PN}-mkinitcpio = "bash" -RDEPENDS_${PN}_class-target = " \ - gnupg \ - ${PN}-switchroot \ -" - -RRECOMMENDS_${PN} += "kernel-module-overlay" - -SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" -SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb new file mode 100644 index 000000000..b3b34a15e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb @@ -0,0 +1,192 @@ +SUMMARY = "Versioned Operating System Repository." +DESCRIPTION = "libostree is both a shared library and suite of command line \ +tools that combines a \"git-like\" model for committing and downloading \ +bootable filesystem trees, along with a layer for deploying them and managing \ +the bootloader configuration." +HOMEPAGE = "https://ostree.readthedocs.io" +LICENSE = "LGPLv2.1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +DEPENDS = " \ + glib-2.0 \ + gpgme \ + e2fsprogs \ + libcap \ + zlib \ + xz \ + bison-native \ +" + +# The Yocto mirror has an old export of ostree: +# http://downloads.yoctoproject.org/mirror/sources/git2_github.com.ostreedev.ostree.tar.gz +PREMIRRORS = "" + +SRC_URI = " \ + gitsm://github.com/ostreedev/ostree \ + file://0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch \ + file://run-ptest \ + file://0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch \ + file://0001-tests-Handle-EPIPE-failures-when-head-terminates.patch \ + file://0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch \ + file://0003-tests-Avoid-musl-failure-with-cp-a.patch \ + file://0001-build-create-tests-directory-for-split-builds.patch \ +" +SRCREV = "980ca07b03b3aa7e0012729dd6c84b0878775d93" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" + +S = "${WORKDIR}/git" + +inherit autotools bash-completion gobject-introspection gtk-doc pkgconfig ptest-gnome systemd + +# Package configuration - match ostree defaults, but without rofiles-fuse +# otherwise we introduce a dependendency on meta-filesystems +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ + soup \ +" + +# We include soup because ostree can't (currently) be built without +# soup or curl - https://github.com/ostreedev/ostree/issues/1897 +PACKAGECONFIG_class-native ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ + soup \ +" + +PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" +PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" +PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" +PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" +PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" +PACKAGECONFIG[man] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[mkinitcpio] = "--with-mkinitcpio, --without-mkinitcpio" +PACKAGECONFIG[no-http2] = "--disable-http2, --enable-http2" +PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl" +PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse" +PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux" +PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" +PACKAGECONFIG[soup] = "--with-soup, --without-soup --disable-glibtest, libsoup-2.4" +PACKAGECONFIG[static] = "" +PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_unitdir}/system, --without-libsystemd, systemd" +PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" + +EXTRA_OECONF = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ +" + +# Makefile-libostree.am overrides this to avoid a build problem with clang, +# but that fix breaks cross compilation and we don't need it +EXTRA_OEMAKE = " \ + INTROSPECTION_SCANNER_ENV= \ +" + +EXTRA_OECONF_class-native = " \ + --with-builtin-grub2-mkconfig \ + --enable-wrpseudo-compat \ + --disable-otmpfile \ +" + +# Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the +# do_configure stage so we do depend on it +SYSROOT_DIR = "${STAGING_DIR_TARGET}" +SYSROOT_DIR_class-native = "${STAGING_DIR_NATIVE}" +do_configure[vardeps] += "SYSROOT_DIR" + +do_configure_prepend() { + # this reflects what autogen.sh does, but the OE wrappers for autoreconf + # allow it to work without the other gyrations which exist there + cp ${S}/libglnx/Makefile-libglnx.am ${S}/libglnx/Makefile-libglnx.am.inc + cp ${S}/bsdiff/Makefile-bsdiff.am ${S}/bsdiff/Makefile-bsdiff.am.inc +} + +do_install_append_class-native() { + create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" +} + +PACKAGES += " \ + ${PN}-dracut \ + ${PN}-grub \ + ${PN}-mkinitcpio \ + ${PN}-switchroot \ + ${PN}-trivial-httpd \ +" + +FILES_${PN} = " \ + ${bindir}/ostree \ + ${bindir}/rofiles-fuse \ + ${datadir}/${BPN} \ + ${datadir}/gir-1.0 \ + ${libdir}/${BPN}/ostree-remount \ + ${libdir}/girepository-1.0 \ + ${libdir}/lib*${SOLIBS} \ + ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \ + ${sysconfdir}/ostree/remotes.d \ + ${systemd_unitdir}/system-generators/ostree-system-generator \ + ${systemd_unitdir}/system/ostree-finalize-staged.path \ + ${systemd_unitdir}/system/ostree-finalize-staged.service \ + ${systemd_unitdir}/system/ostree-remount.service \ +" +FILES_${PN}-dracut = " \ + ${sysconfdir}/dracut.conf.d \ + ${libdir}/dracut \ +" +FILES_${PN}-grub = " \ + ${sysconfdir}/grub.d \ + ${libexecdir}/libostree/grub2-15_ostree \ +" +FILES_${PN}-mkinitcpio = " \ + ${sysconfdir}/ostree-mkinitcpio.conf \ + ${libdir}/initcpio \ +" +FILES_${PN}-switchroot = " \ + ${libdir}/ostree/ostree-prepare-root \ + ${systemd_unitdir}/system/ostree-prepare-root.service \ +" +FILES_${PN}-trivial-httpd = " \ + ${libexecdir}/libostree/ostree-trivial-httpd \ +" + +RDEPENDS_${PN} = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'trivial-httpd-cmdline', '${PN}-trivial-httpd', '', d)} \ +" +RDEPENDS_${PN}-dracut = "bash" +RDEPENDS_${PN}-mkinitcpio = "bash" +RDEPENDS_${PN}_class-target = " \ + gnupg \ + ${PN}-switchroot \ +" +RDEPENDS_${PN}-ptest += " \ + attr \ + bash \ + coreutils \ + cpio \ + diffutils \ + findutils \ + grep \ + python3-core \ + python3-multiprocessing \ + python3-pyyaml \ + ${PN}-trivial-httpd \ +" +RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" + +RRECOMMENDS_${PN} += "kernel-module-overlay" +RRECOMMENDS_${PN}-ptest += "strace" + +SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" +SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" + +BBCLASSEXTEND = "native" + +python __anonymous() { + if not bb.data.inherits_class('native', d) and bb.utils.contains('PTEST_ENABLED', '1', 'True', 'False', d): + if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', 'False', d): + raise bb.parse.SkipRecipe('ptest requires meta-python to be present.') + elif not bb.utils.contains_any('PACKAGECONFIG', 'soup curl', 'True', 'False', d): + raise bb.parse.SkipRecipe('ptest requires soup enabled in PACKAGECONFIG.') + elif not oe.utils.any_distro_features(d, "xattr"): + raise bb.parse.SkipRecipe('ptest requires xattr enabled in DISTRO_FEATURES.') +} diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb deleted file mode 100644 index e97b4efb2..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Zstandard - Fast real-time compression algorithm" -DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ -real-time compression scenarios at zlib-level and better compression ratios. \ -It's backed by a very fast entropy stage, provided by Huff0 and FSE library." -HOMEPAGE = "http://www.zstd.net/" -SECTION = "console/utils" - -LICENSE = "BSD-3-Clause & GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ - file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" - -SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" - -SRCREV = "a3d655d2255481333e09ecca9855f1b37f757c52" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" -PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" -PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" - -# See programs/README.md for how to use this -ZSTD_LEGACY_SUPPORT ??= "4" - -do_compile () { - oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} -} - -do_install () { - oe_runmake install 'DESTDIR=${D}' -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb deleted file mode 100644 index dd1b53e39..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "libpeas is a gobject-based plugins engine" -HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" - -DEPENDS = "gnome-common gtk+3 intltool-native" - -inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache distro_features_check - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" - -SRC_URI[archive.md5sum] = "a20dc55c3f88ad06da9491cfd7de7558" -SRC_URI[archive.sha256sum] = "5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962" - -PACKAGECONFIG[python3] = "--enable-python3,--disable-python3,python3-pygobject" - -export GIR_EXTRA_LIBS_PATH = "${B}/libpeas/.libs" - -PACKAGES =+ "${PN}-demo ${PN}-python3" -FILES_${PN}-demo = " \ - ${bindir}/peas-demo \ - ${libdir}/peas-demo \ -" - -RDEPENDS_${PN}-python3 = "python3-pygobject" -FILES_${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb new file mode 100644 index 000000000..6c8e0e0bf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "libpeas is a gobject-based plugins engine" +HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" + +DEPENDS = "gtk+3" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache + +SRC_URI[archive.md5sum] = "bbecf334a7333d0a5d4d655ba38be9b4" +SRC_URI[archive.sha256sum] = "9c3acf7a567cbb4f8bf62b096e013f12c3911cc850c3fa9900cbd5aa4f6ec284" + +PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" + +PACKAGES =+ "${PN}-demo ${PN}-python3" +FILES_${PN}-demo = " \ + ${bindir}/peas-demo \ + ${libdir}/peas-demo \ +" + +RDEPENDS_${PN}-python3 = "python3-pygobject" +FILES_${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb new file mode 100644 index 000000000..1644e38da --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb @@ -0,0 +1,23 @@ +SUMMARY = "VCD (Value Change Dump) file waveform viewer" +DESCRIPTION = "gtkwave is a viewer for VCD (Value Change Dump) files which are usually created by digital circuit simulators. (These files have no connection to video CDs!) " +HOMEPAGE = "http://gtkwave.sourceforge.net/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz" + +SRC_URI[md5sum] = "13da7d4235d4031fde52971830458850" +SRC_URI[sha256sum] = "80bb7cb92db45872209f4ca48fc95a0460e0d89b0fe0c310c836d9b04c77fec7" + +inherit pkgconfig autotools gettext texinfo +DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" +RDEPENDS_${PN} = "tk-lib" + +# depends on gtk+ which has this restriction +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + +EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc" + +FILES_${PN} = "${bindir} ${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb deleted file mode 100644 index 310c41067..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "VCD (Value Change Dump) file waveform viewer" -DESCRIPTION = "gtkwave is a viewer for VCD (Value Change Dump) files which are usually created by digital circuit simulators. (These files have no connection to video CDs!) " -HOMEPAGE = "http://gtkwave.sourceforge.net/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz" - -SRC_URI[md5sum] = "eac3073ef381e0c09da33590296ca37f" -SRC_URI[sha256sum] = "efa6bbbeb3bd54104425a69a2aa0d079bb5c3ecc1c420ba57dcaa1c97c5a22f6" - -inherit pkgconfig autotools gettext texinfo -DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" -RDEPENDS_${PN} = "tk-lib" - -# depends on gtk+ which has this restriction -inherit distro_features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS}" - -FILES_${PN} = "${bindir} ${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb deleted file mode 100644 index 8d23bd5eb..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb +++ /dev/null @@ -1,82 +0,0 @@ -SUMMARY = "An abstraction layer for touchscreen panel events" -DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ -events, as well as a filter stack for the manipulation of those events. \ -Tslib is generally used on embedded devices to provide a common user \ -space interface to touchscreen functionality." -HOMEPAGE = "http://tslib.org/" - -AUTHOR = "Martin Kepplinger " -SECTION = "base" -LICENSE = "LGPLv2+ & GPLv2+" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=fc178bcd425090939a8b634d1d6a9594 \ - file://tests/COPYING;md5=a23a74b3f4caf9616230789d94217acb \ -" - -SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ - file://ts.conf \ - file://tslib.sh \ -" -SRC_URI[md5sum] = "254a022fc8aa89d164840fe8869c2441" -SRC_URI[sha256sum] = "c9a54651337a701a66b074c603c313225579995a7910e519bbc7b1dcdab9a755" - -UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "debounce dejitter iir linear median pthres skip lowpass invert variance input touchkit waveshare" -PACKAGECONFIG[debounce] = "--enable-debounce,--disable-debounce" -PACKAGECONFIG[dejitter] = "--enable-dejitter,--disable-dejitter" -PACKAGECONFIG[iir] = "--enable-iir,--disable-iir" -PACKAGECONFIG[linear] = "--enable-linear,--disable-linear" -PACKAGECONFIG[median] = "--enable-median,--disable-median" -PACKAGECONFIG[pthres] = "--enable-pthres,--disable-pthres" -PACKAGECONFIG[skip] = "--enable-skip,--disable-skip" -PACKAGECONFIG[lowpass] = "--enable-lowpass,--disable-lowpass" -PACKAGECONFIG[invert] = "--enable-invert,--disable-invert" -PACKAGECONFIG[variance] = "--enable-variance,--disable-variance" -PACKAGECONFIG[input] = "--enable-input,--disable-input" -PACKAGECONFIG[tatung] = "--enable-tatung,--disable-tatung" -PACKAGECONFIG[touchkit] = "--enable-touchkit,--disable-touchkit" -PACKAGECONFIG[waveshare] = "--enable-waveshare,--disable-waveshare" -PACKAGECONFIG[ucb1x00] = "--enable-ucb1x00,--disable-ucb1x00" -PACKAGECONFIG[mk712] = "--enable-mk712,--disable-mk712" -PACKAGECONFIG[h3600] = "--enable-h3600,--disable-h3600" -PACKAGECONFIG[dmc] = "--enable-dmc,--disable-dmc" -PACKAGECONFIG[linear-h2200] = "--enable-linear-h2200,--disable-linear-h2200" -PACKAGECONFIG[corgi] = "--enable-corgi,--disable-corgi" -PACKAGECONFIG[collie] = "--enable-collie,--disable-collie" -PACKAGECONFIG[arctic2] = "--enable-arctic2,--disable-arctic2" -PACKAGECONFIG[dmc_dus3000] = "--enable-dmc_dus3000,--disable-dmc_dus3000" -PACKAGECONFIG[cy8mrln-palmpre] = "--enable-cy8mrln-palmpre,--disable-cy8mrln-palmpre" -PACKAGECONFIG[galax] = "--enable-galax,--disable-galax" -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" - -do_install_prepend() { - install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf -} - -do_install_append() { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ -} - -RPROVIDES_tslib-conf = "libts-0.0-conf" - -PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate tslib-uinput" -DEBIAN_NOAUTONAME_tslib-conf = "1" -DEBIAN_NOAUTONAME_tslib-tests = "1" -DEBIAN_NOAUTONAME_tslib-calibrate = "1" -DEBIAN_NOAUTONAME_tslib-uinput = "1" - -RDEPENDS_${PN} = "tslib-conf" -RRECOMMENDS_${PN} = "pointercal" - -FILES_${PN}-dev += "${libdir}/ts/*.la" -FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" -FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" -FILES_tslib-calibrate += "${bindir}/ts_calibrate" -FILES_tslib-uinput += "${bindir}/ts_uinput" - -FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_print_mt \ - ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb new file mode 100644 index 000000000..2bc40d939 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb @@ -0,0 +1,82 @@ +SUMMARY = "An abstraction layer for touchscreen panel events" +DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ +events, as well as a filter stack for the manipulation of those events. \ +Tslib is generally used on embedded devices to provide a common user \ +space interface to touchscreen functionality." +HOMEPAGE = "http://tslib.org/" + +AUTHOR = "Martin Kepplinger " +SECTION = "base" +LICENSE = "LGPLv2+ & GPLv2+" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=fc178bcd425090939a8b634d1d6a9594 \ + file://tests/COPYING;md5=a23a74b3f4caf9616230789d94217acb \ +" + +SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ + file://ts.conf \ + file://tslib.sh \ +" +SRC_URI[md5sum] = "b2b20d3ed520128513f8d3135b42e142" +SRC_URI[sha256sum] = "d2a57b823ea59e53a3b130eef05dfed1190b857854f886eec764e1ca1957cf56" + +UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "debounce dejitter iir linear median pthres skip lowpass invert variance input touchkit waveshare" +PACKAGECONFIG[debounce] = "--enable-debounce,--disable-debounce" +PACKAGECONFIG[dejitter] = "--enable-dejitter,--disable-dejitter" +PACKAGECONFIG[iir] = "--enable-iir,--disable-iir" +PACKAGECONFIG[linear] = "--enable-linear,--disable-linear" +PACKAGECONFIG[median] = "--enable-median,--disable-median" +PACKAGECONFIG[pthres] = "--enable-pthres,--disable-pthres" +PACKAGECONFIG[skip] = "--enable-skip,--disable-skip" +PACKAGECONFIG[lowpass] = "--enable-lowpass,--disable-lowpass" +PACKAGECONFIG[invert] = "--enable-invert,--disable-invert" +PACKAGECONFIG[variance] = "--enable-variance,--disable-variance" +PACKAGECONFIG[input] = "--enable-input,--disable-input" +PACKAGECONFIG[tatung] = "--enable-tatung,--disable-tatung" +PACKAGECONFIG[touchkit] = "--enable-touchkit,--disable-touchkit" +PACKAGECONFIG[waveshare] = "--enable-waveshare,--disable-waveshare" +PACKAGECONFIG[ucb1x00] = "--enable-ucb1x00,--disable-ucb1x00" +PACKAGECONFIG[mk712] = "--enable-mk712,--disable-mk712" +PACKAGECONFIG[h3600] = "--enable-h3600,--disable-h3600" +PACKAGECONFIG[dmc] = "--enable-dmc,--disable-dmc" +PACKAGECONFIG[linear-h2200] = "--enable-linear-h2200,--disable-linear-h2200" +PACKAGECONFIG[corgi] = "--enable-corgi,--disable-corgi" +PACKAGECONFIG[collie] = "--enable-collie,--disable-collie" +PACKAGECONFIG[arctic2] = "--enable-arctic2,--disable-arctic2" +PACKAGECONFIG[dmc_dus3000] = "--enable-dmc_dus3000,--disable-dmc_dus3000" +PACKAGECONFIG[cy8mrln-palmpre] = "--enable-cy8mrln-palmpre,--disable-cy8mrln-palmpre" +PACKAGECONFIG[galax] = "--enable-galax,--disable-galax" +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" + +do_install_prepend() { + install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf +} + +do_install_append() { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ +} + +RPROVIDES_tslib-conf = "libts-0.0-conf" + +PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate tslib-uinput" +DEBIAN_NOAUTONAME_tslib-conf = "1" +DEBIAN_NOAUTONAME_tslib-tests = "1" +DEBIAN_NOAUTONAME_tslib-calibrate = "1" +DEBIAN_NOAUTONAME_tslib-uinput = "1" + +RDEPENDS_${PN} = "tslib-conf" +RRECOMMENDS_${PN} = "pointercal" + +FILES_${PN}-dev += "${libdir}/ts/*.la" +FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" +FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" +FILES_tslib-calibrate += "${bindir}/ts_calibrate" +FILES_tslib-uinput += "${bindir}/ts_uinput" + +FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_print_mt \ + ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev ${bindir}/ts_conf" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb deleted file mode 100644 index 26977bea5..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc -SUMMARY = "A program to compile XKB keyboard description" -DESCRIPTION = "xkbprint generates a printable or encapsulated PostScript \ -description of an XKB keyboard description." - -LIC_FILES_CHKSUM = "file://COPYING;md5=20f28f97555b220fde762bc2a4406a8f" - -DEPENDS += "libxkbfile" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "3c25b40de530112c08bf7d229c5c6a28" -SRC_URI[sha256sum] = "0b3faab8fefad03dfb7e866f634cf859822801de6b5fc6cf5e0a62857ed93e12" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb new file mode 100644 index 000000000..7b6ef9682 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb @@ -0,0 +1,13 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc +SUMMARY = "A program to compile XKB keyboard description" +DESCRIPTION = "xkbprint generates a printable or encapsulated PostScript \ +description of an XKB keyboard description." + +LIC_FILES_CHKSUM = "file://COPYING;md5=20f28f97555b220fde762bc2a4406a8f" + +DEPENDS += "libxkbfile" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "9c34da77363dc3d0f616980da87244bf" +SRC_URI[sha256sum] = "5b58fe834f0822f06d63d283fac404098c6d3f6acce61888b81016f1c41023fa" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_349.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_349.bb deleted file mode 100644 index 137a1655e..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_349.bb +++ /dev/null @@ -1,34 +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" - -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=c7faceb872d90115e7c0ad90e90c390d" - -SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz" - -SRC_URI[md5sum] = "194012229738f74bc44e7c0f5f6bf0c8" -SRC_URI[sha256sum] = "39a6a3d3724f9a0a068f8cc353ab0c82831f0a43abb24470d933af299658475f" -PACKAGECONFIG ?= "" -PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" - -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 -} - -# busybox can supply resize too -inherit update-alternatives - -ALTERNATIVE_${PN} = "resize" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_350.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_350.bb new file mode 100644 index 000000000..d98ce4751 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_350.bb @@ -0,0 +1,34 @@ +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" + +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=c7faceb872d90115e7c0ad90e90c390d" + +SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz" + +SRC_URI[md5sum] = "189b593841189da66bc1cea92df602a5" +SRC_URI[sha256sum] = "aefb59eefd310268080d1a90a447368fb97a9a6737bfecfc3800bf6cc304104d" +PACKAGECONFIG ?= "" +PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" + +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 +} + +# busybox can supply resize too +inherit update-alternatives + +ALTERNATIVE_${PN} = "resize" diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch b/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch new file mode 100644 index 000000000..586ff18c3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch @@ -0,0 +1,22 @@ +Subject: [PATCH] Add build rule for README. + +fix do_configure error: +Makefile.am: required file `./README' not found + +Signed-off-by: Zheng Ruoqin +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index 49574a3..a5a7c2a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,3 +26,4 @@ libtool: $(LIBTOOL_DEPS) + ChangeLog: + git log --stat --decorate=short > $@ + ++README: README.md +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.30.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.30.bb deleted file mode 100644 index 95a41d2f7..000000000 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.30.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Generic USB CCID smart card reader driver" -HOMEPAGE = "https://ccid.apdu.fr/" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = "virtual/libusb0 pcsc-lite" -RDEPENDS_${PN} = "pcsc-lite" - -SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ - file://no-dep-on-libfl.patch \ -" - -SRC_URI[md5sum] = "817abceef715e02cb47617621fe192e0" -SRC_URI[sha256sum] = "ac17087be08880a0cdf99a8a2799a4ef004dc6ffa08b4d9b0ad995f39a53ff7c" - -inherit autotools pkgconfig - -FILES_${PN} += "${libdir}/pcsc/" -FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.31.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.31.bb new file mode 100644 index 000000000..de07bfd23 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.31.bb @@ -0,0 +1,20 @@ +SUMMARY = "Generic USB CCID smart card reader driver" +HOMEPAGE = "https://ccid.apdu.fr/" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "virtual/libusb0 pcsc-lite" +RDEPENDS_${PN} = "pcsc-lite" + +SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ + file://no-dep-on-libfl.patch \ + file://0001-Add-build-rule-for-README.patch \ +" + +SRC_URI[md5sum] = "e4690f3362f95adb2332fd47a2b08212" +SRC_URI[sha256sum] = "6b48d7b6e4390e038d25630f8664fe81618ab00f232d6efbe0e3cc6df28ce8f7" + +inherit autotools pkgconfig + +FILES_${PN} += "${libdir}/pcsc/" +FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb deleted file mode 100644 index 6428958f9..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "A client-side C library implementing the SSH2 protocol" -HOMEPAGE = "http://www.libssh2.org/" -SECTION = "libs" - -DEPENDS = "zlib" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" - -SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz" - -SRC_URI[md5sum] = "616efd99af3d9ef731a26bed6cee9593" -SRC_URI[sha256sum] = "088307d9f6b6c4b8c13f34602e8ff65d21c2dc4d55284dfe15d502c4ee190d67" - -inherit autotools pkgconfig - -EXTRA_OECONF += "\ - --with-libz \ - --with-libz-prefix=${STAGING_LIBDIR} \ - " - -# only one of openssl and gcrypt could be set -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--with-openssl --with-libssl-prefix=${STAGING_LIBDIR},--without-openssl,openssl" -PACKAGECONFIG[gcrypt] = "--with-libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR},--without-libgcrypt,libgcrypt" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb new file mode 100644 index 000000000..25e0af3ff --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "A client-side C library implementing the SSH2 protocol" +HOMEPAGE = "http://www.libssh2.org/" +SECTION = "libs" + +DEPENDS = "zlib" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" + +SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz" + +SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" +SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" + +inherit autotools pkgconfig + +EXTRA_OECONF += "\ + --with-libz \ + --with-libz-prefix=${STAGING_LIBDIR} \ + " + +# only one of openssl and gcrypt could be set +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[openssl] = "--with-crypto=openssl --with-libssl-prefix=${STAGING_LIBDIR}, , openssl" +PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR}, , libgcrypt" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch deleted file mode 100644 index 07cb88ffb..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 4a3e707402032788e09282e0f54fdf82c8a0f8fc Mon Sep 17 00:00:00 2001 -From: Marian Csontos -Date: Mon, 19 Aug 2019 14:54:43 +0200 -Subject: [PATCH] configure: Fix setting of CLDFLAGS default - ---- - configure | 6 +++--- - configure.ac | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc] -Signed-off-by: Peter Kjellerstedt - -diff --git a/configure b/configure -index ff3a59b6b..4c8476502 100755 ---- a/configure -+++ b/configure -@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then : - fi - case "$host_os" in - linux*) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - ELDFLAGS="-Wl,--export-dynamic" - # FIXME Generate list and use --dynamic-list=.dlopen.sym -@@ -3098,7 +3098,7 @@ case "$host_os" in - ;; - darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ELDFLAGS= - CLDWHOLEARCHIVE="-all_load" - CLDNOWHOLEARCHIVE= -@@ -3111,7 +3111,7 @@ case "$host_os" in - BLKDEACTIVATE=no - ;; - *) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ;; - esac - -diff --git a/configure.ac b/configure.ac -index 5da694631..830edb8da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -30,7 +30,7 @@ AC_CANONICAL_TARGET([]) - AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"]) - case "$host_os" in - linux*) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - ELDFLAGS="-Wl,--export-dynamic" - # FIXME Generate list and use --dynamic-list=.dlopen.sym -@@ -51,7 +51,7 @@ case "$host_os" in - ;; - darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ELDFLAGS= - CLDWHOLEARCHIVE="-all_load" - CLDNOWHOLEARCHIVE= -@@ -64,7 +64,7 @@ case "$host_os" in - BLKDEACTIVATE=no - ;; - *) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ;; - esac - --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb deleted file mode 100644 index be558ce1d..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb +++ /dev/null @@ -1,17 +0,0 @@ -# Break circular dependencies, only populate sysroot (header, -# libraries) to other recipe for compiling, recipe lvm2 -# generates package libdevmapper -require lvm2.inc - -DEPENDS += "autoconf-archive-native" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - oe_runmake 'DESTDIR=${D}' -C libdm install -} - -# Do not generate package libdevmapper -PACKAGES = "" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb new file mode 100644 index 000000000..be558ce1d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb @@ -0,0 +1,17 @@ +# Break circular dependencies, only populate sysroot (header, +# libraries) to other recipe for compiling, recipe lvm2 +# generates package libdevmapper +require lvm2.inc + +DEPENDS += "autoconf-archive-native" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install() { + oe_runmake 'DESTDIR=${D}' -C libdm install +} + +# Do not generate package libdevmapper +PACKAGES = "" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 41bf78a3f..01c9df45c 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,9 +15,8 @@ SRC_URI = "git://sourceware.org/git/lvm2.git \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ - file://0001-configure-Fix-setting-of-CLDFLAGS-default.patch \ " -SRCREV = "60bd9e8406ac28a04aa5e8165149f7a5d4f3265a" +SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig systemd license diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch deleted file mode 100644 index a864f1e21..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch +++ /dev/null @@ -1,82 +0,0 @@ -From f8466749dd73f5b0ccf4fc86c8a7585c4140b3f9 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac -Date: Fri, 16 Aug 2019 23:49:59 +0200 -Subject: [PATCH 1/3] activation: add synchronization point - -Resuming of 'error' table entry followed with it's dirrect removal -is now troublesame with latest udev as it may skip processing of -udev rules for already 'dropped' device nodes. - -As we cannot 'synchronize' with udev while we know we have devices -in suspended state - rework 'cleanup' so it collects nodes -for removal into pending_delete list and process the list with -synchronization once we are without any suspended nodes. - -Upstream-Status: Backport -Signed-off-by: Hongxu Jia ---- - WHATS_NEW | 9 +++++++++ - lib/activate/dev_manager.c | 20 ++++++++++++-------- - 2 files changed, 21 insertions(+), 8 deletions(-) - -diff --git a/WHATS_NEW b/WHATS_NEW -index 3a58de5f9..0b48e032b 100644 ---- a/WHATS_NEW -+++ b/WHATS_NEW -@@ -1,3 +1,12 @@ -+Version 2.03.06 - -+================================ -+ Synchronize with udev when dropping snapshot. -+ Add missing device synchronization point before removing pvmove node. -+ Correctly set read_ahead for LVs when pvmove is finished. -+ Remove unsupported OPTIONS+="event_timeout" udev rule from 11-dm-lvm.rules. -+ Prevent creating VGs with PVs with different logical block sizes. -+ Fix metadata writes from corrupting with large physical block size. -+ - Version 2.03.05 - 15th June 2019 - ================================ - Fix command definition for pvchange -a. -diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c -index 981f4674a..7101ffa12 100644 ---- a/lib/activate/dev_manager.c -+++ b/lib/activate/dev_manager.c -@@ -3558,13 +3558,6 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const - const char *name, *uuid; - struct dm_str_list *dl; - -- /* Deactivate any tracked pending delete nodes */ -- dm_list_iterate_items(dl, &dm->pending_delete) { -- log_debug_activation("Deleting tracked UUID %s.", dl->str); -- if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) -- return_0; -- } -- - while ((child = dm_tree_next_child(&handle, root, 0))) { - if (!(name = dm_tree_node_get_name(child))) - continue; -@@ -3585,10 +3578,21 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const - if (non_toplevel_tree_dlid && !strcmp(non_toplevel_tree_dlid, uuid)) - continue; - -- if (!dm_tree_deactivate_children(root, uuid, strlen(uuid))) -+ if (!str_list_add(dm->mem, &dm->pending_delete, uuid)) - return_0; - } - -+ /* Deactivate any tracked pending delete nodes */ -+ if (!dm_list_empty(&dm->pending_delete) && !dm_get_suspended_counter()) { -+ fs_unlock(); -+ dm_tree_set_cookie(root, fs_get_cookie()); -+ dm_list_iterate_items(dl, &dm->pending_delete) { -+ log_debug_activation("Deleting tracked UUID %s.", dl->str); -+ if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) -+ return_0; -+ } -+ } -+ - return 1; - } - --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch deleted file mode 100644 index 5a6db4b88..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e48f8328f9d35f23a24e5b27237e8ebf1dbfa269 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 10 Oct 2019 22:38:00 -0400 -Subject: [PATCH] udev: remove unsupported OPTIONS+="event_timeout" rule - -The OPTIONS+="event_timeout" is Unsupported since systemd/udev version 216, -that is ~5 years ago. - -Since systemd/udev version 243, there's a new message printed if unsupported -OPTIONS value is used: - - Invalid value for OPTIONS key, ignoring: 'event_timeout=180' - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740666 - -Signed-off-by: Peter Rajnoha - -Upstream-Status: Backport [https://github.com/lvmteam/lvm2/commit/125f27ac37bc9b93cc96f64052b9681b3d479ee1] -Signed-off-by: Hongxu Jia ---- - udev/11-dm-lvm.rules.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in -index 91cb991..7c58994 100644 ---- a/udev/11-dm-lvm.rules.in -+++ b/udev/11-dm-lvm.rules.in -@@ -37,8 +37,6 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_DISABLE_OTHE - - ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end" - --OPTIONS+="event_timeout=180" -- - # Do not create symlinks for inappropriate subdevices. - ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable" - ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable" --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch deleted file mode 100644 index e30731593..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch +++ /dev/null @@ -1,124 +0,0 @@ -From d06ad77b47f4dfd25bc3da88c0621ac073ad8ce5 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac -Date: Fri, 23 Aug 2019 13:08:34 +0200 -Subject: [PATCH 2/3] activation: extend handling of pending_delete - -With previous patch 30a98e4d6710a543692d40d11428ae4baea11b7b we -started to put devices one pending_delete list instead -of directly scheduling their removal. - -However we have operations like 'snapshot merge' where we are -resuming device tree in 2 subsequent activation calls - so -1st such call will still have suspened devices and no chance -to push 'remove' ioctl. - -Since we curently cannot easily solve this by doing just single -activation call (which would be preferred solution) - we introduce -a preservation of pending_delete via command structure and -then restore it on next activation call. - -This way we keep to remove devices later - although it might be -not the best moment - this may need futher tunning. - -Also we don't keep the list of operation in 1 trasaction -(unless we do verify udev symlinks) - this could probably -also make it more correct in terms of which 'remove' can -be combined we already running 'resume'. - -Upstream-Status: Backport -Signed-off-by: Hongxu Jia ---- - lib/activate/dev_manager.c | 24 +++++++++++------------- - lib/commands/toolcontext.c | 8 ++++++++ - lib/commands/toolcontext.h | 1 + - 3 files changed, 20 insertions(+), 13 deletions(-) - -diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c -index 7101ffa12..7a7689291 100644 ---- a/lib/activate/dev_manager.c -+++ b/lib/activate/dev_manager.c -@@ -3591,6 +3591,7 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const - if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) - return_0; - } -+ dm_list_init(&dm->pending_delete); - } - - return 1; -@@ -3717,25 +3718,22 @@ out_no_root: - int dev_manager_activate(struct dev_manager *dm, const struct logical_volume *lv, - struct lv_activate_opts *laopts) - { -+ dm_list_splice(&dm->pending_delete, &lv->vg->cmd->pending_delete); -+ - if (!_tree_action(dm, lv, laopts, ACTIVATE)) - return_0; - -- /* -- * When lvm2 resumes a device and shortly after that it removes it, -- * udevd rule will try to blindly call 'dmsetup info' on already removed -- * device leaving the trace inside syslog about failing operation. -- * -- * TODO: It's not completely clear this call here is the best fix. -- * Maybe there can be a better sequence, but ATM we do usually resume -- * error device i.e. on cache deletion and remove it. -- * TODO2: there could be more similar cases! -- */ -- if (!dm_list_empty(&dm->pending_delete)) -- fs_unlock(); -- - if (!_tree_action(dm, lv, laopts, CLEAN)) - return_0; - -+ if (!dm_list_empty(&dm->pending_delete)) { -+ log_debug("Preserving %d device(s) for removal while being suspended.", -+ dm_list_size(&dm->pending_delete)); -+ if (!(str_list_dup(lv->vg->cmd->mem, &lv->vg->cmd->pending_delete, -+ &dm->pending_delete))) -+ return_0; -+ } -+ - return 1; - } - -diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c -index 1e03ea235..0a9355361 100644 ---- a/lib/commands/toolcontext.c -+++ b/lib/commands/toolcontext.c -@@ -1734,6 +1734,8 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, - cmd->current_settings = cmd->default_settings; - - cmd->initialized.config = 1; -+ -+ dm_list_init(&cmd->pending_delete); - out: - if (!cmd->initialized.config) { - destroy_toolcontext(cmd); -@@ -1922,6 +1924,12 @@ int refresh_toolcontext(struct cmd_context *cmd) - - cmd->initialized.config = 1; - -+ if (!dm_list_empty(&cmd->pending_delete)) { -+ log_debug(INTERNAL_ERROR "Unprocessed pending delete for %d devices.", -+ dm_list_size(&cmd->pending_delete)); -+ dm_list_init(&cmd->pending_delete); -+ } -+ - if (cmd->initialized.connections && !init_connections(cmd)) - return_0; - -diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h -index 6e4530c8a..54ddec320 100644 ---- a/lib/commands/toolcontext.h -+++ b/lib/commands/toolcontext.h -@@ -237,6 +237,7 @@ struct cmd_context { - const char *report_list_item_separator; - const char *time_format; - unsigned rand_seed; -+ struct dm_list pending_delete; /* list of LVs for removal */ - }; - - /* --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch deleted file mode 100644 index 953e4ad65..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9143445478871b47ba28b41f5e88d4c415f8205b Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac -Date: Mon, 26 Aug 2019 15:13:55 +0200 -Subject: [PATCH 3/3] snapshot: always activate - -Drop the 'cluster-only' optimization so we do resume ALL device -before we try to wait on cookie before 'removal' operation. - -It's more correct order of operation - alhtough possibly slightly -less efficient - but until we have correct list of operations -'in-progress' we can't do anything better. - -Upstream-Status: Backport -Signed-off-by: Hongxu Jia ---- - lib/metadata/snapshot_manip.c | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c -index 5ccf251c7..65d8dbd13 100644 ---- a/lib/metadata/snapshot_manip.c -+++ b/lib/metadata/snapshot_manip.c -@@ -361,13 +361,7 @@ int vg_remove_snapshot(struct logical_volume *cow) - return 0; - } - -- /* -- * For merged snapshot and clustered VG activate cow LV so -- * the following call to deactivate_lv() can clean-up table -- * entries. For this clustered lock need to be held. -- */ -- if (vg_is_clustered(cow->vg) && -- merging_snapshot && !activate_lv(cow->vg->cmd, cow)) { -+ if (merging_snapshot && !activate_lv(cow->vg->cmd, cow)) { - log_error("Failed to activate %s.", cow->name); - return 0; - } --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb deleted file mode 100644 index b80f1fd4b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb +++ /dev/null @@ -1,92 +0,0 @@ -require lvm2.inc - -SRC_URI += " \ - file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ - file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ - file://0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch \ - file://0001-activation-add-synchronization-point.patch \ - file://0002-activation-extend-handling-of-pending_delete.patch \ - file://0003-snapshot-always-activate.patch \ - " - -DEPENDS += "autoconf-archive-native" - -inherit multilib_script - -MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" - -CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" - -do_install_append() { - # Install machine specific configuration file - install -d ${D}${sysconfdir}/lvm - install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf - sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - oe_runmake 'DESTDIR=${D}' install install_systemd_units - sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service - else - oe_runmake 'DESTDIR=${D}' install install_initscripts - mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d - rm -rf ${D}${sysconfdir}/rc.d - fi -} - -PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ - blk-availability.service lvm2-pvscan@.service" -SYSTEMD_AUTO_ENABLE = "disable" - -TARGET_CC_ARCH += "${LDFLAGS}" - -EXTRA_OECONF_append_class-nativesdk = " --with-confdir=${sysconfdir}" - -DEPENDS += "util-linux" -LVM2_PACKAGECONFIG_append_class-target = " \ - udev \ -" -PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" - -PACKAGES =+ "libdevmapper" -FILES_libdevmapper = " \ - ${libdir}/libdevmapper.so.* \ - ${sbindir}/dmsetup \ - ${sbindir}/dmstats \ -" - -FILES_${PN} += "${libdir}/device-mapper/*.so" -FILES_${PN}-scripts = " \ - ${sbindir}/blkdeactivate \ - ${sbindir}/fsadm \ - ${sbindir}/lvmconf \ - ${sbindir}/lvmdump \ -" -# Specified explicitly for the udev rules, just in case that it does not get picked -# up automatically: -FILES_${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" -RDEPENDS_${PN}-udevrules = "libdevmapper" -RDEPENDS_${PN}_append_class-target = " libdevmapper" -RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper" - -RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ - bash \ - util-linux-lsblk \ - util-linux-findmnt \ - coreutils \ -" -RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" - -CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" - -SYSROOT_PREPROCESS_FUNCS_append = " remove_libdevmapper_sysroot_preprocess" -remove_libdevmapper_sysroot_preprocess() { - rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ - ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ - ${SYSROOT_DESTDIR}${sbindir}/dmstats \ - ${SYSROOT_DESTDIR}${includedir}/libdevmapper.h \ - ${SYSROOT_DESTDIR}${libdir}/pkgconfig/devmapper.pc -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb new file mode 100644 index 000000000..e2b551bbc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb @@ -0,0 +1,88 @@ +require lvm2.inc + +SRC_URI += " \ + file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ + file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ + " + +DEPENDS += "autoconf-archive-native" + +inherit multilib_script + +MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" + +CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" + +do_install_append() { + # Install machine specific configuration file + install -d ${D}${sysconfdir}/lvm + install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf + sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + oe_runmake 'DESTDIR=${D}' install install_systemd_units + sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service + else + oe_runmake 'DESTDIR=${D}' install install_initscripts + mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d + rm -rf ${D}${sysconfdir}/rc.d + fi +} + +PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ + blk-availability.service lvm2-pvscan@.service" +SYSTEMD_AUTO_ENABLE = "disable" + +TARGET_CC_ARCH += "${LDFLAGS}" + +EXTRA_OECONF_append_class-nativesdk = " --with-confdir=${sysconfdir}" + +DEPENDS += "util-linux" +LVM2_PACKAGECONFIG_append_class-target = " \ + udev \ +" +PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" + +PACKAGES =+ "libdevmapper" +FILES_libdevmapper = " \ + ${libdir}/libdevmapper.so.* \ + ${sbindir}/dmsetup \ + ${sbindir}/dmstats \ +" + +FILES_${PN} += "${libdir}/device-mapper/*.so" +FILES_${PN}-scripts = " \ + ${sbindir}/blkdeactivate \ + ${sbindir}/fsadm \ + ${sbindir}/lvmconf \ + ${sbindir}/lvmdump \ +" +# Specified explicitly for the udev rules, just in case that it does not get picked +# up automatically: +FILES_${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" +RDEPENDS_${PN}-udevrules = "libdevmapper" +RDEPENDS_${PN}_append_class-target = " libdevmapper" +RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper" + +RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ + bash \ + util-linux-lsblk \ + util-linux-findmnt \ + coreutils \ +" +RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" + +CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" + +SYSROOT_PREPROCESS_FUNCS_append = " remove_libdevmapper_sysroot_preprocess" +remove_libdevmapper_sysroot_preprocess() { + rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ + ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ + ${SYSROOT_DESTDIR}${sbindir}/dmstats \ + ${SYSROOT_DESTDIR}${includedir}/libdevmapper.h \ + ${SYSROOT_DESTDIR}${libdir}/pkgconfig/devmapper.pc +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb index 888c729b3..007b3944a 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git \ file://makefile-remove-ldflags.patch \ " -SRCREV = "74bffd8b0aa27051aeaa1983a7b23975ca8d8726" -PV = "20171030+git${SRCPV}" +SRCREV = "7643baf6c3919b3d727e6ba6c2e545dc6a653307" +PV = "20190917+git${SRCPV}" RDEPENDS_${PN} = "mcelog mce-inject dialog bash" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_164.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_164.bb deleted file mode 100644 index af309d1c6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_164.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." -DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ -and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ -and should run on all Linux systems that need error handling." -HOMEPAGE = "http://mcelog.org/" -SECTION = "System Environment/Base" - -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ - file://run-ptest \ -" - -SRCREV = "e53631f84a181be371c08e0b961180bff77fd2ab" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep ptest - -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' - -do_install_append() { - install -d ${D}${sysconfdir}/cron.hourly - install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ - sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH} - cp -r ${S}/tests ${S}/input ${D}${PTEST_PATH} - sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test -} - -RDEPENDS_${PN}-ptest += "make bash mce-inject" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_165.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_165.bb new file mode 100644 index 000000000..8af919fea --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_165.bb @@ -0,0 +1,35 @@ +SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." +DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ +and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ +and should run on all Linux systems that need error handling." +HOMEPAGE = "http://mcelog.org/" +SECTION = "System Environment/Base" + +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ + file://run-ptest \ +" + +SRCREV = "6b6a8a571b5b0967cadbee770bf444f4e8634cca" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep ptest + +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' + +do_install_append() { + install -d ${D}${sysconfdir}/cron.hourly + install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ + sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH} + cp -r ${S}/tests ${S}/input ${D}${PTEST_PATH} + sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test +} + +RDEPENDS_${PN}-ptest += "make bash mce-inject" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch index 0fc40be4a..b5bfcd025 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch @@ -1,6 +1,3 @@ -From caeccb7bec45f65bc89efa8195b3853368328361 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 17 Sep 2018 12:49:36 +0800 Subject: [PATCH] syslog-ng: fix segment fault during service start on arm64 service start failed since segment fault on arch arm64, @@ -17,12 +14,15 @@ https://github.com/buytenh/ivykis/issues/15 Upstream-Status: Pending Signed-off-by: Changqing Li + +Update for 3.24.1. +Signed-off-by: Zheng Ruoqin --- - lib/ivykis/src/pthr.h | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) + lib/ivykis/src/pthr.h | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h -index a41eaf3..72c5190 100644 +index 29e4be7..5d29096 100644 --- a/lib/ivykis/src/pthr.h +++ b/lib/ivykis/src/pthr.h @@ -24,6 +24,16 @@ @@ -47,12 +47,12 @@ index a41eaf3..72c5190 100644 #ifdef HAVE_PRAGMA_WEAK -/* -- * On Linux, pthread_atfork() is defined in libpthread_nonshared.a, -- * a static library, and we want to avoid "#pragma weak" for that -- * symbol because that causes it to be undefined even if you link -- * libpthread_nonshared.a in explicitly. +- * On Linux, pthread_atfork() is defined in libc_nonshared.a (for +- * glibc >= 2.28) or libpthread_nonshared.a (for glibc <= 2.27), and +- * we want to avoid "#pragma weak" for that symbol because that causes +- * it to be undefined even if you link lib*_nonshared.a in explicitly. - */ --#ifndef HAVE_LIBPTHREAD_NONSHARED +-#if !defined(HAVE_LIBC_NONSHARED) && !defined(HAVE_LIBPTHREAD_NONSHARED) -#pragma weak pthread_atfork -#endif - @@ -60,16 +60,15 @@ index a41eaf3..72c5190 100644 #pragma weak pthread_create #pragma weak pthread_detach #pragma weak pthread_getspecific -@@ -73,8 +74,7 @@ static inline int +@@ -73,7 +74,7 @@ static inline int pthr_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) { if (pthreads_available()) - return pthread_atfork(prepare, parent, child); -- + return __register_atfork(prepare, parent, child, __dso_handle); + return ENOSYS; } - -- 2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch index 553f4a517..4ad0afa95 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch @@ -6,25 +6,28 @@ This would avoid a implicit auto-detecting result. Signed-off-by: Ming Liu Signed-off-by: Jackie Huang + +Update for 3.24.1. +Signed-off-by: Zheng Ruoqin --- - configure.ac | 27 +++++++++++++++++---------- - 1 files changed, 17 insertions(+), 10 deletions(-) + configure.ac | 28 ++++++++++++++++------------ + 1 file changed, 16 insertions(+), 12 deletions(-) -Index: syslog-ng-3.8.1/configure.ac -=================================================================== ---- syslog-ng-3.8.1.orig/configure.ac -+++ syslog-ng-3.8.1/configure.ac -@@ -104,6 +104,9 @@ AC_CONFIG_HEADERS(config.h) +diff --git a/configure.ac b/configure.ac +index 00eb566..e7d5ac1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -143,6 +143,9 @@ AC_CONFIG_HEADERS(config.h) dnl *************************************************************************** dnl Arguments -+AC_ARG_ENABLE(libnet, ++AC_ARG_ENABLE(libnet, + [ --enable-libnet Enable libnet support.],, enable_libnet="no") + AC_ARG_WITH(libnet, [ --with-libnet=path use path to libnet-config script], , -@@ -893,22 +896,26 @@ dnl ************************************ +@@ -1047,19 +1050,20 @@ dnl *************************************************************************** dnl libnet headers/libraries dnl *************************************************************************** AC_MSG_CHECKING(for LIBNET) @@ -39,7 +42,14 @@ Index: syslog-ng-3.8.1/configure.ac + else + LIBNET_CONFIG="$with_libnet/libnet-config" + fi -+ + +-if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then +- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" +- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" +- AC_MSG_RESULT(yes) +-dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build +-dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till +- LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE" + if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then + LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" + LIBNET_LIBS="`$LIBNET_CONFIG --libs`" @@ -48,16 +58,8 @@ Index: syslog-ng-3.8.1/configure.ac + AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.]) + fi --if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -- AC_MSG_RESULT(yes) else LIBNET_LIBS= - AC_MSG_RESULT(no) - fi - -- - if test "x$enable_spoof_source" = "xauto"; then - AC_MSG_CHECKING(whether to enable spoof source support) - if test "x$LIBNET_LIBS" != "x"; then +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 39c3f59ce..0e1d09492 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -1,16 +1,17 @@ -From 0be9c08dd3f825e92fa02d4a08d8aff743109e61 Mon Sep 17 00:00:00 2001 -From: Li xin -Date: Wed, 17 Jun 2015 14:46:30 +0900 -Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start +Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start successfully,so modify it. Upstream-Status: pending Signed-off-by: Li Xin Updated-by: Andrej Valek + +Update for 3.24.1 +Signed-off-by: Zheng Ruoqin --- - contrib/systemd/syslog-ng.service | 5 ++--- - 1 file changed, 2 insertion(+), 3 deletions(-) + contrib/systemd/syslog-ng@.service | 4 ++-- + contrib/systemd/syslog-ng@default | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/systemd/syslog-ng@.service b/contrib/systemd/syslog-ng@.service index a28640e..93aec94 100644 @@ -28,19 +29,18 @@ index a28640e..93aec94 100644 StandardError=journal Restart=on-failure diff --git a/contrib/systemd/syslog-ng@default b/contrib/systemd/syslog-ng@default -index 02da288..3a8215d 100644 +index 0ccc2b9..7f08c0e 100644 --- a/contrib/systemd/syslog-ng@default +++ b/contrib/systemd/syslog-ng@default @@ -1,5 +1,5 @@ --CONFIG_FILE=/etc/syslog-ng.conf + CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf -PERSIST_FILE=/var/lib/syslog-ng/syslog-ng.persist --CONTROL_FILE=/var/lib/syslog-ng/syslog-ng.ctl +-CONTROL_FILE=/var/run/syslog-ng.ctl -PID_FILE=/var/run/syslog-ng.pid -+CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist +CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid OTHER_OPTIONS="--enable-core" - -- -1.8.4.2 +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 4c22d4b0f..3aba4473d 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -92,7 +92,6 @@ do_install_append() { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service - install -m 0644 ${S}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service install -m 0644 ${S}/contrib/systemd/${BPN}@default ${D}${sysconfdir}/default/${BPN}@default sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb deleted file mode 100644 index 852343c23..000000000 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -require syslog-ng.inc - -# We only want to add stuff we need to the defaults provided in syslog-ng.inc. -# -SRC_URI += " \ - file://fix-config-libnet.patch \ - file://fix-invalid-ownership.patch \ - file://syslog-ng.service-the-syslog-ng-service.patch \ - file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \ - file://syslog-ng-tmp.conf \ - " - -SRC_URI[md5sum] = "aa79bc13d9fd925aa5fb9516e87aacd3" -SRC_URI[sha256sum] = "5cf931a9d7bead0e6d9a2c65eee8f6005a005878f59aa280f3c4294257ed5178" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb new file mode 100644 index 000000000..01ed76765 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb @@ -0,0 +1,14 @@ +require syslog-ng.inc + +# We only want to add stuff we need to the defaults provided in syslog-ng.inc. +# +SRC_URI += " \ + file://fix-config-libnet.patch \ + file://fix-invalid-ownership.patch \ + file://syslog-ng.service-the-syslog-ng-service.patch \ + file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \ + file://syslog-ng-tmp.conf \ + " + +SRC_URI[md5sum] = "ef9de066793f7358af7312b964ac0450" +SRC_URI[sha256sum] = "d4d0a0357b452be96b69d6f741129275530d8f0451e35adc408ad5635059fa3d" diff --git a/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb b/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb index c9d87e36d..98f2cacf1 100644 --- a/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb +++ b/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb @@ -17,3 +17,5 @@ EXTRA_OECONF = "--enable-memtrace --enable-automated --enable-basic --enable-con FILES_${PN}-dev += "${datadir}/CUnit" FILES_${PN}-doc += "${docdir}" + +BBCLASSEXTEND = "native" -- cgit v1.2.3