From c87764fefff10735006a31fab72d76c243a3eb40 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 27 Jun 2020 00:16:32 -0500 Subject: meta-openembedded: subtree update:fe77eaab8f..629696b64b MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alex Kiernan (4): zstd: Upgrade 1.4.4 -> 1.4.5 libxmlb: Add recipe libjcat: Add recipe gcab: Add recipe Andreas Müller (14): libdvdcss: upgrade 1.3.0 -> 1.4.2 vlc: upgrade 3.0.10 -> 3.0.11 netdata: upgrade 1.17.0 -> 1.22.1 libsass: upgrade 3.6.3 -> 3.6.4 / rename recipe gnome-desktop3: upgrade 3.36.2 -> 3.36.3.1 evince: upgrade 3.36.3 -> 3.36.5 gnome-control-center: upgrade 3.36.2 -> 3.36.3 redis: upgrade 5.0.9 -> 6.0.4 squid: upgrade 4.9 -> 4.12 libgit2: upgrade 1.0.0 -> 1.0.1 openh264: upgrade 2.1.0 -> 2.1.1 tcpreplay: upgrade 4.3.2 -> 4.3.3 asio: upgrade 1.12.2 -> 1.16.1 Revert "packagegroup-xfce-base: add RDEPEND packagegroup-core-x11" Anuj Mittal (2): opencl: move headers and loader recipe to common directory opencl-clhpp: add recipe Armin Kuster (9): python3-configobj: Add package python3-croniter: add package python3-flask-versioned: Add package python3-huey: Add package python3-sqlsoup: add package python3-smpplib: add package python3-pyrad: add package libuv: pkg now in core, remove ntp: update 4.2.8p15 Christian Eggers (1): linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t Konrad Weihmann (1): libtalloc: fix upstream url Leon Anavi (82): python3-packaging: Consolidate in a single file python3-packaging: Upgrade 20.3 -> 20.4 python3-parse-type: Consolidate in a single file python3-parse-type: Upgrade 0.4.2 -> 0.5.2 python3-javaobj-py3: Consolidate in a single file python3-jsonpointer: Consolidate in a single file python3-kconfiglib: Consolidate in a single file python3-twisted: Consolidate in a single file python3-twisted: Upgrade 19.10.0 -> 20.3.0 protobuf: Upgrade 3.11.4 -> 3.12.3 xscreensaver: Upgrade 5.39 -> 5.44 python3-iso8601: Consolidate in a single file python3-isodate: Consolidate in a single file python3-incremental: Consolidate in a single file python3-itsdangerous: Consolidate in a single file python3-importlib-metadata: Consolidate in a single file python3-importlib-metadata: Upgrade 1.5.2 -> 1.6.1 python3-can: Upgrade 3.3.2 -> 3.3.3 python3-psutil: Consolidate in a single file python3-protobuf: Consolidate in a single file python3-protobuf: Upgrade 3.11.3 -> 3.12.2 python-kconfiglib.inc: Remove sip3: Consolidate in a single file sip3: Upgrade 4.19.19 -> 4.19.23 python3-pexpect: Consolidate in a single file python3-periphery: Consolidate in a single file python3-periphery: Upgrade 2.0.1 -> 2.1.0 python3-pocketsphinx: Inherit features_check python3-parse: Consolidate in a single file python3-passlib: Consolidate in a single file python3-pathlib2: Consolidate in a single file python3-pretend: Consolidate in a single file python3-prompt-toolkit: Consolidate in a single file python3-prompt-toolkit: Upgrade 2.0.10 -> 3.0.5 python3-ptyprocess: Consolidate in a single file python3-booleanpy: Upgrade 3.7 to 3.8 python3-toml: Upgrade 0.10.0 -> 0.10.1 python3-msgpack: Upgrade 0.6.2 -> 1.0.0 lirc: Add python3 to the run-time dependencies python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17 python3-sh: Upgrade 1.12.14 -> 1.13.1 python3-certifi: Upgrade 2019.11.28 -> 2020.6.20 python3-setuptools-scm: Upgrade 3.5.0 -> 4.1.2 python3-more-itertools: Upgrade 8.3.0 -> 8.4.0 python3-configparser: Upgrade 4.0.2 -> 5.0.0 python3-pytest-timeout: Upgrade 1.3.4 -> 1.4.1 python3-semver: Upgrade 2.8.1 -> 2.10.2 python3-spidev: Upgrade 3.4 -> 3.5 python3-pint: Upgrade 0.12 -> 0.13 python3-xxhash: Upgrade 1.4.3 -> 1.4.4 python3-networkx: Consolidate in a single file python3-netifaces: Consolidate in a single file python3-netaddr: Consolidate in a single file python3-netaddr: Upgrade 0.7.19 -> 0.7.20 python3-ndg-httpsclient: Consolidate in a single file python3-lazy-object-proxy: Consolidate in a single file python3-lazy-object-proxy: Upgrade 1.4.3 -> 1.5.0 python3-license-expression: Consolidate in a single file python3-license-expression: Upgrade 1.0 -> 1.2 python3-wcwidth: Upgrade 0.2.4 -> 0.2.5 python3-ordered-set: Upgrade 3.1.1 -> 4.0.2 python3-cheetah: Upgrade 3.2.4 -> 3.2.5 python3-cmd2: Upgrade 0.9.23 -> 1.1.0 python3-pyrsistent: Upgrade 0.15.7 -> 0.16.0 python3-requests-file: Upgrade 1.4.3 -> 1.5.1 python3-msk: Upgrade 0.3.13 -> 0.3.15 python3-pyperf: Upgrade 1.7.1 -> 2.0.0 python3-padatious: Upgrade 0.4.7 -> 0.4.8 python3-croniter: Upgrade 0.3.33 -> 0.3.34 python3-lrparsing: Consolidate in a single file python3-pytun: Consolidate in a single file python3-jsonpatch: Upgrade 1.25 -> 1.26 python3-socketio: Upgrade 4.5.1 -> 4.6.0 python3-twine: Upgrade 3.1.1 -> 3.2.0 python3-pyexpect: Upgrade 1.0.19 -> 1.0.20 python3-pyjks: Upgrade 19.0.0 -> 20.0.0 python3-ruamel-yaml: Upgrade 0.16.5 0> 0.16.10 python3-pandas: Upgrade 1.0.3 -> 1.0.5 python3-matplotlib: Upgrade 3.2.1 -> 3.2.2 python3-coverage: Upgrade 5.0.2 -> 5.1 python3-coloredlogs: Upgrade 10.0 -> 14.0 python3-astroid: Upgrade 2.3.3 -> 2.4.2 Liwei Song (1): pm-graph: add flags support for RT kernel Madhavan Krishnan (1): libcamera: Bumped to latest source revision Martin Jansa (1): ace: fix installation paths when usrmerge is used Mingli Yu (1): opencv: make ts module external Ovidiu Panait (1): freediameter: upgrade 1.3.2 -> 1.4.0 Paul Eggleton (1): protobuf-c: disable parallelism to avoid race condition Peace Lee (1): Update commit for version 3.9.7 Pierre-Jean Texier (3): rsnapshot: upgrade 1.4.2 -> 1.4.3 libzip: upgrade 1.7.0 -> 1.7.1 fuse3: upgrade 3.9.1 -> 3.9.2 Ryan Rowe (3): python3-typeguard: Upgrade 2.7.1 -> 2.9.1 add python3-dynamic-dispatch add python3-argexec Sakib Sajal (1): python3-requests-toolbelt: add recipe for v0.9.1 Trevor Gamblin (1): python3-django: upgrade 2.2.7 -> 2.2.13 Wang Mingyu (4): openipmi: upgrade 2.0.28 -> 2.0.29 twm: upgrade 1.0.10 -> 1.0.11 python3-wtforms: upgrade 2.2.1 -> 2.3.1 python3-py: upgrade 1.8.1 -> 1.8.2 Zang Ruochen (6): python3-geojson: Enable ptest python3-intervals: Enable ptest python3-ipy: Enable ptest python3-iso3166: Enable ptest python-html2text: Enable ptest python3-gunicorn: Enable ptest Zheng Ruoqin (3): python3-cachetools: Enable ptest python3-dnspython: Enable ptest python3-dominate: Enable ptest lumag (1): lmsensors: do not depend on lmsensors-isatools on non-x86 Signed-off-by: Andrew Geissler Change-Id: I66b8b206b1f74dab49ef7c266e145127ba27869b --- .../recipes-support/fuse/fuse3_3.9.1.bb | 48 --- .../recipes-support/fuse/fuse3_3.9.2.bb | 47 +++ .../recipes-gnome/evince/evince_3.36.3.bb | 55 ---- .../recipes-gnome/evince/evince_3.36.5.bb | 55 ++++ .../gnome-control-center_3.36.2.bb | 55 ---- .../gnome-control-center_3.36.3.bb | 55 ++++ .../gnome-desktop/gnome-desktop3_3.36.2.bb | 36 --- .../gnome-desktop/gnome-desktop3_3.36.3.1.bb | 38 +++ .../recipes-multimedia/libcamera/libcamera.bb | 12 +- .../recipes-multimedia/openh264/openh264_2.1.0.bb | 49 ---- .../recipes-multimedia/openh264/openh264_2.1.1.bb | 49 ++++ .../recipes-multimedia/vlc/libdvdcss_1.3.0.bb | 12 - .../recipes-multimedia/vlc/libdvdcss_1.4.2.bb | 13 + .../recipes-multimedia/vlc/vlc_3.0.10.bb | 134 --------- .../recipes-multimedia/vlc/vlc_3.0.11.bb | 134 +++++++++ .../recipes-daemons/squid/squid_4.12.bb | 117 ++++++++ .../recipes-daemons/squid/squid_4.9.bb | 117 -------- .../freediameter/freediameter_1.3.2.bb | 139 --------- .../freediameter/freediameter_1.4.0.bb | 138 +++++++++ .../recipes-support/libtalloc/libtalloc_2.3.0.bb | 2 +- .../recipes-support/ntp/ntp_4.2.8p14.bb | 178 ----------- .../recipes-support/ntp/ntp_4.2.8p15.bb | 177 +++++++++++ .../recipes-support/openipmi/openipmi_2.0.28.bb | 112 ------- .../recipes-support/openipmi/openipmi_2.0.29.bb | 112 +++++++ .../recipes-support/tcpreplay/tcpreplay_4.3.2.bb | 21 -- .../recipes-support/tcpreplay/tcpreplay_4.3.3.bb | 21 ++ .../recipes-connectivity/lirc/lirc_0.10.1.bb | 2 +- .../recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | 2 +- .../meta-oe/recipes-connectivity/ace/ace_6.5.8.bb | 2 + .../ace/files/ace_config.patch | 3 +- .../recipes-connectivity/libuv/libuv_1.38.0.bb | 19 -- .../linuxptp/linuxptp/time_t_maybe_long_long.patch | 135 +++++++++ .../recipes-connectivity/linuxptp/linuxptp_2.0.bb | 1 + .../meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb | 19 -- .../opencl-headers/opencl-headers_git.bb | 17 -- .../opencl-icd-loader/opencl-icd-loader_git.bb | 45 --- .../meta-oe/recipes-core/opencl/ocl-icd_git.bb | 19 ++ .../recipes-core/opencl/opencl-clhpp_git.bb | 23 ++ .../recipes-core/opencl/opencl-headers_git.bb | 17 ++ .../recipes-core/opencl/opencl-icd-loader_git.bb | 45 +++ .../recipes-devtools/guider/guider_3.9.7.bb | 2 +- .../recipes-devtools/protobuf/protobuf-c_1.3.3.bb | 5 + ...kefile-respect-CXX-LDFLAGS-variables-fix-.patch | 12 +- .../recipes-devtools/protobuf/protobuf_3.11.4.bb | 90 ------ .../recipes-devtools/protobuf/protobuf_3.12.3.bb | 90 ++++++ .../meta-oe/recipes-devtools/sip/sip.inc | 36 --- .../meta-oe/recipes-devtools/sip/sip3_4.19.19.bb | 11 - .../meta-oe/recipes-devtools/sip/sip3_4.19.23.bb | 47 +++ .../recipes-extended/libzip/libzip_1.7.0.bb | 18 -- .../recipes-extended/libzip/libzip_1.7.1.bb | 18 ++ .../hiredis-use-default-CC-if-it-is-set.patch | 21 +- .../meta-oe/recipes-extended/redis/redis_5.0.9.bb | 66 ----- .../meta-oe/recipes-extended/redis/redis_6.0.4.bb | 66 +++++ .../zstd/0001-Fix-legacy-build-after-2103.patch | 27 ++ .../meta-oe/recipes-extended/zstd/zstd_1.4.4.bb | 35 --- .../meta-oe/recipes-extended/zstd/zstd_1.4.5.bb | 37 +++ .../meta-oe/recipes-gnome/gcab/gcab/run-ptest | 3 + .../meta-oe/recipes-gnome/gcab/gcab_1.4.bb | 24 ++ .../recipes-gnome/libjcat/libjcat/run-ptest | 3 + .../meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb | 34 +++ .../recipes-gnome/libxmlb/libxmlb/run-ptest | 3 + .../recipes-gnome/libxmlb/libxmlb_0.1.15.bb | 19 ++ .../recipes-graphics/xorg-app/twm_1.0.10.bb | 15 - .../recipes-graphics/xorg-app/twm_1.0.11.bb | 16 + .../xscreensaver/files/fix-buildscripts.patch | 90 +++--- .../xscreensaver/files/tweak-app-defaults.patch | 30 +- .../xscreensaver/xscreensaver_5.39.bb | 33 --- .../xscreensaver/xscreensaver_5.44.bb | 36 +++ ...ph-add-support-for-RT-kernel-ftrace-flags.patch | 42 +++ .../recipes-kernel/pm-graph/pm-graph_5.5.bb | 1 + .../meta-oe/recipes-support/asio/asio_1.12.2.bb | 26 -- .../meta-oe/recipes-support/asio/asio_1.16.1.bb | 27 ++ .../recipes-support/libgit2/libgit2_1.0.0.bb | 22 -- .../recipes-support/libgit2/libgit2_1.0.1.bb | 22 ++ .../opencv/0001-Make-ts-module-external.patch | 42 +++ ...-ts-create-share-library-intead-of-static.patch | 24 -- .../meta-oe/recipes-support/opencv/opencv_4.3.0.bb | 2 +- .../recipes-support/rsnapshot/rsnapshot_git.bb | 4 +- .../meta-oe/recipes-support/sass/libsass_3.6.3.bb | 13 - .../meta-oe/recipes-support/sass/libsass_git.bb | 14 + .../python-pytun/python-pytun.inc | 10 - .../python-pytun/python3-pytun_2.3.0.bb | 2 - .../python3-pytun/python3-pytun_2.3.0.bb | 10 + .../python/python-importlib-metadata.inc | 14 - .../recipes-devtools/python/python-incremental.inc | 20 -- .../recipes-devtools/python/python-intervals.inc | 15 - .../recipes-devtools/python/python-ipy.inc | 19 -- .../recipes-devtools/python/python-iso8601.inc | 14 - .../recipes-devtools/python/python-isodate.inc | 14 - .../python/python-itsdangerous.inc | 14 - .../recipes-devtools/python/python-javaobj-py3.inc | 15 - .../recipes-devtools/python/python-jsonpointer.inc | 27 -- .../recipes-devtools/python/python-kconfiglib.inc | 8 - .../python/python-lazy-object-proxy.inc | 12 - .../python/python-license-expression.inc | 29 -- .../recipes-devtools/python/python-lrparsing.inc | 16 - .../python/python-ndg-httpsclient.inc | 25 -- .../recipes-devtools/python/python-netaddr.inc | 13 - .../recipes-devtools/python/python-netifaces.inc | 10 - .../recipes-devtools/python/python-networkx.inc | 8 - .../recipes-devtools/python/python-packaging.inc | 10 - .../recipes-devtools/python/python-parse-type.inc | 25 -- .../recipes-devtools/python/python-parse.inc | 26 -- .../recipes-devtools/python/python-passlib.inc | 19 -- .../recipes-devtools/python/python-pathlib2.inc | 11 - .../recipes-devtools/python/python-periphery.inc | 9 - .../recipes-devtools/python/python-pexpect.inc | 23 -- .../recipes-devtools/python/python-pretend.inc | 9 - .../python/python-prompt-toolkit.inc | 18 -- .../recipes-devtools/python/python-protobuf.inc | 32 -- .../recipes-devtools/python/python-psutil.inc | 22 -- .../recipes-devtools/python/python-ptyprocess.inc | 41 --- .../recipes-devtools/python/python-twisted.inc | 266 ----------------- ...eactor-import-in-test_runner-to-be-from-t.patch | 38 --- .../python/python3-argexec_1.0.2.bb | 17 ++ .../python/python3-astroid_2.3.3.bb | 33 --- .../python/python3-astroid_2.4.2.bb | 33 +++ .../python/python3-booleanpy_3.7.bb | 14 - .../python/python3-booleanpy_3.8.bb | 14 + .../python/python3-cachetools/run-ptest | 3 + .../python/python3-cachetools_4.1.0.bb | 15 +- .../recipes-devtools/python/python3-can_3.3.2.bb | 26 -- .../recipes-devtools/python/python3-can_3.3.3.bb | 26 ++ .../python/python3-certifi_2019.11.28.bb | 15 - .../python/python3-certifi_2020.6.20.bb | 15 + .../python/python3-cheetah_3.2.4.bb | 14 - .../python/python3-cheetah_3.2.5.bb | 15 + .../recipes-devtools/python/python3-cmd2_0.9.23.bb | 20 -- .../recipes-devtools/python/python3-cmd2_1.1.0.bb | 20 ++ .../python/python3-coloredlogs_10.0.bb | 24 -- .../python/python3-coloredlogs_14.0.bb | 24 ++ .../python/python3-configobj_5.0.6.bb | 9 + .../python/python3-configparser_4.0.2.bb | 14 - .../python/python3-configparser_5.0.0.bb | 14 + .../python/python3-coverage_5.0.2.bb | 10 - .../python/python3-coverage_5.1.bb | 10 + .../python/python3-croniter_0.3.34.bb | 12 + .../python/python3-django_2.2.13.bb | 9 + .../python/python3-django_2.2.7.bb | 9 - .../python/python3-dnspython/run-ptest | 3 + .../python/python3-dnspython_1.16.0.bb | 15 +- .../python/python3-dominate/run-ptest | 3 + .../python/python3-dominate_2.5.1.bb | 15 +- .../python/python3-dynamic-dispatch_1.0.2.bb | 18 ++ .../python3-flask-versioned_0.9.4-20101221.bb | 9 + .../python/python3-geojson/run-ptest | 3 + .../python/python3-geojson_2.5.0.bb | 15 +- .../python/python3-gunicorn/run-ptest | 3 + .../python/python3-gunicorn_20.0.4.bb | 15 +- .../python/python3-html2text/run-ptest | 3 + .../python/python3-html2text_2020.1.16.bb | 15 +- .../recipes-devtools/python/python3-huey_2.2.0.bb | 10 + .../python/python3-importlib-metadata_1.5.2.bb | 5 - .../python/python3-importlib-metadata_1.6.1.bb | 18 ++ .../python/python3-incremental_17.5.0.bb | 22 +- .../python/python3-intervals/run-ptest | 3 + .../python/python3-intervals_1.10.0.bb | 30 +- .../recipes-devtools/python/python3-ipy/run-ptest | 3 + .../recipes-devtools/python/python3-ipy_1.00.bb | 34 ++- .../python/python3-iso3166/run-ptest | 3 + .../python/python3-iso3166_1.0.1.bb | 15 +- .../python/python3-iso8601_0.1.12.bb | 16 +- .../python/python3-isodate_0.6.0.bb | 16 +- .../python/python3-itsdangerous_1.1.0.bb | 13 +- .../python/python3-javaobj-py3_0.4.0.1.bb | 17 +- .../python/python3-jsonpatch_1.25.bb | 11 - .../python/python3-jsonpatch_1.26.bb | 11 + .../python/python3-jsonpointer_2.0.bb | 29 +- .../python/python3-kconfiglib_14.1.0.bb | 10 +- .../python/python3-lazy-object-proxy_1.4.3.bb | 2 - .../python/python3-lazy-object-proxy_1.5.0.bb | 12 + .../python/python3-license-expression_1.0.bb | 2 - .../python/python3-license-expression_1.2.bb | 29 ++ .../python/python3-lrparsing_1.0.16.bb | 18 +- .../python/python3-matplotlib_3.2.1.bb | 37 --- .../python/python3-matplotlib_3.2.2.bb | 37 +++ .../python/python3-more-itertools_8.3.0.bb | 24 -- .../python/python3-more-itertools_8.4.0.bb | 24 ++ .../python/python3-msgpack_0.6.2.bb | 28 -- .../python/python3-msgpack_1.0.0.bb | 28 ++ .../recipes-devtools/python/python3-msk_0.3.13.bb | 11 - .../recipes-devtools/python/python3-msk_0.3.15.bb | 11 + .../python/python3-ndg-httpsclient_0.5.1.bb | 27 +- .../python/python3-netaddr_0.7.19.bb | 2 - .../python/python3-netaddr_0.7.20.bb | 13 + .../python/python3-netifaces_0.10.9.bb | 12 +- .../python/python3-networkx_2.4.bb | 11 +- .../python/python3-ordered-set_3.1.1.bb | 23 -- .../python/python3-ordered-set_4.0.2.bb | 23 ++ .../python/python3-packaging_20.3.bb | 2 - .../python/python3-packaging_20.4.bb | 12 + .../python/python3-padatious_0.4.7.bb | 9 - .../python/python3-padatious_0.4.8.bb | 9 + .../python/python3-pandas_1.0.3.bb | 23 -- .../python/python3-pandas_1.0.5.bb | 23 ++ .../python/python3-parse-type_0.4.2.bb | 2 - .../python/python3-parse-type_0.5.2.bb | 25 ++ .../python/python3-parse_1.15.0.bb | 28 +- .../python/python3-passlib_1.7.2.bb | 21 +- .../python/python3-pathlib2_2.3.5.bb | 13 +- .../python/python3-periphery_2.0.1.bb | 5 - .../python/python3-periphery_2.1.0.bb | 14 + .../python/python3-pexpect_4.8.0.bb | 25 +- .../recipes-devtools/python/python3-pint_0.12.bb | 31 -- .../recipes-devtools/python/python3-pint_0.13.bb | 31 ++ .../python/python3-pocketsphinx_0.1.15.bb | 2 +- .../python/python3-pretend_1.0.9.bb | 11 +- .../python/python3-prompt-toolkit_2.0.10.bb | 7 - .../python/python3-prompt-toolkit_3.0.5.bb | 23 ++ .../python/python3-protobuf_3.11.3.bb | 10 - .../python/python3-protobuf_3.12.2.bb | 40 +++ .../python/python3-psutil_5.7.0.bb | 25 +- .../python/python3-ptyprocess_0.6.0.bb | 43 ++- .../recipes-devtools/python/python3-py_1.8.1.bb | 15 - .../recipes-devtools/python/python3-py_1.8.2.bb | 15 + .../python/python3-pyexpect_1.0.19.bb | 11 - .../python/python3-pyexpect_1.0.20.bb | 11 + .../python/python3-pyjks_19.0.0.bb | 22 -- .../python/python3-pyjks_20.0.0.bb | 22 ++ .../python/python3-pyperf_1.7.1.bb | 24 -- .../python/python3-pyperf_2.0.0.bb | 24 ++ .../recipes-devtools/python/python3-pyrad_2.3.bb | 9 + .../python/python3-pyrsistent_0.15.7.bb | 16 - .../python/python3-pyrsistent_0.16.0.bb | 16 + .../python/python3-pytest-timeout_1.3.4.bb | 13 - .../python/python3-pytest-timeout_1.4.1.bb | 13 + .../python/python3-requests-file_1.4.3.bb | 14 - .../python/python3-requests-file_1.5.1.bb | 14 + .../python/python3-requests-toolbelt_0.9.1.bb | 16 + .../python/python3-ruamel-yaml_0.16.10.bb | 16 + .../python/python3-ruamel-yaml_0.16.5.bb | 16 - .../python/python3-semver_2.10.2.bb | 12 + .../python/python3-semver_2.8.1.bb | 12 - .../python/python3-setuptools-scm_3.5.0.bb | 21 -- .../python/python3-setuptools-scm_4.1.2.bb | 21 ++ .../recipes-devtools/python/python3-sh_1.12.14.bb | 24 -- .../recipes-devtools/python/python3-sh_1.13.1.bb | 24 ++ .../python/python3-smpplib_2.1.0.bb | 9 + .../python/python3-socketio_4.5.1.bb | 28 -- .../python/python3-socketio_4.6.0.bb | 28 ++ .../recipes-devtools/python/python3-spidev_3.4.bb | 16 - .../recipes-devtools/python/python3-spidev_3.5.bb | 16 + .../python/python3-sqlalchemy_1.3.12.bb | 20 -- .../python/python3-sqlalchemy_1.3.17.bb | 20 ++ .../python/python3-sqlsoup_0.9.1.bb | 9 + .../recipes-devtools/python/python3-toml_0.10.0.bb | 16 - .../recipes-devtools/python/python3-toml_0.10.1.bb | 16 + .../recipes-devtools/python/python3-twine_3.1.1.bb | 15 - .../recipes-devtools/python/python3-twine_3.2.0.bb | 15 + .../python/python3-twisted_19.10.0.bb | 65 ----- .../python/python3-twisted_20.3.0.bb | 325 +++++++++++++++++++++ .../python/python3-typeguard_2.7.1.bb | 18 -- .../python/python3-typeguard_2.9.1.bb | 18 ++ .../python/python3-wcwidth_0.2.4.bb | 12 - .../python/python3-wcwidth_0.2.5.bb | 12 + .../python/python3-wtforms_2.2.1.bb | 17 -- .../python/python3-wtforms_2.3.1.bb | 17 ++ .../python/python3-xxhash_1.4.3.bb | 22 -- .../python/python3-xxhash_1.4.4.bb | 22 ++ .../netdata/0001-Correct-timeout-issue.patch | 42 --- ...0002-Makefiles-does-not-build-contrib-dir.patch | 24 -- .../recipes-webadmin/netdata/netdata_git.bb | 15 +- .../packagegroups/packagegroup-xfce-base.bb | 1 - 263 files changed, 3754 insertions(+), 3316 deletions(-) delete mode 100644 meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.1.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.3.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.1.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.3.0.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.10.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.12.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.9.bb delete mode 100644 meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.3.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.4.0.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p14.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.38.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch delete mode 100644 meta-openembedded/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.12.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_5.0.9.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/gcab/gcab/run-ptest create mode 100644 meta-openembedded/meta-oe/recipes-gnome/gcab/gcab_1.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat/run-ptest create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb/run-ptest create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.1.15.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.10.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb create mode 100644 meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/asio/asio_1.16.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb delete mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun.inc delete mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-pytun/python3-pytun_2.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python3-pytun/python3-pytun_2.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-incremental.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-intervals.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-ipy.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-iso8601.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-isodate.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-kconfiglib.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-license-expression.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-lrparsing.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-netaddr.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-netifaces.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-networkx.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-packaging.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-parse-type.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-parse.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-passlib.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-periphery.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pexpect.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pretend.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-twisted/0001-fix-MemoryReactor-import-in-test_runner-to-be-from-t.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.3.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-booleanpy_3.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-booleanpy_3.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools/run-ptest delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-can_3.3.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-can_3.3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.11.28.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2020.6.20.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.23.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_10.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_14.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-configobj_5.0.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_4.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_5.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.34.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.13.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dominate/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-versioned_0.9.4-20101221.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-geojson/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-html2text/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_1.5.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_1.6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-intervals/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ipy/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-iso3166/run-ptest delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.25.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.26.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.4.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.2.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_8.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_8.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.6.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.13.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.15.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.19.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.20.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_3.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_4.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-padatious_0.4.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-padatious_0.4.8.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.0.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.0.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.4.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.5.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.12.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.13.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.10.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.11.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.12.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.8.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.8.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.19.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.20.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_19.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_1.7.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyrad_2.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.16.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_1.3.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_1.4.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.4.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_0.9.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.10.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.10.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.8.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_3.5.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.12.14.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sh_1.13.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_4.5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_4.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-spidev_3.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-spidev_3.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.12.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.17.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlsoup_0.9.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-toml_0.10.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-toml_0.10.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_19.10.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_20.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.7.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.9.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth_0.2.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth_0.2.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.3.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.4.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-timeout-issue.patch delete mode 100644 meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0002-Makefiles-does-not-build-contrib-dir.patch diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.1.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.1.bb deleted file mode 100644 index 1830fa166..000000000 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.1.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "Implementation of a fully functional filesystem in a userspace program" -DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspace \ - programs to export a virtual filesystem to the Linux kernel. FUSE \ - also aims to provide a secure method for non privileged users to \ - create and mount their own filesystem implementations. \ - " -HOMEPAGE = "https://github.com/libfuse/libfuse" -SECTION = "libs" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LGPL2.txt;md5=4fbd65380cdd255951079008b364516c \ - file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66" - -SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ -" -SRC_URI[md5sum] = "26d6b450276fb04e20bf91d83b9423f0" -SRC_URI[sha256sum] = "1bafcfd6c66ba35b7b0beb822532a9106eb8409ad6cde988888fde85f89be645" - -S = "${WORKDIR}/fuse-${PV}" - -UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" -UPSTREAM_CHECK_REGEX = "fuse\-(?P3(\.\d+)+).tar.xz" - -inherit meson pkgconfig - -DEPENDS = "udev" - -PACKAGES =+ "fuse3-utils" - -RPROVIDES_${PN}-dbg += "fuse3-utils-dbg" - -RRECOMMENDS_${PN}_class-target = "kernel-module-fuse fuse3-utils" - -FILES_${PN} += "${libdir}/libfuse3.so.*" -FILES_${PN}-dev += "${libdir}/libfuse3*.la" - -EXTRA_OEMESON += " \ - -Dexamples=false \ -" - -# Forbid auto-renaming to libfuse3-utils -FILES_fuse3-utils = "${bindir} ${base_sbindir}" -DEBIAN_NOAUTONAME_fuse3-utils = "1" -DEBIAN_NOAUTONAME_${PN}-dbg = "1" - -do_install_append() { - rm -rf ${D}${base_prefix}/dev -} diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.2.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.2.bb new file mode 100644 index 000000000..24b17fc93 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.9.2.bb @@ -0,0 +1,47 @@ +SUMMARY = "Implementation of a fully functional filesystem in a userspace program" +DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspace \ + programs to export a virtual filesystem to the Linux kernel. FUSE \ + also aims to provide a secure method for non privileged users to \ + create and mount their own filesystem implementations. \ + " +HOMEPAGE = "https://github.com/libfuse/libfuse" +SECTION = "libs" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LGPL2.txt;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66" + +SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ +" +SRC_URI[sha256sum] = "6999b6d48e7c0a79628fa901f6e66def3513cab4ffdd8097821e7dc3cdeae08a" + +S = "${WORKDIR}/fuse-${PV}" + +UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" +UPSTREAM_CHECK_REGEX = "fuse\-(?P3(\.\d+)+).tar.xz" + +inherit meson pkgconfig + +DEPENDS = "udev" + +PACKAGES =+ "fuse3-utils" + +RPROVIDES_${PN}-dbg += "fuse3-utils-dbg" + +RRECOMMENDS_${PN}_class-target = "kernel-module-fuse fuse3-utils" + +FILES_${PN} += "${libdir}/libfuse3.so.*" +FILES_${PN}-dev += "${libdir}/libfuse3*.la" + +EXTRA_OEMESON += " \ + -Dexamples=false \ +" + +# Forbid auto-renaming to libfuse3-utils +FILES_fuse3-utils = "${bindir} ${base_sbindir}" +DEBIAN_NOAUTONAME_fuse3-utils = "1" +DEBIAN_NOAUTONAME_${PN}-dbg = "1" + +do_install_append() { + rm -rf ${D}${base_prefix}/dev +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.3.bb deleted file mode 100644 index 29e01cc23..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.3.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" -SECTION = "x11/office" -DEPENDS = " \ - gnome-common-native \ - yelp-tools-native \ - appstream-glib \ - gtk+3 \ - gspell \ - libsecret \ - poppler \ - gstreamer1.0-plugins-base \ - orc \ - adwaita-icon-theme \ - ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext mime-xdg gtk-doc - -SRC_URI[archive.md5sum] = "9762dabdde37a804072bccbfd311d357" -SRC_URI[archive.sha256sum] = "af2ebdf7f74e6580c4f1a12bdfe26b9ff90374d7acae061de0666d64012a9db2" -SRC_URI += " \ - file://0001-Add-format-attribute-to-_synctex_malloc.patch \ - file://0002-add-a-formatting-attribute-check.patch \ -" - -GTKDOC_MESON_OPTION = "gtk_doc" - -EXTRA_OEMESON = " \ - -Dsystemduserunitdir=no \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[nautilus] = "-Dnautilus=true,-Dnautilus=false,nautilus" -PACKAGECONFIG[browser-plugin] = "-Dbrowser_plugin=true,-Dbrowser_plugin=false" - -RDEPENDS_${PN} += "glib-2.0-utils" -RRECOMMMENDS_${PN} = "adwaita-icon-theme" - -PACKAGES =+ "${PN}-nautilus-extension" -PACKAGES =+ "${PN}-browser-plugin" - -FILES_${PN} += "${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/thumbnailers \ -" -FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" -FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb new file mode 100644 index 000000000..a82e44b02 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb @@ -0,0 +1,55 @@ +SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" +SECTION = "x11/office" +DEPENDS = " \ + gnome-common-native \ + yelp-tools-native \ + appstream-glib \ + gtk+3 \ + gspell \ + libsecret \ + poppler \ + gstreamer1.0-plugins-base \ + orc \ + adwaita-icon-theme \ + ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext mime-xdg gtk-doc + +SRC_URI[archive.md5sum] = "5d68c81a3d4c5d27754b97405451f04e" +SRC_URI[archive.sha256sum] = "6f0dd6e30639eb620f201a6ae40f21c4b78c030f0d6437f9e309f7240195e97c" +SRC_URI += " \ + file://0001-Add-format-attribute-to-_synctex_malloc.patch \ + file://0002-add-a-formatting-attribute-check.patch \ +" + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = " \ + -Dsystemduserunitdir=no \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[nautilus] = "-Dnautilus=true,-Dnautilus=false,nautilus" +PACKAGECONFIG[browser-plugin] = "-Dbrowser_plugin=true,-Dbrowser_plugin=false" + +RDEPENDS_${PN} += "glib-2.0-utils" +RRECOMMMENDS_${PN} = "adwaita-icon-theme" + +PACKAGES =+ "${PN}-nautilus-extension" +PACKAGES =+ "${PN}-browser-plugin" + +FILES_${PN} += "${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/thumbnailers \ +" +FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" +FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.2.bb deleted file mode 100644 index d3673a1fd..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.2.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "GNOME Settings" -DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion features_check - -DEPENDS = " \ - gdk-pixbuf-native \ - colord-gtk \ - udisks2 \ - upower \ - polkit \ - pulseaudio \ - accountsservice \ - samba \ - gsettings-desktop-schemas \ - gnome-settings-daemon \ - gnome-desktop3 \ - gnome-online-accounts \ - libnma \ - gnome-bluetooth \ - grilo \ - libgtop \ - gsound \ - libpwquality \ -" - -REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" - -SRC_URI[archive.md5sum] = "45832b7217c8d5fa5e2dbc214972c12d" -SRC_URI[archive.sha256sum] = "e0a5eff0c6d6c22db0c54fd070460de874d367ef3f9072e1559b70f28b847817" -SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" - -PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" -PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" -PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" - -# Once we have (lib)cheese we can make cheese a PACKAGECONFIG -EXTRA_OEMESON = " \ - -Doe_sysroot=${STAGING_DIR_HOST} \ - -Dcheese=false \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/gnome-shell \ - ${datadir}/metainfo \ -" - -FILES_${PN}-dev += "${datadir}/gettext" - -RDEPENDS_${PN} += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb new file mode 100644 index 000000000..81f42438e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb @@ -0,0 +1,55 @@ +SUMMARY = "GNOME Settings" +DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion features_check + +DEPENDS = " \ + gdk-pixbuf-native \ + colord-gtk \ + udisks2 \ + upower \ + polkit \ + pulseaudio \ + accountsservice \ + samba \ + gsettings-desktop-schemas \ + gnome-settings-daemon \ + gnome-desktop3 \ + gnome-online-accounts \ + libnma \ + gnome-bluetooth \ + grilo \ + libgtop \ + gsound \ + libpwquality \ +" + +REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" + +SRC_URI[archive.md5sum] = "fd99a8df0cc656e971415f2a1b310019" +SRC_URI[archive.sha256sum] = "bc174d970dbeca3ee19c26019de31e9edf78dc9c4abde16e763566ee38c3691c" +SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" + +PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" +PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" +PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" + +# Once we have (lib)cheese we can make cheese a PACKAGECONFIG +EXTRA_OEMESON = " \ + -Doe_sysroot=${STAGING_DIR_HOST} \ + -Dcheese=false \ +" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/gnome-shell \ + ${datadir}/metainfo \ +" + +FILES_${PN}-dev += "${datadir}/gettext" + +RDEPENDS_${PN} += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.2.bb deleted file mode 100644 index 1f5acd8d0..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.2.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -BPN = "gnome-desktop" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -SRC_URI[archive.md5sum] = "9fa17a6e2eacde3f9dd0df6be10091b2" -SRC_URI[archive.sha256sum] = "38f994dcb1e1ae093d1c929c7acc4f88e39111e43b5fdc13125b0f6e2311c789" - -SRC_URI += " \ - file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ - file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ -" - -DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" - -inherit features_check gtk-doc -REQUIRED_DISTRO_FEATURES += "x11" - -GTKDOC_MESON_OPTION = "gtk_doc" -EXTRA_OEMESON = "-Ddesktop_docs=false" - -PACKAGES =+ "libgnome-desktop3" -FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" - -RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb new file mode 100644 index 000000000..b7ef7545a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ +" + +BPN = "gnome-desktop" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +SRC_URI[archive.md5sum] = "75e828342e51c88c866dcdd46c021d26" +SRC_URI[archive.sha256sum] = "4bed119fa25ea0ff7880928142365c3c8726585fc072bc147157e66b63e96b7e" + +SRC_URI += " \ + file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ + file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ +" + +DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" + +inherit features_check gtk-doc +REQUIRED_DISTRO_FEATURES += "x11" + +GTKDOC_MESON_OPTION = "gtk_doc" +EXTRA_OEMESON = "-Ddesktop_docs=false" + +PACKAGES =+ "libgnome-desktop3" +FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" + +RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index 3f8fe2f36..00a5c480d 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -1,24 +1,24 @@ SUMMARY = "Linux libcamera framework" SECTION = "libs" -LICENSE = "GPL-2.0 & LGPL-2.1" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "\ - file://licenses/gnu-gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://licenses/gnu-lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \ " SRC_URI = " \ git://linuxtv.org/libcamera.git;protocol=git \ " -SRCREV = "a8be6e94e79f602d543a15afd44ef60e378b138f" +SRCREV = "5f2f9406cebc668f0d69007d1ea59ef3c56ef28c" -PV = "202002+git${SRCPV}" +PV = "202006+git${SRCPV}" S = "${WORKDIR}/git" -DEPENDS = "python3-pyyaml-native udev" +DEPENDS = "python3-pyyaml-native udev gnutls boost" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}" RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland qt', 'qtwayland', '', d)}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb deleted file mode 100644 index 3c65ef247..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.0.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "OpenH264 is a codec library which supports H.264 encoding and \ -decoding. It is suitable for use in real time applications such as WebRTC." -HOMEPAGE = "http://www.openh264.org/" -SECTION = "libs/multimedia" - -DEPENDS_append_x86 = " nasm-native" -DEPENDS_append_x86-64 = " nasm-native" - -LICENSE = "BSD-2-Clause" -LICENSE_FLAGS = "commercial" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf" - -S = "${WORKDIR}/git" -SRCREV = "a60e28efe227ea8ea760b1e29a8943e371ebe4b3" -BRANCH = "openh264v2.1.0" -SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \ - file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \ - " - -COMPATIBLE_MACHINE_armv7a = "(.*)" -COMPATIBLE_MACHINE_aarch64 = "(.*)" -COMPATIBLE_MACHINE_x86 = "(.*)" -COMPATIBLE_MACHINE_x86-64 = "(.*)" -COMPATIBLE_MACHINE_mips = "(.*)" -COMPATIBLE_MACHINE_mips64 = "(.*)" - -EXTRA_OEMAKE_armv7a = "ARCH=arm" -EXTRA_OEMAKE_armv7ve = "ARCH=arm" -EXTRA_OEMAKE_aarch64 = "ARCH=arm64" -EXTRA_OEMAKE_x86 = "ARCH=i386" -EXTRA_OEMAKE_x86-64 = "ARCH=x86_64" -EXTRA_OEMAKE_mips = "ARCH=mips" -EXTRA_OEMAKE_mips64 = "ARCH=mips64" -EXTRA_OEMAKE_riscv64 = "ARCH=riscv64" - -EXTRA_OEMAKE_append = " ENABLEPIC=Yes" -do_configure() { - : -} - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} -} - -CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.1.bb new file mode 100644 index 000000000..3988cfff8 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_2.1.1.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "OpenH264 is a codec library which supports H.264 encoding and \ +decoding. It is suitable for use in real time applications such as WebRTC." +HOMEPAGE = "http://www.openh264.org/" +SECTION = "libs/multimedia" + +DEPENDS_append_x86 = " nasm-native" +DEPENDS_append_x86-64 = " nasm-native" + +LICENSE = "BSD-2-Clause" +LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf" + +S = "${WORKDIR}/git" +SRCREV = "50a1fcf70fafe962c526749991cb4646406933ba" +BRANCH = "openh264v2.1.1" +SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \ + file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \ + " + +COMPATIBLE_MACHINE_armv7a = "(.*)" +COMPATIBLE_MACHINE_aarch64 = "(.*)" +COMPATIBLE_MACHINE_x86 = "(.*)" +COMPATIBLE_MACHINE_x86-64 = "(.*)" +COMPATIBLE_MACHINE_mips = "(.*)" +COMPATIBLE_MACHINE_mips64 = "(.*)" + +EXTRA_OEMAKE_armv7a = "ARCH=arm" +EXTRA_OEMAKE_armv7ve = "ARCH=arm" +EXTRA_OEMAKE_aarch64 = "ARCH=arm64" +EXTRA_OEMAKE_x86 = "ARCH=i386" +EXTRA_OEMAKE_x86-64 = "ARCH=x86_64" +EXTRA_OEMAKE_mips = "ARCH=mips" +EXTRA_OEMAKE_mips64 = "ARCH=mips64" +EXTRA_OEMAKE_riscv64 = "ARCH=riscv64" + +EXTRA_OEMAKE_append = " ENABLEPIC=Yes" +do_configure() { + : +} + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${prefix} +} + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.3.0.bb deleted file mode 100644 index 79e64aebd..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.3.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = "http://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2" - -inherit autotools - -EXTRA_OECONF = " --disable-doc " - -SRC_URI[md5sum] = "7f0fdb3ff91d638f5e45ed7536f7eb67" -SRC_URI[sha256sum] = "7c414acd520c4e4dd7267952f72d738ff50321a7869af4d75c65aefad44f1395" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb new file mode 100644 index 000000000..fe06699ab --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "libdvdcss is a simple library for accessing DVDs like block devices" +DESCRIPTION = "libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "http://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2" + +inherit autotools + +EXTRA_OECONF = " --disable-doc " + +SRC_URI[md5sum] = "7b74f2e142b13c9de6dc8d807ab912d4" +SRC_URI[sha256sum] = "78c2ed77ec9c0d8fbed7bf7d3abc82068b8864be494cfad165821377ff3f2575" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.10.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.10.bb deleted file mode 100644 index 6020c2035..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.10.bb +++ /dev/null @@ -1,134 +0,0 @@ -DESCRIPTION = "Video player and streamer - davinci edition" -HOMEPAGE = "http://www.videolan.org" -SECTION = "multimedia" - -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ - dbus libxml2 gnutls \ - tremor faad2 ffmpeg flac alsa-lib \ - lua-native lua libidn \ - avahi jpeg xz libmodplug mpeg2dec \ - libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ - tiff" - -LDFLAGS_append_riscv64 = " -latomic" - -# While this item does not require it, it depends on ffmpeg which does -LICENSE_FLAGS = "commercial" - -SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ - file://0001-make-opencv-configurable.patch \ - file://0002-use-vorbisidec.patch \ - file://0003-fix-luaL-checkint.patch \ - file://0004-Use-packageconfig-to-detect-mmal-support.patch \ - file://0005-Fix-build-with-Qt-5.15.patch \ -" -SRC_URI[sha256sum] = "a966abfc7f3b2ff3adaa130306ecaf5d6ad3b6dc73385fc9ab0c1204029d4c31" - -inherit autotools features_check gettext pkgconfig mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -export BUILDCC = "${BUILD_CC}" -EXTRA_OECONF = "\ - --enable-run-as-root \ - --enable-xvideo \ - --disable-screen --disable-caca \ - --enable-vlm \ - --enable-freetype \ - --enable-tremor \ - --enable-v4l2 --disable-aa --disable-faad \ - --enable-dbus \ - --without-contrib \ - --without-kde-solid \ - --enable-realrtsp \ - --disable-libtar \ - --enable-avcodec \ - ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ - ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ - ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ -" - -PACKAGECONFIG ?= " \ - live555 dc1394 dv1394 notify fontconfig fluidsynth freetype dvdread png \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - x264 \ -" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} - -PACKAGECONFIG[mmal] = "--enable-omxil --enable-omxil-vout --enable-rpi-omxil --enable-mmal,,userland" -PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" -PACKAGECONFIG[fluidsynth] = ",,fluidsynth" -PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" -PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" -PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" -PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${prefix},--disable-live555,live555" -PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" -PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" -PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" -PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" -PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" -PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" -PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" -PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" -PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" -PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" -PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" -PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss" -PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2" -PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" -PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg" -PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394" -PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394" -PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg" -PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo" -PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+3" -PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig" -PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" -PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" -PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" -PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" -PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" -PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native" - -do_configure_append() { - sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool - - # moc needs support: precreate build paths - for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do - mkdir -p "${B}/modules/gui/qt/$qtpath" - done -} - -# This recipe packages vlc as a library as well, so qt4 dependencies -# can be avoided when only the library is installed. -PACKAGES =+ "libvlc" - -LEAD_SONAME_libvlc = "libvlc.so.5" -FILES_libvlc = "${libdir}/lib*.so.*" - -FILES_${PN} += "\ - ${bindir}/vlc \ - ${libdir}/vlc/vlc/libvlc_vdpau.so \ - ${datadir}/applications \ - ${datadir}/vlc/ \ - ${datadir}/icons \ - ${datadir}/metainfo/vlc.appdata.xml \ -" - -FILES_${PN}-dbg += "\ - ${libdir}/vlc/*/.debug \ - ${libdir}/vlc/plugins/*/.debug \ -" - -FILES_${PN}-staticdev += "\ - ${libdir}/vlc/plugins/*/*.a \ -" - -INSANE_SKIP_${PN} = "dev-so" - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.bb new file mode 100644 index 000000000..dd9486e8a --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.bb @@ -0,0 +1,134 @@ +DESCRIPTION = "Video player and streamer - davinci edition" +HOMEPAGE = "http://www.videolan.org" +SECTION = "multimedia" + +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ + dbus libxml2 gnutls \ + tremor faad2 ffmpeg flac alsa-lib \ + lua-native lua libidn \ + avahi jpeg xz libmodplug mpeg2dec \ + libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ + tiff" + +LDFLAGS_append_riscv64 = " -latomic" + +# While this item does not require it, it depends on ffmpeg which does +LICENSE_FLAGS = "commercial" + +SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ + file://0001-make-opencv-configurable.patch \ + file://0002-use-vorbisidec.patch \ + file://0003-fix-luaL-checkint.patch \ + file://0004-Use-packageconfig-to-detect-mmal-support.patch \ + file://0005-Fix-build-with-Qt-5.15.patch \ +" +SRC_URI[sha256sum] = "3e94a1acf33445e9da15d528aa48657aa26b912eaa2656b403d43860a8834919" + +inherit autotools features_check gettext pkgconfig mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +export BUILDCC = "${BUILD_CC}" +EXTRA_OECONF = "\ + --enable-run-as-root \ + --enable-xvideo \ + --disable-screen --disable-caca \ + --enable-vlm \ + --enable-freetype \ + --enable-tremor \ + --enable-v4l2 --disable-aa --disable-faad \ + --enable-dbus \ + --without-contrib \ + --without-kde-solid \ + --enable-realrtsp \ + --disable-libtar \ + --enable-avcodec \ + ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ + ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ + ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ +" + +PACKAGECONFIG ?= " \ + live555 dc1394 dv1394 notify fontconfig fluidsynth freetype dvdread png \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + x264 \ +" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} + +PACKAGECONFIG[mmal] = "--enable-omxil --enable-omxil-vout --enable-rpi-omxil --enable-mmal,,userland" +PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" +PACKAGECONFIG[fluidsynth] = ",,fluidsynth" +PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" +PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${prefix},--disable-live555,live555" +PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" +PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" +PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" +PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" +PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" +PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" +PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" +PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" +PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" +PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" +PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" +PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss" +PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg" +PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394" +PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394" +PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg" +PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo" +PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+3" +PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig" +PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" +PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" +PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" +PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" +PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" +PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native" + +do_configure_append() { + sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool + + # moc needs support: precreate build paths + for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do + mkdir -p "${B}/modules/gui/qt/$qtpath" + done +} + +# This recipe packages vlc as a library as well, so qt4 dependencies +# can be avoided when only the library is installed. +PACKAGES =+ "libvlc" + +LEAD_SONAME_libvlc = "libvlc.so.5" +FILES_libvlc = "${libdir}/lib*.so.*" + +FILES_${PN} += "\ + ${bindir}/vlc \ + ${libdir}/vlc/vlc/libvlc_vdpau.so \ + ${datadir}/applications \ + ${datadir}/vlc/ \ + ${datadir}/icons \ + ${datadir}/metainfo/vlc.appdata.xml \ +" + +FILES_${PN}-dbg += "\ + ${libdir}/vlc/*/.debug \ + ${libdir}/vlc/plugins/*/.debug \ +" + +FILES_${PN}-staticdev += "\ + ${libdir}/vlc/plugins/*/*.a \ +" + +INSANE_SKIP_${PN} = "dev-so" + diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.12.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.12.bb new file mode 100644 index 000000000..6e49790fe --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.12.bb @@ -0,0 +1,117 @@ +SUMMARY = "A fully-featured http proxy and web-cache daemon for Linux" +DESCRIPTION = "A fully-featured http proxy and web-cache daemon for Linux. \ +Squid offers a rich access control, authorization and logging environment to \ +develop web proxy and content serving applications. \ +Squid offers a rich set of traffic optimization options, most of which are \ +enabled by default for simpler installation and high performance. \ +" +HOMEPAGE = "http://www.squid-cache.org" +SECTION = "web" +LICENSE = "GPLv2+" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" +MIN_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2 \ + file://Set-up-for-cross-compilation.patch \ + file://Skip-AC_RUN_IFELSE-tests.patch \ + file://Fix-flawed-dynamic-ldb-link-test-in-configure.patch \ + file://squid-use-serial-tests-config-needed-by-ptest.patch \ + file://run-ptest \ + file://volatiles.03_squid \ + file://set_sysroot_patch.patch \ + file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ + file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ + file://0001-tools.cc-fixed-unused-result-warning.patch \ + file://0001-splay.cc-fix-bind-is-not-a-member-of-std.patch \ + " + +SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" + +SRC_URI[md5sum] = "5d058f7f8f1db9fa4ce3db910a008b0e" +SRC_URI[sha256sum] = "eae0ad993921e472ce36cce34674c47a224fc2868b65ef0c4b41b2f5f18378a0" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://errors/COPYRIGHT;md5=4c3268f394af77fbbf541875cef96a6c \ + " +DEPENDS = "libtool krb5 openldap db cyrus-sasl" + +inherit autotools pkgconfig useradd ptest perlnative + +LDFLAGS_append_mipsarch = " -latomic" +LDFLAGS_append_powerpc = " -latomic" +LDFLAGS_append_riscv64 = " -latomic" +LDFLAGS_append_riscv32 = " -latomic" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ + " +PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," +PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2" +PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" + +BASIC_AUTH = "DB SASL LDAP" + +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" + +EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}' \ + --sysconfdir=${sysconfdir}/${BPN} \ + --with-logdir=${localstatedir}/log/${BPN} \ + 'PERL=${USRBINPATH}/env perl'" + +export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" + +TESTDIR = "test-suite" + +do_configure_prepend() { + export SYSROOT=$PKG_CONFIG_SYSROOT_DIR +} + +do_compile_ptest() { + oe_runmake -C ${TESTDIR} buildtest-TESTS +} + +do_install_ptest() { + cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} + cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH} + + # do NOT need to rebuild Makefile itself + sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + + # Add squid-conf-tests for runtime tests + sed -e 's/^\(runtest-TESTS:\)/\1 squid-conf-tests/' \ + -e "s/\(list=' \$(TESTS)\)/\1 squid-conf-tests/" \ + -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile + + # Ensure the path for command true is correct + sed -i 's:^TRUE = .*$:TRUE = /bin/true:' ${D}${PTEST_PATH}/${TESTDIR}/Makefile +} + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + echo "d ${localstatedir}/log/${BPN} 0750 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + fi + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid + + rmdir "${D}${localstatedir}/run/${BPN}" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" + + rmdir "${D}${localstatedir}/log/${BPN}" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log" +} + +FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" +FILES_${PN}-dbg += "/usr/src/debug" +FILES_${PN}-doc += "${datadir}/*.txt" + +RDEPENDS_${PN} += "perl" +RDEPENDS_${PN}-ptest += "make" diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.9.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.9.bb deleted file mode 100644 index 19949acd8..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.9.bb +++ /dev/null @@ -1,117 +0,0 @@ -SUMMARY = "A fully-featured http proxy and web-cache daemon for Linux" -DESCRIPTION = "A fully-featured http proxy and web-cache daemon for Linux. \ -Squid offers a rich access control, authorization and logging environment to \ -develop web proxy and content serving applications. \ -Squid offers a rich set of traffic optimization options, most of which are \ -enabled by default for simpler installation and high performance. \ -" -HOMEPAGE = "http://www.squid-cache.org" -SECTION = "web" -LICENSE = "GPLv2+" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" -MIN_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2 \ - file://Set-up-for-cross-compilation.patch \ - file://Skip-AC_RUN_IFELSE-tests.patch \ - file://Fix-flawed-dynamic-ldb-link-test-in-configure.patch \ - file://squid-use-serial-tests-config-needed-by-ptest.patch \ - file://run-ptest \ - file://volatiles.03_squid \ - file://set_sysroot_patch.patch \ - file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ - file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ - file://0001-tools.cc-fixed-unused-result-warning.patch \ - file://0001-splay.cc-fix-bind-is-not-a-member-of-std.patch \ - " - -SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" - -SRC_URI[md5sum] = "b315d0dce37627dfe61eec7f5304baaf" -SRC_URI[sha256sum] = "0f5829d878002147e7c4d9b8901c2c3c051693465e82e45cef9ab0e226e3e729" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://errors/COPYRIGHT;md5=19cc4dd146f397e72f3ff6f9f58fbfbe \ - " -DEPENDS = "libtool krb5 openldap db cyrus-sasl" - -inherit autotools pkgconfig useradd ptest perlnative - -LDFLAGS_append_mipsarch = " -latomic" -LDFLAGS_append_powerpc = " -latomic" -LDFLAGS_append_riscv64 = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ - " -PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," -PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2" -PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" - -BASIC_AUTH = "DB SASL LDAP" - -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" - -EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}' \ - --sysconfdir=${sysconfdir}/${BPN} \ - --with-logdir=${localstatedir}/log/${BPN} \ - 'PERL=${USRBINPATH}/env perl'" - -export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" - -TESTDIR = "test-suite" - -do_configure_prepend() { - export SYSROOT=$PKG_CONFIG_SYSROOT_DIR -} - -do_compile_ptest() { - oe_runmake -C ${TESTDIR} buildtest-TESTS -} - -do_install_ptest() { - cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} - cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH} - - # do NOT need to rebuild Makefile itself - sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - - # Add squid-conf-tests for runtime tests - sed -e 's/^\(runtest-TESTS:\)/\1 squid-conf-tests/' \ - -e "s/\(list=' \$(TESTS)\)/\1 squid-conf-tests/" \ - -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile - - # Ensure the path for command true is correct - sed -i 's:^TRUE = .*$:TRUE = /bin/true:' ${D}${PTEST_PATH}/${TESTDIR}/Makefile -} - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - echo "d ${localstatedir}/log/${BPN} 0750 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - fi - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid - - rmdir "${D}${localstatedir}/run/${BPN}" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" - - rmdir "${D}${localstatedir}/log/${BPN}" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log" -} - -FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" -FILES_${PN}-dbg += "/usr/src/debug" -FILES_${PN}-doc += "${datadir}/*.txt" - -RDEPENDS_${PN} += "perl" -RDEPENDS_${PN}-ptest += "make" diff --git a/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.3.2.bb b/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.3.2.bb deleted file mode 100644 index 385b8b373..000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.3.2.bb +++ /dev/null @@ -1,139 +0,0 @@ -SUMMARY = "An open source implementation of the diameter protocol" -DESCRIPTION = "\ -freeDiameter is an open source Diameter protocol implementation \ -(RFC3588). It provides an extensible platform for deploying a \ -Diameter network for your Authentication, Authorization and \ -Accounting needs." - -HOMEPAGE = "http://www.freediameter.net" - -DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn lksctp-tools virtual/kernel bison-native" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -fd_pkgname = "freeDiameter" - -SRC_URI = "\ - http://www.freediameter.net/hg/${fd_pkgname}/archive/${PV}.tar.gz;downloadfilename=${fd_pkgname}-${PV}.tar.gz \ - file://Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch \ - file://freediameter.service \ - file://freediameter.init \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://install_test.patch file://run-ptest file://pass-ptest-env.patch', '', d)} \ - file://freeDiameter.conf \ - file://0001-libfdcore-sctp.c-update-the-old-sctp-api-check.patch \ - " - -SRC_URI[md5sum] = "73ce230b4789f9f28fff77cbc83c65af" -SRC_URI[sha256sum] = "ce05b4bf2a04cd2f472e77ba4b86fbfca690bfc83e51da8ce0e575804b763eda" - -S = "${WORKDIR}/${fd_pkgname}-${PV}" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=69bdc1d97648a2d35914563fcbbb361a" - -PTEST_PATH = "${libdir}/${fd_pkgname}/ptest" - -inherit cmake pkgconfig update-rc.d ptest systemd - -EXTRA_OECMAKE = " \ - -DDEFAULT_CONF_PATH:PATH=${sysconfdir}/${fd_pkgname} \ - -DBUILD_DBG_MONITOR:BOOL=ON \ - -DBUILD_TEST_APP:BOOL=ON \ - -DBUILD_TESTING:BOOL=ON \ - -DBUILD_APP_RADGW:BOOL=ON \ - -DBUILD_APP_REDIRECT:BOOL=ON \ - -DBUILD_TEST_ACCT:BOOL=ON \ - -DBUILD_TEST_NETEMUL:BOOL=ON \ - -DBUILD_TEST_RT_ANY:BOOL=ON \ - -DINSTALL_LIBRARY_SUFFIX:PATH=${baselib} \ - -DINSTALL_EXTENSIONS_SUFFIX:PATH=${baselib}/${fd_pkgname} \ - -DINSTALL_TEST_SUFFIX:PATH=${PTEST_PATH}-tests \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ -" -# INSTALL_LIBRARY_SUFFIX is relative to CMAKE_INSTALL_PREFIX -# specify it on cmd line will fix the SET bug in CMakeList.txt - -# -DBUILD_APP_ACCT:BOOL=ON This needs POSTGRESQL support - -# -DBUILD_APP_DIAMEAP:BOOL=ON -DBUILD_APP_SIP:BOOL=ON -DBUILD_TEST_SIP:BOOL=ON -# These need MySQL support - -# -DBUILD_DBG_INTERACTIVE:BOOL=ON This needs SWIG support - -# -DALL_EXTENSIONS=ON will enable all - -FD_KEY ?="${BPN}.key" -FD_PEM ?= "${BPN}.pem" -FD_CA ?= "${BPN}.pem" -FD_DH_PEM ?= "${BPN}-dh.pem" -FD_HOSTNAME ?= "${MACHINE}" -FD_REALM ?= "openembedded.org" - -do_install_append() { - # install the sample configuration files - install -d -m 0755 ${D}${sysconfdir}/${fd_pkgname} - for i in ${S}/doc/*.conf.sample; do - install -m 0644 $i ${D}${sysconfdir}/${fd_pkgname}/ - done - mv ${D}${sysconfdir}/${fd_pkgname}/freediameter.conf.sample \ - ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf.sample - install -d ${D}${sysconfdir}/freeDiameter - install ${WORKDIR}/freeDiameter.conf ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf - - # install daemon init related files - install -d -m 0755 ${D}${sysconfdir}/default - install -d -m 0755 ${D}${sysconfdir}/init.d - install -m 0644 ${S}/contrib/debian/freediameter-daemon.default \ - ${D}${sysconfdir}/default/${BPN} - install -m 0755 ${WORKDIR}/freediameter.init ${D}${sysconfdir}/init.d/${BPN} - - # install for systemd - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/freediameter.service ${D}${systemd_system_unitdir} - sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/*.service - - cat >> ${D}${sysconfdir}/freeDiameter/freeDiameter.conf <> ${D}${sysconfdir}/freeDiameter/freeDiameter.conf <> $D/var/spool/cron/root - fi -} - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN} = "ntpd" -ALTERNATIVE_LINK_NAME[ntpd] = "${sbindir}/ntpd" diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb new file mode 100644 index 000000000..7e168825e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb @@ -0,0 +1,177 @@ +SUMMARY = "Network Time Protocol daemon and utilities" +DESCRIPTION = "The Network Time Protocol (NTP) is used to \ +synchronize the time of a computer client or server to \ +another server or reference time source, such as a radio \ +or satellite receiver or modem." +HOMEPAGE = "http://support.ntp.org" +SECTION = "net" +LICENSE = "NTP" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4190b39435611e92a4da74e682623f19" + +DEPENDS = "libevent" + +SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \ + file://ntp-4.2.4_p6-nano.patch \ + file://reproducibility-fixed-path-to-posix-shell.patch \ + file://ntpd \ + file://ntp.conf \ + file://ntpdate \ + file://ntpdate.default \ + file://ntpdate.service \ + file://ntpd.service \ + file://sntp.service \ + file://sntp \ + file://ntpd.list \ +" + +SRC_URI[sha256sum] = "f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19" + +inherit autotools update-rc.d useradd systemd pkgconfig + +# The ac_cv_header_readline_history is to stop ntpdc depending on either +# readline or curses +EXTRA_OECONF += "--with-net-snmp-config=no \ + --without-ntpsnmpd \ + ac_cv_header_readline_history_h=no \ + --with-yielding_select=yes \ + --with-locfile=redhat \ + --without-rpath \ + " +CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" + +USERADD_PACKAGES = "${PN}" +NTP_USER_HOME ?= "/var/lib/ntp" +USERADD_PARAM_${PN} = "--system --home-dir ${NTP_USER_HOME} \ + --no-create-home \ + --shell /bin/false --user-group ntp" + +# NB: debug is default-enabled by NTP; keep it default-enabled here. +PACKAGECONFIG ??= "cap debug refclocks openssl \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ +" +PACKAGECONFIG[openssl] = "--with-openssl-libdir=${STAGING_LIBDIR} \ + --with-openssl-incdir=${STAGING_INCDIR} \ + --with-crypto, \ + --without-openssl --without-crypto, \ + openssl" +PACKAGECONFIG[cap] = "--enable-linuxcaps,--disable-linuxcaps,libcap" +PACKAGECONFIG[readline] = "--with-lineeditlibs,--without-lineeditlibs,readline" +PACKAGECONFIG[refclocks] = "--enable-all-clocks,--disable-all-clocks,pps-tools" +PACKAGECONFIG[debug] = "--enable-debugging,--disable-debugging" +PACKAGECONFIG[mdns] = "ac_cv_header_dns_sd_h=yes,ac_cv_header_dns_sd_h=no,mdns" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 644 ${WORKDIR}/ntp.conf ${D}${sysconfdir} + install -m 755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d + install -d ${D}${bindir} + install -m 755 ${WORKDIR}/ntpdate ${D}${bindir}/ntpdate-sync + + install -m 755 -d ${D}${NTP_USER_HOME} + chown ntp:ntp ${D}${NTP_USER_HOME} + + # Fix hardcoded paths in scripts + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync + sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync + sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync + sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync + sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntptrace + sed -i '/use/i use warnings;' ${D}${sbindir}/ntptrace + sed -i '1s,#!.*perl,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait + sed -i '/use/i use warnings;' ${D}${sbindir}/ntp-wait + sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/calc_tickadj + sed -i '/use/i use warnings;' ${D}${sbindir}/calc_tickadj + + install -d ${D}/${sysconfdir}/default + install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate + install -m 0644 ${WORKDIR}/sntp ${D}${sysconfdir}/default/ + + install -d ${D}/${sysconfdir}/network/if-up.d + ln -s ${bindir}/ntpdate-sync ${D}/${sysconfdir}/network/if-up.d + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_unitdir}/system/ + + install -d ${D}${systemd_unitdir}/ntp-units.d + install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list + + # Remove an empty libexecdir. + rmdir --ignore-fail-on-non-empty ${D}${libexecdir} +} + +PACKAGES += "ntpdate sntp ntpdc ntpq ${PN}-tickadj ${PN}-utils" +# NOTE: you don't need ntpdate, use "ntpd -q -g -x" + +# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms +# with wonky clocks (e.g. OpenSlug) +RDEPENDS_${PN} = "${PN}-tickadj" +# ntpd require libgcc for execution +RDEPENDS_${PN} += "libgcc" +# Handle move from bin to utils package +RPROVIDES_${PN}-utils = "${PN}-bin" +RREPLACES_${PN}-utils = "${PN}-bin" +RCONFLICTS_${PN}-utils = "${PN}-bin" +# ntpdc and ntpq were split out of ntp-utils +RDEPENDS_${PN}-utils = "ntpdc ntpq" + +SYSTEMD_PACKAGES = "${PN} ntpdate sntp" +SYSTEMD_SERVICE_${PN} = "ntpd.service" +SYSTEMD_SERVICE_ntpdate = "ntpdate.service" +SYSTEMD_SERVICE_sntp = "sntp.service" +SYSTEMD_AUTO_ENABLE_sntp = "disable" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" + +RPROVIDES_ntpdate += "ntpdate-systemd" +RREPLACES_ntpdate += "ntpdate-systemd" +RCONFLICTS_ntpdate += "ntpdate-systemd" + +RSUGGESTS_${PN} = "iana-etc" + +FILES_${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd \ + ${NTP_USER_HOME} \ + ${systemd_unitdir}/ntp-units.d/60-ntpd.list \ +" +FILES_${PN}-tickadj = "${sbindir}/tickadj" +FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib" +RDEPENDS_${PN}-utils += "perl" +FILES_ntpdate = "${sbindir}/ntpdate \ + ${sysconfdir}/network/if-up.d/ntpdate-sync \ + ${bindir}/ntpdate-sync \ + ${sysconfdir}/default/ntpdate \ + ${systemd_unitdir}/system/ntpdate.service \ +" +FILES_sntp = "${sbindir}/sntp \ + ${sysconfdir}/default/sntp \ + ${systemd_unitdir}/system/sntp.service \ + " +FILES_ntpdc = "${sbindir}/ntpdc" +FILES_ntpq = "${sbindir}/ntpq" + +CONFFILES_${PN} = "${sysconfdir}/ntp.conf" +CONFFILES_ntpdate = "${sysconfdir}/default/ntpdate" + +INITSCRIPT_NAME = "ntpd" +# No dependencies, so just go in at the standard level (20) +INITSCRIPT_PARAMS = "defaults" + +pkg_postinst_ntpdate() { + if ! grep -q -s ntpdate $D/var/spool/cron/root; then + echo "adding crontab" + test -d $D/var/spool/cron || mkdir -p $D/var/spool/cron + echo "30 * * * * ${bindir}/ntpdate-sync silent" >> $D/var/spool/cron/root + fi +} + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "ntpd" +ALTERNATIVE_LINK_NAME[ntpd] = "${sbindir}/ntpd" diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb deleted file mode 100644 index f196eb992..000000000 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb +++ /dev/null @@ -1,112 +0,0 @@ -SUMMARY = "IPMI (Intelligent Platform Management Interface) library and tools" -DESCRIPTION = "OpenIPMI is an effort to create a full-function IPMI system, \ -to allow full access to all IPMI information on a server \ -and to abstract it to a level that will make it easy to use" - -HOMEPAGE = "http://openipmi.sourceforge.net" - -DEPENDS = " \ - glib-2.0 \ - ncurses \ - net-snmp \ - openssl \ - popt \ - python3 \ - swig-native \ - readline \ - " - -LICENSE = "GPLv2 & LGPLv2.1 & BSD" - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ - file://COPYING.BSD;md5=4b318d4160eb69c8ee53452feb1b4cdf \ - " - -SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ - file://fix-symlink-install-error-in-cmdlang.patch \ - file://openipmi-no-openipmigui-man.patch \ - file://openipmi-remove-host-path-from-la_LDFLAGS.patch \ - file://ipmi-init-fix-the-arguments.patch \ - file://include_sys_types.patch \ - file://openipmi-helper \ - file://ipmi.service \ - " - -S = "${WORKDIR}/OpenIPMI-${PV}" - -SRC_URI[md5sum] = "ba37f08e306062ec73c7ed2a2bd4d5f4" -SRC_URI[sha256sum] = "8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996" - -inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base - -EXTRA_OECONF = "--disable-static \ - --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \ - --with-python='${STAGING_BINDIR_NATIVE}/python3-native/python3' \ - --with-pythoninstall='${PYTHON_SITEPACKAGES_DIR}' \ - --with-glibver=2.0" - -PACKAGECONFIG ??= "gdbm" -PACKAGECONFIG[gdbm] = "ac_cv_header_gdbm_h=yes,ac_cv_header_gdbm_h=no,gdbm," - -PACKAGES += "${PN}-perl ${PN}-python" -PRIVATE_LIBS_${PN}-perl = "libOpenIPMI.so.0" - -FILES_${PN}-perl = " \ - ${libdir}/perl/vendor_perl/*/OpenIPMI.pm \ - ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/OpenIPMI.so \ - " - -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" - -FILES_${PN}-dbg += " \ - ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/.debug \ - ${PYTHON_SITEPACKAGES_DIR}/.debug \ - " - -do_configure () { - - # Let's perform regular configuration first then handle perl issues. - autotools_do_configure - - perl_ver=`perl -V:version | cut -d\' -f 2` - - # Force openipmi perl bindings to be compiled using perl-native instead of - # the host's perl. Set the proper install directory for the resulting - # openipmi.pm and openipmi.so - for i in ${S}/swig/Makefile ${S}/swig/perl/Makefile; do - echo "SAL: i = $i" - echo "SAL: STAGING_INCDIR_NATIVE = $STAGING_INCDIR_NATIVE" - echo "SAL: libdir = $libdir" - sed -i -e "/^PERL_CFLAGS/s:-I/usr/local/include:-I${STAGING_INCDIR_NATIVE}:g" $i - sed -i -e "/^PERL_CFLAGS/s:-I .* :-I ${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}/CORE :g" $i - sed -i -e "/^PERL_INSTALL_DIR/s:^PERL_INSTALL_DIR = .*:PERL_INSTALL_DIR = ${libdir}/perl/vendor_perl/$perl_ver:g" $i - done -} - -do_install_append () { - echo "SAL: D = $D" - echo "SAL: libdir = $libdir" - install -m 0755 -d ${D}${sysconfdir}/sysconfig ${D}${sysconfdir}/init.d - install -m 0755 ${S}/ipmi.init ${D}${sysconfdir}/init.d/ipmi - install -m 0644 ${S}/ipmi.sysconf ${D}${sysconfdir}/sysconfig/ipmi - # SAL: mv: cannot stat `/localdisk/loadbuild/slittle1/workspace/cgts_test_build/bitbake_build/tmp/work/x86_64-wrs-linux/openipmi-2.0.19-r4/image/usr/lib64/perl5': No such file or directory - # SAL: real path to perl is /localdisk/loadbuild/slittle1/workspace/cgts_test_build/bitbake_build/tmp/work/x86_64-wrs-linux/perl-5.14.2-r8.3/package/usr/lib64/perl5 and it is a symlink to perl so no need to mv. - if [ -d ${D}${libdir}/perl5 ] - then - mv ${D}${libdir}/perl5 ${D}${libdir}/perl - fi - - # for systemd - install -d ${D}${systemd_unitdir}/system - install -m 0664 ${WORKDIR}/ipmi.service ${D}${systemd_unitdir}/system - sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/ipmi.service - install -d ${D}${libexecdir} - install -m 0755 ${WORKDIR}/openipmi-helper ${D}${libexecdir} -} - -INITSCRIPT_NAME = "ipmi" -INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." - -SYSTEMD_SERVICE_${PN} = "ipmi.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb new file mode 100644 index 000000000..85634a70e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb @@ -0,0 +1,112 @@ +SUMMARY = "IPMI (Intelligent Platform Management Interface) library and tools" +DESCRIPTION = "OpenIPMI is an effort to create a full-function IPMI system, \ +to allow full access to all IPMI information on a server \ +and to abstract it to a level that will make it easy to use" + +HOMEPAGE = "http://openipmi.sourceforge.net" + +DEPENDS = " \ + glib-2.0 \ + ncurses \ + net-snmp \ + openssl \ + popt \ + python3 \ + swig-native \ + readline \ + " + +LICENSE = "GPLv2 & LGPLv2.1 & BSD" + +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ + file://COPYING.BSD;md5=4b318d4160eb69c8ee53452feb1b4cdf \ + " + +SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ + file://fix-symlink-install-error-in-cmdlang.patch \ + file://openipmi-no-openipmigui-man.patch \ + file://openipmi-remove-host-path-from-la_LDFLAGS.patch \ + file://ipmi-init-fix-the-arguments.patch \ + file://include_sys_types.patch \ + file://openipmi-helper \ + file://ipmi.service \ + " + +S = "${WORKDIR}/OpenIPMI-${PV}" + +SRC_URI[md5sum] = "46b452e95d69c92e4172b3673ed88d52" +SRC_URI[sha256sum] = "2244124579afb14e569f34393e9ac61e658a28b6ffa8e5c0d2c1c12a8ce695cd" + +inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base + +EXTRA_OECONF = "--disable-static \ + --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \ + --with-python='${STAGING_BINDIR_NATIVE}/python3-native/python3' \ + --with-pythoninstall='${PYTHON_SITEPACKAGES_DIR}' \ + --with-glibver=2.0" + +PACKAGECONFIG ??= "gdbm" +PACKAGECONFIG[gdbm] = "ac_cv_header_gdbm_h=yes,ac_cv_header_gdbm_h=no,gdbm," + +PACKAGES += "${PN}-perl ${PN}-python" +PRIVATE_LIBS_${PN}-perl = "libOpenIPMI.so.0" + +FILES_${PN}-perl = " \ + ${libdir}/perl/vendor_perl/*/OpenIPMI.pm \ + ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/OpenIPMI.so \ + " + +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" + +FILES_${PN}-dbg += " \ + ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/.debug \ + ${PYTHON_SITEPACKAGES_DIR}/.debug \ + " + +do_configure () { + + # Let's perform regular configuration first then handle perl issues. + autotools_do_configure + + perl_ver=`perl -V:version | cut -d\' -f 2` + + # Force openipmi perl bindings to be compiled using perl-native instead of + # the host's perl. Set the proper install directory for the resulting + # openipmi.pm and openipmi.so + for i in ${S}/swig/Makefile ${S}/swig/perl/Makefile; do + echo "SAL: i = $i" + echo "SAL: STAGING_INCDIR_NATIVE = $STAGING_INCDIR_NATIVE" + echo "SAL: libdir = $libdir" + sed -i -e "/^PERL_CFLAGS/s:-I/usr/local/include:-I${STAGING_INCDIR_NATIVE}:g" $i + sed -i -e "/^PERL_CFLAGS/s:-I .* :-I ${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}/CORE :g" $i + sed -i -e "/^PERL_INSTALL_DIR/s:^PERL_INSTALL_DIR = .*:PERL_INSTALL_DIR = ${libdir}/perl/vendor_perl/$perl_ver:g" $i + done +} + +do_install_append () { + echo "SAL: D = $D" + echo "SAL: libdir = $libdir" + install -m 0755 -d ${D}${sysconfdir}/sysconfig ${D}${sysconfdir}/init.d + install -m 0755 ${S}/ipmi.init ${D}${sysconfdir}/init.d/ipmi + install -m 0644 ${S}/ipmi.sysconf ${D}${sysconfdir}/sysconfig/ipmi + # SAL: mv: cannot stat `/localdisk/loadbuild/slittle1/workspace/cgts_test_build/bitbake_build/tmp/work/x86_64-wrs-linux/openipmi-2.0.19-r4/image/usr/lib64/perl5': No such file or directory + # SAL: real path to perl is /localdisk/loadbuild/slittle1/workspace/cgts_test_build/bitbake_build/tmp/work/x86_64-wrs-linux/perl-5.14.2-r8.3/package/usr/lib64/perl5 and it is a symlink to perl so no need to mv. + if [ -d ${D}${libdir}/perl5 ] + then + mv ${D}${libdir}/perl5 ${D}${libdir}/perl + fi + + # for systemd + install -d ${D}${systemd_unitdir}/system + install -m 0664 ${WORKDIR}/ipmi.service ${D}${systemd_unitdir}/system + sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/ipmi.service + install -d ${D}${libexecdir} + install -m 0755 ${WORKDIR}/openipmi-helper ${D}${libexecdir} +} + +INITSCRIPT_NAME = "ipmi" +INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." + +SYSTEMD_SERVICE_${PN} = "ipmi.service" +SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.2.bb b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.2.bb deleted file mode 100644 index cc6cd1e07..000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Use previously captured traffic to test network devices" - -HOMEPAGE = "http://tcpreplay.synfin.net/" -SECTION = "net" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=890b830b22fd632e9ffd996df20338f8" - -SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz" - -SRC_URI[md5sum] = "dfa0d1b3dfd2cd316291a7a20563b649" -SRC_URI[sha256sum] = "4f479bd9196cafde70c58ab072ca4959ecc5278555cf1aa7cf42f7f210daa951" - -UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" - -DEPENDS = "libpcap" - -EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr" - -inherit siteinfo autotools-brokensep - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.3.bb b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.3.bb new file mode 100644 index 000000000..3346daddb --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.3.bb @@ -0,0 +1,21 @@ +SUMMARY = "Use previously captured traffic to test network devices" + +HOMEPAGE = "http://tcpreplay.synfin.net/" +SECTION = "net" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=890b830b22fd632e9ffd996df20338f8" + +SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz" + +SRC_URI[md5sum] = "53b52bf64f0b6b9443428e657b37bc6b" +SRC_URI[sha256sum] = "ed2402caa9434ff5c74b2e7b31178c73e7c7c5c4ea1e1d0e2e39a7dc46958fde" + +UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" + +DEPENDS = "libpcap" + +EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr" + +inherit siteinfo autotools-brokensep + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb index 52d6adb56..2843cdf95 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb @@ -82,7 +82,7 @@ do_install_append() { PACKAGES =+ "${PN}-contrib ${PN}-exec ${PN}-plugins ${PN}-python" -RDEPENDS_${PN} = "bash" +RDEPENDS_${PN} = "bash python3" RDEPENDS_${PN}-exec = "${PN}" RDEPENDS_${PN}-python = "python3-shell python3-pyyaml python3-datetime python3-netclient python3-stringold" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index 890db55bc..9c561e9f4 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -95,7 +95,7 @@ RDEPENDS_${PN} += " \ ${PN}-sensorsdetect \ ${PN}-sensorsconfconvert \ ${PN}-pwmconfig \ - ${PN}-isatools \ + ${@bb.utils.contains('MACHINE_FEATURES', 'x86', '${PN}-isatools', '', d)} \ " # libsensors packages diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb index 24315320e..e35bce7f3 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb @@ -24,6 +24,8 @@ inherit pkgconfig CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations" +EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" + do_install() { export D="${D}" oe_runmake install diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch index 207b85ab9..1b8e21865 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch @@ -6,7 +6,6 @@ diff -ruN ACE_wrappers1/ace/config.h ACE_wrappers/ace/config.h diff -ruN ACE_wrappers1/include/makeinclude/platform_macros.GNU ACE_wrappers/include/makeinclude/platform_macros.GNU --- ACE_wrappers1/include/makeinclude/platform_macros.GNU 1970-01-01 02:00:00.000000000 +0200 +++ ACE_wrappers/include/makeinclude/platform_macros.GNU 2018-10-31 15:11:18.265392460 +0200 -@@ -0,0 +1,3 @@ +@@ -0,0 +1,2 @@ +INSTALL_PREFIX = $(D)$(exec_prefix) -+INSTALL_LIB = $(base_libdir) +include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.38.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.38.0.bb deleted file mode 100644 index afc9b2f2e..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.38.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" -HOMEPAGE = "https://github.com/libuv/libuv" -BUGTRACKER = "https://github.com/libuv/libuv/issues" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" - -SRCREV = "1ab9ea3790378f9f25c4e78e9e2b511c75f9c9ed" -SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" - -S = "${WORKDIR}/git" - -inherit autotools - -do_configure() { - ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" - oe_runconf -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch new file mode 100644 index 000000000..af99d2b7f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch @@ -0,0 +1,135 @@ +Fix printf if time_t is long long + +On some platforms, time_t has recently switched from "long" to "long +long" [1]. For these platforms it is necessary to use "%lld" as printf +format specifier because the ABI differs between "long" and "long long". + +I found no way for creating something similar to PRId64 for time_t. No +idea how to determine whether it's "long" or "long long". So I cast +everything to "long long" instead. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=38143339646a4ccce8afe298c34467767c899f51 + +Upstream-Status: Accepted [next version is after 2.0] +Upstream-Patch: https://github.com/richardcochran/linuxptp/commit/7de73fefc378cc42b9ed1115b3afa409d0250a48 + +Signed-off-by: Christian Eggers +--- +diff -Naur linuxptp-2.0.org/phc_ctl.c linuxptp-2.0/phc_ctl.c +--- linuxptp-2.0.org/phc_ctl.c 2018-08-12 23:08:43.000000000 +0200 ++++ linuxptp-2.0/phc_ctl.c 2020-05-29 21:34:26.166519963 +0200 +@@ -230,8 +230,8 @@ + strerror(errno)); + return -1; + } else { +- pr_notice("set clock time to %ld.%09ld or %s", +- ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); ++ pr_notice("set clock time to %lld.%09ld or %s", ++ (long long)ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); + } + + return args_to_eat; +@@ -248,8 +248,8 @@ + + return -1; + } else { +- pr_notice("clock time is %ld.%09lu or %s", +- ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); ++ pr_notice("clock time is %lld.%09lu or %s", ++ (long long)ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); + } + + /* get operation does not require any arguments */ +diff -Naur linuxptp-2.0.org/print.c linuxptp-2.0/print.c +--- linuxptp-2.0.org/print.c 2018-08-12 23:08:43.000000000 +0200 ++++ linuxptp-2.0/print.c 2020-05-29 21:34:26.166519963 +0200 +@@ -73,16 +73,16 @@ + + if (verbose) { + f = level >= LOG_NOTICE ? stdout : stderr; +- fprintf(f, "%s[%ld.%03ld]: %s%s%s\n", ++ fprintf(f, "%s[%lld.%03ld]: %s%s%s\n", + progname ? progname : "", +- ts.tv_sec, ts.tv_nsec / 1000000, ++ (long long)ts.tv_sec, ts.tv_nsec / 1000000, + message_tag ? message_tag : "", message_tag ? " " : "", + buf); + fflush(f); + } + if (use_syslog) { +- syslog(level, "[%ld.%03ld] %s%s%s", +- ts.tv_sec, ts.tv_nsec / 1000000, ++ syslog(level, "[%lld.%03ld] %s%s%s", ++ (long long)ts.tv_sec, ts.tv_nsec / 1000000, + message_tag ? message_tag : "", message_tag ? " " : "", + buf); + } +diff -Naur linuxptp-2.0.org/unicast_service.c linuxptp-2.0/unicast_service.c +--- linuxptp-2.0.org/unicast_service.c 2018-08-12 23:08:43.000000000 +0200 ++++ linuxptp-2.0/unicast_service.c 2020-05-29 21:36:23.170497415 +0200 +@@ -209,9 +209,9 @@ + tmo = now.tv_sec + req->durationField; + if (tmo > client->grant_tmo) { + client->grant_tmo = tmo; +- pr_debug("%s grant of 0x%x extended to %ld", ++ pr_debug("%s grant of 0x%x extended to %lld", + pid2str(&client->portIdentity), +- client->message_types, tmo); ++ client->message_types, (long long)tmo); + } + } + +@@ -226,8 +226,8 @@ + interval = pqueue_peek(p->unicast_service->queue); + if (interval) { + tmo.it_value = interval->tmo; +- pr_debug("arming timer tmo={%ld,%ld}", +- interval->tmo.tv_sec, interval->tmo.tv_nsec); ++ pr_debug("arming timer tmo={%lld,%ld}", ++ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec); + } else { + pr_debug("stopping unicast service timer"); + } +@@ -499,8 +499,8 @@ + + while ((interval = pqueue_peek(p->unicast_service->queue)) != NULL) { + +- pr_debug("peek i={2^%d} tmo={%ld,%ld}", interval->log_period, +- interval->tmo.tv_sec, interval->tmo.tv_nsec); ++ pr_debug("peek i={2^%d} tmo={%lld,%ld}", interval->log_period, ++ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec); + + if (timespec_compare(&now, &interval->tmo) >= 0) { + break; +@@ -519,8 +519,8 @@ + } + + interval_increment(interval); +- pr_debug("next i={2^%d} tmo={%ld,%ld}", interval->log_period, +- interval->tmo.tv_sec, interval->tmo.tv_nsec); ++ pr_debug("next i={2^%d} tmo={%lld,%ld}", interval->log_period, ++ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec); + pqueue_insert(p->unicast_service->queue, interval); + } + +diff -Naur linuxptp-2.0.org/unicast_client.c linuxptp-2.0/unicast_client.c +--- linuxptp-2.0.org/unicast_client.c 2018-08-12 23:08:43.000000000 +0200 ++++ linuxptp-2.0/unicast_client.c 2020-06-02 11:13:06.922997844 +0200 +@@ -216,7 +216,7 @@ + long duration) + { + struct timespec now; +- long tmo; ++ time_t tmo; + + if (clock_gettime(CLOCK_MONOTONIC, &now)) { + pr_err("clock_gettime failed: %m"); +@@ -226,7 +226,7 @@ + tmo = now.tv_sec + duration; + if (!master->renewal_tmo || tmo < master->renewal_tmo) { + master->renewal_tmo = tmo; +- pr_debug("port %d: renewal timeout at %ld", portnum(p), tmo); ++ pr_debug("port %d: renewal timeout at %lld", portnum(p), (long long)tmo); + } + } + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb index eb262d36b..930c6673d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \ file://build-Allow-CC-and-prefix-to-be-overriden.patch \ file://no-incdefs-using-host-headers.patch \ + file://time_t_maybe_long_long.patch \ " SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11" diff --git a/meta-openembedded/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb b/meta-openembedded/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb deleted file mode 100644 index d14ec53e3..000000000 --- a/meta-openembedded/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "OpenCL ICD library" -DESCRIPTION = "Open Source alternative to vendor specific OpenCL ICD loaders." - -# The LICENSE is BSD 2-Clause "Simplified" License -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=232257bbf7320320725ca9529d3782ab" - -SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https" - -PV = "2.2.12+git${SRCPV}" -SRCREV = "af79aebe4649f30dbd711c1bf6fc661eac6e5f01" - -S = "${WORKDIR}/git" - -inherit autotools - -DEPENDS = "ruby-native" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb deleted file mode 100644 index dec1bea56..000000000 --- a/meta-openembedded/meta-oe/recipes-core/opencl-headers/opencl-headers_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "OpenCL API Headers" -DESCRIPTION = "OpenCL compute API headers from Khronos Group" -LICENSE = "Khronos" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" -SECTION = "base" - -S = "${WORKDIR}/git" -SRCREV = "40c5d226c7c0706f0176884e9b94b3886679c983" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install () { - install -d ${D}${includedir}/CL/ - install -m 0644 ${S}/CL/*.h ${D}${includedir}/CL -} diff --git a/meta-openembedded/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb deleted file mode 100644 index 7c49c8d55..000000000 --- a/meta-openembedded/meta-oe/recipes-core/opencl-icd-loader/opencl-icd-loader_git.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "OpenCL ICD Loader" -DESCRIPTION = "OpenCL compute ICD Loader from Khronos Group" -LICENSE = "Khronos" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ec724732ce73269486574c718ef0c79b" -SECTION = "base" - -inherit pkgconfig cmake - -S = "${WORKDIR}/git" -SRCREV = "b342ff7b7f70a4b3f2cfc53215af8fa20adc3d86" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git" - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${B}/bin/icd_loader_test ${D}${bindir}/ - chrpath -d ${D}${bindir}/icd_loader_test - install -d ${D}${libdir} - install -m 0644 ${B}/lib/libIcdLog.so ${D}${libdir}/ - install -m 0644 ${B}/lib/libOpenCLDriverStub.so ${D}${libdir}/ - chrpath -d ${D}${libdir}/libOpenCLDriverStub.so - install -m 0644 ${B}/lib/libOpenCL.so.1.2 ${D}${libdir}/ - cd ${D}${libdir} - ln -s libOpenCL.so.1.2 libOpenCL.so.1 - ln -s libOpenCL.so.1 libOpenCL.so -} - -PACKAGES = "opencl-icd-loader opencl-icd-loader-dev" -PACKAGES += "libicdlog libicdlog-dbg" -PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" - -FILES_${PN} = " \ - ${bindir}/icd_loader_test \ - ${libdir}/libOpenCLDriverStub.so \ - ${libdir}/libOpenCL.so.1.2 \ -" -FILES_${PN}-dev = " \ - ${libdir}/libOpenCL.so \ - ${libdir}/libOpenCL.so.1 \ -" - -FILES_libicdlog = "${libdir}/libIcdLog.so" -FILES_libicdlog-dbg = "${libdir}/.debug/libIcdLog.so" - -DEPENDS = "opencl-headers" -RDEPENDS_${PN} = "libicdlog" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb new file mode 100644 index 000000000..d14ec53e3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb @@ -0,0 +1,19 @@ +SUMMARY = "OpenCL ICD library" +DESCRIPTION = "Open Source alternative to vendor specific OpenCL ICD loaders." + +# The LICENSE is BSD 2-Clause "Simplified" License +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=232257bbf7320320725ca9529d3782ab" + +SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https" + +PV = "2.2.12+git${SRCPV}" +SRCREV = "af79aebe4649f30dbd711c1bf6fc661eac6e5f01" + +S = "${WORKDIR}/git" + +inherit autotools + +DEPENDS = "ruby-native" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb new file mode 100644 index 000000000..a4f292475 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb @@ -0,0 +1,23 @@ +SUMMARY = "OpenCL API C++ bindings" +DESCRIPTION = "OpenCL API C++ bindings from Khronos" + +SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +PV = "2.0.11+git${SRCPV}" +SRCREV = "432b551429b362a877ed9b647b7114022b332be0" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = " \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TESTS=OFF \ + " + +# Headers only so PN is empty +RDEPENDS_${PN}-dev = "" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb new file mode 100644 index 000000000..dec1bea56 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "OpenCL API Headers" +DESCRIPTION = "OpenCL compute API headers from Khronos Group" +LICENSE = "Khronos" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" +SECTION = "base" + +S = "${WORKDIR}/git" +SRCREV = "40c5d226c7c0706f0176884e9b94b3886679c983" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install () { + install -d ${D}${includedir}/CL/ + install -m 0644 ${S}/CL/*.h ${D}${includedir}/CL +} diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb new file mode 100644 index 000000000..7c49c8d55 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb @@ -0,0 +1,45 @@ +SUMMARY = "OpenCL ICD Loader" +DESCRIPTION = "OpenCL compute ICD Loader from Khronos Group" +LICENSE = "Khronos" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ec724732ce73269486574c718ef0c79b" +SECTION = "base" + +inherit pkgconfig cmake + +S = "${WORKDIR}/git" +SRCREV = "b342ff7b7f70a4b3f2cfc53215af8fa20adc3d86" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git" + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${B}/bin/icd_loader_test ${D}${bindir}/ + chrpath -d ${D}${bindir}/icd_loader_test + install -d ${D}${libdir} + install -m 0644 ${B}/lib/libIcdLog.so ${D}${libdir}/ + install -m 0644 ${B}/lib/libOpenCLDriverStub.so ${D}${libdir}/ + chrpath -d ${D}${libdir}/libOpenCLDriverStub.so + install -m 0644 ${B}/lib/libOpenCL.so.1.2 ${D}${libdir}/ + cd ${D}${libdir} + ln -s libOpenCL.so.1.2 libOpenCL.so.1 + ln -s libOpenCL.so.1 libOpenCL.so +} + +PACKAGES = "opencl-icd-loader opencl-icd-loader-dev" +PACKAGES += "libicdlog libicdlog-dbg" +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +FILES_${PN} = " \ + ${bindir}/icd_loader_test \ + ${libdir}/libOpenCLDriverStub.so \ + ${libdir}/libOpenCL.so.1.2 \ +" +FILES_${PN}-dev = " \ + ${libdir}/libOpenCL.so \ + ${libdir}/libOpenCL.so.1 \ +" + +FILES_libicdlog = "${libdir}/libIcdLog.so" +FILES_libicdlog-dbg = "${libdir}/.debug/libIcdLog.so" + +DEPENDS = "opencl-headers" +RDEPENDS_${PN} = "libicdlog" diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb index 2b799fd5e..88fad936b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" PV = "3.9.7+git${SRCPV}" SRC_URI = "git://github.com/iipeace/${BPN}" -SRCREV = "c87269d6d4669d12c99a2a7b9b07c39a5dd24ac6" +SRCREV = "459b5189a46023fc98e19888b196bdc2674022fd" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb index bb8aecded..6fef0bed2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb @@ -22,6 +22,11 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig +# After several fix attempts there is still a race between generating +# t.test-full.pb.h and compiling cxx_generate_packed_data.c despite +# BUILT_SOURCES and explicit dependencies. +PARALLEL_MAKE = "" + PACKAGE_BEFORE_PN = "${PN}-compiler" FILES_${PN}-compiler = "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch index 0a2e5e2df..934c98193 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch @@ -1,4 +1,4 @@ -From a28e15092a298e0c73c6fc1ded0913275cf27cb0 Mon Sep 17 00:00:00 2001 +From e5340f816aa273cfda36998466739ca0748caafb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 28 Jun 2019 13:50:52 +0000 Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build @@ -23,12 +23,13 @@ Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build Upstream-Status: Pending Signed-off-by: Martin Jansa +Signed-off-by: Leon Anavi --- examples/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index 4ad605641..31d887639 100644 +index e9f9635ae..b2fbe2de1 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -2,6 +2,8 @@ @@ -44,13 +45,16 @@ index 4ad605641..31d887639 100644 add_person_cpp: add_person.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` +- c++ -std=c++11 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` + $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp list_people_cpp: list_people.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` +- c++ -std=c++11 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` + $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp add_person_dart: add_person.dart protoc_middleman_dart +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb deleted file mode 100644 index 4d6c5b255..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.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 = "d0bfd5221182da1a7cc280f3337b5e41a89539cf" - -SRC_URI = "git://github.com/google/protobuf.git;branch=3.11.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.12.3.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.12.3.bb new file mode 100644 index 000000000..21ad7a460 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.12.3.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 = "31ebe2ac71400344a5db91ffc13c4ddfb7589f92" + +SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ + 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/sip/sip.inc b/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc deleted file mode 100644 index d8e32a768..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip.inc +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "SIP is a C++/Python Wrapper Generator" -HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" -SECTION = "devel" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" - -SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "98111479309dc472410f26080d6d4a88" -SRC_URI[sha256sum] = "5436b61a78f48c7e8078e93a6b59453ad33780f80c644e5f3af39f94be1ede44" - -S = "${WORKDIR}/sip-${PV}" - -BBCLASSEXTEND = "native" - -do_configure_prepend_class-target() { - echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = %(sysroot)/${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg - echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg - echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg - echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg - echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg - ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" -} -do_configure_prepend_class-native() { - echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg - echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg - echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg - echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg - echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg - ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot=${STAGING_DIR_NATIVE} -} -do_install() { - oe_runmake install -} diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb deleted file mode 100644 index 010fa30fe..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.19.bb +++ /dev/null @@ -1,11 +0,0 @@ -require sip.inc - -DEPENDS = "python3" - -inherit python3-dir python3native - -PACKAGES += "python3-sip3" - -FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" - diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb new file mode 100644 index 000000000..320755b84 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip3_4.19.23.bb @@ -0,0 +1,47 @@ +SUMMARY = "SIP is a C++/Python Wrapper Generator" +HOMEPAGE = "https://riverbankcomputing.com/software/sip/" +SECTION = "devel" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" + +SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "70adc0c9734e2d9dcd241d3f931dfc74" +SRC_URI[sha256sum] = "22ca9bcec5388114e40d4aafd7ccd0c4fe072297b628d0c5cdfa2f010c0bc7e7" + +inherit python3-dir python3native + +S = "${WORKDIR}/sip-${PV}" + +DEPENDS = "python3" + +PACKAGES += "python3-sip3" + +BBCLASSEXTEND = "native" + +do_configure_prepend_class-target() { + echo "py_platform = linux" > sip.cfg + echo "py_inc_dir = %(sysroot)/${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg + echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg + echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg + echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg + echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg + ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" +} + +do_configure_prepend_class-native() { + echo "py_platform = linux" > sip.cfg + echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg + echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg + echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg + echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg + echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg + ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot=${STAGING_DIR_NATIVE} +} + +do_install() { + oe_runmake install +} + +FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.0.bb deleted file mode 100644 index e7cb6a06d..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." -HOMEPAGE = "https://libzip.org/" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e33bb117aa55f9aad3d28e29256f9919" - -DEPENDS = "zlib bzip2" - -PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" -PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" - -PACKAGECONFIG ?= "ssl lzma" - -inherit cmake - -SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" - -SRC_URI[sha256sum] = "d26b2952426d2518f3db5cdeda4fe3cd668fc5bb38a598781e4d1d3f7f8ca7be" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb new file mode 100644 index 000000000..1a9cd8f10 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." +HOMEPAGE = "https://libzip.org/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e33bb117aa55f9aad3d28e29256f9919" + +DEPENDS = "zlib bzip2" + +PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" +PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" + +PACKAGECONFIG ?= "ssl lzma" + +inherit cmake + +SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" + +SRC_URI[sha256sum] = "a020dc1b17a79faa748e43a05f8605d65e403813e8e97ad3a300a90ddba097ac" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch index 421f306de..878cd3697 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch @@ -11,20 +11,25 @@ Signed-off-by: Venture Research Update to work with 4.0.8 Signed-off-by: Alistair Francis +Reworked for 6.0.4 +Signed-off-by: Andreas Müller --- - deps/hiredis/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + deps/hiredis/Makefile | 2 -- + 1 file changed, 2 deletions(-) diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile -index 9a4de836..271c06ba 100644 +index 25ac154..569f82b 100644 --- a/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile -@@ -36,7 +36,7 @@ endef +@@ -42,8 +42,6 @@ endef export REDIS_TEST_CONFIG # Fallback to gcc when $CC is not in $PATH. --CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') -+CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') - CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++') +-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') +-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') OPTIMIZATION?=-O3 - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings + WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers + DEBUG_FLAGS?= -g -ggdb +-- +2.21.3 + diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_5.0.9.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_5.0.9.bb deleted file mode 100644 index d04293369..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_5.0.9.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Redis key-value store" -DESCRIPTION = "Redis is an open source, advanced key-value store." -HOMEPAGE = "http://redis.io" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6" -DEPENDS = "readline lua ncurses" - -SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ - file://redis.conf \ - file://init-redis-server \ - file://redis.service \ - file://hiredis-use-default-CC-if-it-is-set.patch \ - file://lua-update-Makefile-to-use-environment-build-setting.patch \ - file://oe-use-libc-malloc.patch \ - file://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://GNU_SOURCE.patch \ - " - -SRC_URI[md5sum] = "c94523c9f4ee662027ddf90575d0e058" -SRC_URI[sha256sum] = "53d0ae164cd33536c3d4b720ae9a128ea6166ebf04ff1add3b85f1242090cb85" - -inherit autotools-brokensep update-rc.d systemd useradd - -FINAL_LIBS_x86_toolchain-clang = "-latomic" -FINAL_LIBS_mips = "-latomic" -FINAL_LIBS_arm = "-latomic" -FINAL_LIBS_powerpc = "-latomic" - -export FINAL_LIBS - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" -GROUPADD_PARAM_${PN} = "--system redis" - -REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" - -do_compile_prepend() { - (cd deps && oe_runmake hiredis lua linenoise) -} - -do_install() { - export PREFIX=${D}/${prefix} - oe_runmake install - install -d ${D}/${sysconfdir}/redis - install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server - install -d ${D}/var/lib/redis/ - chown redis.redis ${D}/var/lib/redis/ - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service - - if [ "${REDIS_ON_SYSTEMD}" = true ]; then - sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf - fi -} - -CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" - -INITSCRIPT_NAME = "redis-server" -INITSCRIPT_PARAMS = "defaults 87" - -SYSTEMD_SERVICE_${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb new file mode 100644 index 000000000..ffa28ccfe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb @@ -0,0 +1,66 @@ +SUMMARY = "Redis key-value store" +DESCRIPTION = "Redis is an open source, advanced key-value store." +HOMEPAGE = "http://redis.io" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6" +DEPENDS = "readline lua ncurses" + +SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ + file://redis.conf \ + file://init-redis-server \ + file://redis.service \ + file://hiredis-use-default-CC-if-it-is-set.patch \ + file://lua-update-Makefile-to-use-environment-build-setting.patch \ + file://oe-use-libc-malloc.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ + file://GNU_SOURCE.patch \ + " + +SRC_URI[md5sum] = "37200b25c282f94da4521bc510d79ced" +SRC_URI[sha256sum] = "3337005a1e0c3aa293c87c313467ea8ac11984921fab08807998ba765c9943de" + +inherit autotools-brokensep update-rc.d systemd useradd + +FINAL_LIBS_x86_toolchain-clang = "-latomic" +FINAL_LIBS_mips = "-latomic" +FINAL_LIBS_arm = "-latomic" +FINAL_LIBS_powerpc = "-latomic" + +export FINAL_LIBS + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" +GROUPADD_PARAM_${PN} = "--system redis" + +REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" + +do_compile_prepend() { + (cd deps && oe_runmake hiredis lua linenoise) +} + +do_install() { + export PREFIX=${D}/${prefix} + oe_runmake install + install -d ${D}/${sysconfdir}/redis + install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server + install -d ${D}/var/lib/redis/ + chown redis.redis ${D}/var/lib/redis/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service + + if [ "${REDIS_ON_SYSTEMD}" = true ]; then + sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf + fi +} + +CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" + +INITSCRIPT_NAME = "redis-server" +INITSCRIPT_PARAMS = "defaults 87" + +SYSTEMD_SERVICE_${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch new file mode 100644 index 000000000..c701554b8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch @@ -0,0 +1,27 @@ +From 93cec0c1d6d0be8dd3a9d01d3e7f2099f1728df7 Mon Sep 17 00:00:00 2001 +From: Orivej Desh +Date: Fri, 22 May 2020 12:48:02 +0000 +Subject: [PATCH] Fix legacy build after #2103 + +Upstream-Status: Backport +Signed-of-by: Alex Kiernan +--- + lib/legacy/zstd_v04.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/legacy/zstd_v04.c b/lib/legacy/zstd_v04.c +index 56bf45222498..19fda8980abf 100644 +--- a/lib/legacy/zstd_v04.c ++++ b/lib/legacy/zstd_v04.c +@@ -74,7 +74,7 @@ extern "C" { + /*-************************************* + * Debug + ***************************************/ +-#include "debug.h" ++#include "../common/debug.h" + #ifndef assert + # define assert(condition) ((void)0) + #endif +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb deleted file mode 100644 index eb201f413..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.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 = "10f0e6993f9d2f682da6d04aa2385b7d53cbb4ee" -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-extended/zstd/zstd_1.4.5.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb new file mode 100644 index 000000000..cd0b471e1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb @@ -0,0 +1,37 @@ +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 \ + file://0001-Fix-legacy-build-after-2103.patch \ + " + +SRCREV = "b706286adbba780006a47ef92df0ad7a785666b6" +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/gcab/gcab/run-ptest b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab/run-ptest new file mode 100644 index 000000000..0cdb48ea3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner libgcab diff --git a/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab_1.4.bb b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab_1.4.bb new file mode 100644 index 000000000..68f52bf92 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab_1.4.bb @@ -0,0 +1,24 @@ +SUMMARY = "A GObject library to create cabinet files" +HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcab" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "glib-2.0" + +SRC_URI = "\ + ${GNOME_MIRROR}/gcab/${PV}/gcab-${PV}.tar.xz \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "67a5fa9be6c923fbc9197de6332f36f69a33dadc9016a2b207859246711c048f" + +inherit gobject-introspection gtk-doc manpages meson ptest-gnome vala + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('USE_NLS', 'yes', 'nls', '', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" +PACKAGECONFIG[manpages] = "" +PACKAGECONFIG[nls] = "-Dnls=true,-Dnls=false" +PACKAGECONFIG[tests] = "-Dtests=true -Dinstalled_tests=true,-Dtests=false -Dinstalled_tests=false" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat/run-ptest b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat/run-ptest new file mode 100644 index 000000000..14980a7d0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner libjcat diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb new file mode 100644 index 000000000..10f5a800b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb @@ -0,0 +1,34 @@ +SUMMARY = "Library for reading and writing Jcat files" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" + +DEPENDS = "\ + glib-2.0 \ + json-glib \ +" + +SRC_URI = "\ + git://github.com/hughsie/libjcat.git \ + file://run-ptest \ +" +SRCREV = "1a509ac60b7446254c3bd1f45ea53e6cffba30ac" +S = "${WORKDIR}/git" + +inherit gobject-introspection gtk-doc meson ptest-gnome vala + +PACKAGECONFIG ??= "\ + gpg \ + pkcs7 \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" +PACKAGECONFIG[gpg] = "-Dgpg=true,-Dgpg=false,gpgme" +PACKAGECONFIG[pkcs7] = "-Dpkcs7=true,-Dpkcs7=false,gnutls gnutls-native" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" + +# manpage generation is broken because help2man needs to run the target binary on the host... +EXTRA_OEMESON = "-Dman=false" +GTKDOC_MESON_OPTION = "gtkdoc" + +RDEPENDS_${PN}_class-target = "\ + ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ +" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb/run-ptest b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb/run-ptest new file mode 100644 index 000000000..6d0bb95d3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner libxmlb diff --git a/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.1.15.bb b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.1.15.bb new file mode 100644 index 000000000..c54599317 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.1.15.bb @@ -0,0 +1,19 @@ +SUMMARY = "A library to help create and query binary XML blobs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" + +SRC_URI = "\ + git://github.com/hughsie/libxmlb.git \ + file://run-ptest \ +" +SRCREV = "ee4aafdd97844f1c73021a4978a43460f0835d5c" +S = "${WORKDIR}/git" + +inherit gobject-introspection gtk-doc meson ptest-gnome + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" + +GTKDOC_MESON_OPTION = "gtkdoc" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.10.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.10.bb deleted file mode 100644 index 3a2267ae9..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.10.bb +++ /dev/null @@ -1,15 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc -SUMMARY = "tiny window manager" -DEPENDS += " libxext libxt libxmu bison-native" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586" - -SRC_URI[md5sum] = "e322c08eeb635f924ede5b8eba3db54e" -SRC_URI[sha256sum] = "6449eadca16ce0f0d900605b0cc020b95f40619261b7beccfb46bcc1836445d7" - -FILES_${PN} += "${datadir}/X11/twm/system.twmrc" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_PATH = "${bindir}/twm" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "1" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb new file mode 100644 index 000000000..45caaacf2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.11.bb @@ -0,0 +1,16 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc +SUMMARY = "tiny window manager" +DEPENDS += " libxext libxt libxmu bison-native" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586" + +SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "48e83210b39a7bfb492604ba0bcfb19e" +SRC_URI[sha256sum] = "410ecabac54e6db7afd5c20a78d89c0134f3c74b149bee71b1fec775e6e060cc" + +FILES_${PN} += "${datadir}/X11/twm/system.twmrc" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_PATH = "${bindir}/twm" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "1" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch index 3a50eff83..afc8bc8e7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch @@ -1,5 +1,5 @@ ---- xscreensaver-5.39.orig/configure.in -+++ xscreensaver-5.39/configure.in +--- xscreensaver-5.44.orig/configure.in 2020-06-16 12:49:55.384675395 +0000 ++++ xscreensaver-5.44/configure.in 2020-06-16 12:51:49.451826729 +0000 @@ -14,6 +14,9 @@ # ############################################################################### @@ -10,38 +10,9 @@ AH_TOP([ /* config.h.in --- xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski. * -@@ -422,12 +425,12 @@ - - OBJCC="$CC" - -- AC_MSG_CHECKING([whether the compiler works on ANSI C]) -- AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) -- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.), -- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.)) -+# AC_MSG_CHECKING([whether the compiler works on ANSI C]) -+# AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], -+# AC_MSG_RESULT(yes), -+# AC_MSG_RESULT(no) -+# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.), -+# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.)) - - if test -n "$GCC"; then - AC_MSG_RESULT(Turning on gcc compiler warnings.) ---- xscreensaver-5.39.orig/Makefile.in -+++ xscreensaver-5.39/Makefile.in -@@ -6,7 +6,7 @@ - VPATH = @srcdir@ - - SHELL = /bin/sh --SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po -+SUBDIRS = utils jwxyz hacks/images hacks driver - SUBDIRS2 = $(SUBDIRS) OSX android - TARFILES = README README.hacking README.VMS INSTALL \ - configure configure.in Makefile.in config.h.in \ ---- xscreensaver-5.39.orig/driver/Makefile.in -+++ xscreensaver-5.39/driver/Makefile.in +diff -Naur xscreensaver-5.44.orig/driver/Makefile.in xscreensaver-5.44/driver/Makefile.in +--- xscreensaver-5.44.orig/driver/Makefile.in 2020-06-16 12:49:55.388675365 +0000 ++++ xscreensaver-5.44/driver/Makefile.in 2020-06-16 12:53:36.331038333 +0000 @@ -10,7 +10,7 @@ top_srcdir = @top_srcdir@ top_builddir = .. @@ -51,7 +22,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -@@ -221,7 +221,7 @@ +@@ -228,7 +228,7 @@ SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \ xscreensaver-text SCRIPTS_OSX = xscreensaver-getimage-desktop @@ -60,8 +31,9 @@ HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ xscreensaver.h prefs.h remote.h exec.h \ ---- xscreensaver-5.39.orig/hacks/Makefile.in -+++ xscreensaver-5.39/hacks/Makefile.in +diff -Naur xscreensaver-5.44.orig/hacks/Makefile.in xscreensaver-5.44/hacks/Makefile.in +--- xscreensaver-5.44.orig/hacks/Makefile.in 2020-06-16 12:49:55.532674285 +0000 ++++ xscreensaver-5.44/hacks/Makefile.in 2020-06-16 12:58:54.364719996 +0000 @@ -10,7 +10,7 @@ top_srcdir = @top_srcdir@ top_builddir = .. @@ -71,40 +43,40 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -@@ -122,7 +122,7 @@ - asm6502.c abstractile.c lcdscrub.c hexadrop.c \ +@@ -124,7 +124,7 @@ tessellimage.c delaunay.c recanim.c binaryring.c \ - webcollage-cocoa.m webcollage-helper-cocoa.m testx11.c + glitchpeg.c vfeedback.c scooter.c webcollage-cocoa.m \ + webcollage-helper-cocoa.m testx11.c -SCRIPTS = vidwhacker webcollage ljlatest +#SCRIPTS = vidwhacker webcollage ljlatest # Programs that are mentioned in XScreenSaver.ad, and that have XML files, # but that are not shipped with xscreensaver itself. -@@ -163,7 +163,13 @@ - lcdscrub.o hexadrop.o tessellimage.o delaunay.o recanim.o \ - binaryring.o testx11.o +@@ -166,7 +166,13 @@ + tessellimage.o delaunay.o recanim.o binaryring.o \ + glitchpeg.o vfeedback.o scooter.o testx11.o -EXES = attraction blitspin bouboule braid decayscreen deco \ -+EXES = fontglide -+JPEG_EXES = webcollage-helper ++EXES = fontglide ++JPEG_EXES = webcollage-helper + -+RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ -+ lightning lisa lissie lmorph rotor sphere spiral t3d vines \ -+ whirlygig worm xsublim juggle testx11 \ -+ attraction blitspin bouboule braid decayscreen deco \ ++RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ ++ lightning lisa lissie lmorph rotor sphere spiral t3d vines \ ++ whirlygig worm xsublim juggle testx11 \ ++ attraction blitspin bouboule braid decayscreen deco \ drift flame galaxy grav greynetic halo \ helix hopalong ifs imsmap julia kaleidescope \ maze moire noseguy pedal \ -@@ -179,17 +185,12 @@ +@@ -182,17 +188,12 @@ speedmine vermiculate twang apollonian euler2d \ polyominoes thornbird fluidballs anemone halftone \ metaballs eruption popsquares barcode piecewise cloudlife \ -- fontglide apple2 xanalogtv pong wormhole \ -+ apple2 xanalogtv pong wormhole \ +- fontglide apple2 xanalogtv pong filmleader wormhole \ ++ apple2 xanalogtv pong filmleader wormhole \ pacman fuzzyflakes anemotaxis memscroller substrate \ intermomentary fireworkx fiberlamp boxfit interaggregate \ celtic cwaves m6502 abstractile lcdscrub hexadrop \ - tessellimage binaryring \ + tessellimage binaryring glitchpeg vfeedback scooter \ @JPEG_EXES@ -JPEG_EXES = webcollage-helper - @@ -114,3 +86,15 @@ HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \ +diff -Naur xscreensaver-5.44.orig/Makefile.in xscreensaver-5.44/Makefile.in +--- xscreensaver-5.44.orig/Makefile.in 2020-06-16 12:49:55.384675395 +0000 ++++ xscreensaver-5.44/Makefile.in 2020-06-16 12:52:49.395383836 +0000 +@@ -6,7 +6,7 @@ + VPATH = @srcdir@ + + SHELL = /bin/sh +-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po ++SUBDIRS = utils jwxyz hacks/images hacks driver + SUBDIRS2 = $(SUBDIRS) OSX android + TARFILES = README README.hacking README.VMS INSTALL \ + configure configure.in Makefile.in config.h.in \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch index 099a0b2f4..0f2e09aec 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch @@ -1,5 +1,5 @@ ---- xscreensaver-5.39.orig/driver/XScreenSaver.ad.in -+++ xscreensaver-5.39/driver/XScreenSaver.ad.in +--- xscreensaver-5.44.orig/driver/XScreenSaver.ad.in 2020-06-16 13:13:14.950970569 +0000 ++++ xscreensaver-5.44/driver/XScreenSaver.ad.in 2020-06-16 13:19:35.777000937 +0000 @@ -29,7 +29,7 @@ ! /* (xrdb prevention kludge: whole file) @@ -31,10 +31,10 @@ +*splash: False *splashDuration: 0:00:05 *visualID: default - *captureStderr: True -@@ -158,236 +158,8 @@ - ! screen savers interactively. - ! + *installColormap: True +@@ -343,246 +343,8 @@ + !============================================================================= + *programs: \ - maze -root \n\ -@GL_KLUDGE@ GL: superquadrics -root \n\ @@ -138,6 +138,7 @@ -@GL_KLUDGE@ GL: menger -root \n\ -@GL_KLUDGE@ GL: molecule -root \n\ - rotzoomer -root \n\ +- scooter -root \n\ - speedmine -root \n\ -@GL_KLUDGE@ GL: starwars -root \n\ -@GL_KLUDGE@ GL: stonerview -root \n\ @@ -262,12 +263,21 @@ -@GL_KLUDGE@ GL: esper -root \n\ -@GL_KLUDGE@ GL: vigilance -root \n\ -@GL_KLUDGE@ GL: crumbler -root \n\ +- filmleader -root \n\ +- glitchpeg -root \n\ +-@GL_KLUDGE@ GL: handsy -root \n\ -@GL_KLUDGE@ GL: maze3d -root \n\ -@GL_KLUDGE@ GL: peepers -root \n\ --@GL_KLUDGE@ GL: razzledazzle -root \n +-@GL_KLUDGE@ GL: razzledazzle -root \n\ +- vfeedback -root \n\ +-@GL_KLUDGE@ GL: deepstars -root \n\ +-@GL_KLUDGE@ GL: gravitywell -root \n\ +-@GL_KLUDGE@ GL: etruscanvenus -root \n\ +-@GL_KLUDGE@ GL: gibson -root \n - -+- fontglide -root -program "date +'%F %H:%M %z'" \n\ -+ gifview --window $XSCREENSAVER_WINDOW /usr/share/logo/bosch-black.gif \n - +- ++- fontglide -root -program "date +'%F %H:%M %z'" ++ gifview --window $XSCREENSAVER_WINDOW /usr/share/logo/bosch-black.gif !============================================================================= + ! diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb deleted file mode 100644 index b8c1881d9..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "X screen saver and locker" - -LICENSE = "BSD-0-Clause" -LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=e141ab5822fb2d43694e1e47b59fc0df" - -SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "a5da62b91271f4e8afcc73d44697364b" -SRC_URI[sha256sum] = "48ce1880f18b5321182be0c033aeceb5ec5628a1505b9d1ff69dbf06093c2426" - -SRC_URI += " \ - file://xscreensaver.service \ - file://fix-buildscripts.patch \ - file://tweak-app-defaults.patch \ -" - -DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native" -# These are only needed as part of the stopgap screensaver implementation: -RDEPENDS_${PN} += "liberation-fonts" - -inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check - -EXTRA_OECONF += "--with-x-app-defaults=${datadir}/X11/app-defaults" - -REQUIRED_DISTRO_FEATURES = "x11" - -do_install_append() { - install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service -} - -FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver" -SYSTEMD_SERVICE_${PN} = "xscreensaver.service" - -CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb new file mode 100644 index 000000000..6cad97f15 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb @@ -0,0 +1,36 @@ +SUMMARY = "X screen saver and locker" + +LICENSE = "BSD-0-Clause" +LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=2b97002f72fbfc9329b4336e798f2463" + +SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" +SRC_URI[md5sum] = "9f764e561f9939f8684a66ec98b27cba" +SRC_URI[sha256sum] = "73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95" + +SRC_URI += " \ + file://xscreensaver.service \ + file://fix-buildscripts.patch \ + file://tweak-app-defaults.patch \ +" + +DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native" +# These are only needed as part of the stopgap screensaver implementation: +RDEPENDS_${PN} = " \ + liberation-fonts \ + xuser-account \ +" + +inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check + +EXTRA_OECONF += "--with-x-app-defaults=${datadir}/X11/app-defaults" + +REQUIRED_DISTRO_FEATURES = "x11" + +do_install_append() { + install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service +} + +FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver" +SYSTEMD_SERVICE_${PN} = "xscreensaver.service" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch new file mode 100644 index 000000000..f7f8bc068 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch @@ -0,0 +1,42 @@ +From 47a1db21f6c5d17c94c58c3fe0dcce35c623dbf4 Mon Sep 17 00:00:00 2001 +From: Liwei Song +Date: Tue, 23 Jun 2020 04:47:20 +0000 +Subject: [PATCH] sleepgraph: add support for RT kernel ftrace flags + +with PREEMPT_RT enabled in kernel, ftrace have a different +flags format: + + _-----=> irqs-off + / _----=> need-resched + | / _----=> need-resched + || / _---=> hardirq/softirq + ||| / _--=> preempt-depth + ||||/ delay +TASK-PID CPU# ||||| TIMESTAMP FUNCTION + | | | ||||| | | + +add support for this. + +Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/18] + +Signed-off-by: Liwei Song +--- + sleepgraph.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sleepgraph.py b/sleepgraph.py +index cfed8e09e0e6..561f165cf9be 100755 +--- a/sleepgraph.py ++++ b/sleepgraph.py +@@ -2689,7 +2689,7 @@ class TestProps: + '[ +!#\*@$]*(?P[0-9\.]*) .*\| (?P.*)' + ftrace_line_fmt_nop = \ + ' *(?P.*)-(?P[0-9]*) *\[(?P[0-9]*)\] *'+\ +- '(?P.{4}) *(?P