From 72956edabebd4188f98e3b0d9f8ce727e8d13ea3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 8 Jan 2021 16:11:14 -0600 Subject: meta-openembedded: subtree update:936f2380bb..4599fea881 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alexander Vickberg (1): mbedtls: upgrade to 2.25.0 Andreas Müller (44): xfce4-panel-profiles: upgrade 1.0.10 -> 1.0.12 mousepad: upgrade 0.4.2 -> 0.5.2 xfce4-screenshooter: upgrade 1.9.7 -> 1.9.8 xfce4-taskmanager: upgrade 1.2.3 -> 1.4.0 xfce4-calculator-plugin: upgrade 0.7.0 -> 0.7.1 xfce4-cpugraph-plugin: upgrade 1.1.0 -> 1.2.0 xfce4-datetime-plugin: upgrade 0.8.0 -> 0.8.1 xfce4-diskperf-plugin: upgrade 2.6.2 -> 2.6.3 xfce4-fsguard-plugin: upgrade 1.1.1 -> 1.1.2 xfce4-smartbookmark-plugin: upgrade 0.5.1 -> 0.5.2 xfce4-systemload-plugin: upgrade 1.2.3 -> 1.2.4 xfce4-verve-plugin: upgrade 2.0.0 -> 2.0.1 xfce4-wavelan-plugin: upgrade 0.6.1 -> 0.6.2 xfce4-whiskermenu-plugin: upgrade 2.4.6 -> 2.5.1 xfce4-xkb-plugin: upgrade 0.8.1 -> 0.8.2 xfce4-mount-plugin: upgrade 1.1.3 -> 1.1.5 xfce4-dev-tools: upgrade 4.14.0 -> 4.16.0 libxfce4util: upgrade 4.14.0 -> 4.16.0 xfconf: upgrade 4.14.3 -> 4.16.0 libxfce4ui: upgrade 4.14.1 -> 4.16.0 exo: upgrade 0.12.11 -> 4.16.0 garcon: upgrade 0.7.0 -> 0.8.0 xfwm4: upgrade 4.14.5 -> 4.16.0 xfce4-settings: upgrade 4.14.3 -> 4.16.0 xfce4-panel: upgrade 4.14.4 -> 4.16.0 xfce4-session: upgrade 4.14.2 -> 4.16.0 xfdesktop: upgrade 4.14.2 -> 4.16.0 xfce4-power-manager: upgrade 1.6.6 -> 4.16.0 tumbler: upgrade 0.3.1 -> 4.16.0 thunar-volman: upgrade 0.9.5 -> 4.16.0 thunar: upgrade 1.8.15 -> 4.16.0 xfce4-appfinder: upgrade 4.14.0 -> 4.16.0 xfce4-terminal: 0.8.9.2 -> 0.8.10 xfce4-screensaver: upgrade 0.1.10 -> 4.16.0 xfce4-taskmanager: remove exo-native from DEPENDS xfce4-closebutton-plugin: upgrade 0.1.0+ -> 4.16.0 xfce4-sensors-plugin: upgrade 1.3.92 -> 1.3.95 xfce4-genmon-plugin: upgrade 4.0.2 -> 4.1.0 xfce4-hotcorner-plugin: remove xfce4-embed-plugin: remove for now xfce4-equake-plugin: remove for now xfce4-notes-plugin: remove for now fluidsynth: upgrade 2.1.5 -> 2.1.6 blueman: upgrade 2.1.3 -> 2.1.4 Bruce Ashfield (1): vboxguestdrivers: fix build against kernel v5.10+ Caio Toledo (3): Add recipe for dbus-cxx Add dbus-cxx to packagegroup-meta-oe Fix dbus-cxx build for musl Changqing Li (1): libssh2: enhance ptest Chen Qi (1): tclap: fix branch Chencheng Zhang (1): tclap: align version to tag v1.2.2 Diego Santa Cruz (2): gssdp: Upgrade to 1.2.2 -> 1.2.3 gupnp: Upgrade to 1.2.2 -> 1.2.4 Dmitry Baryshkov (11): android-tools-conf-configfs: add an alternative to anrdoid-tools-conf android-tools-conf: fix android-tools build-deps warning conf/layer.conf: provide default PREFERRED_PROVIDER_android-tools-conf imlib2: add image manipulation libray from englightenment project feh: imlib2 based image viewer obconf: Openbox configuration tool xterm: install xterm and uxterm desktop files xterm: update to version 362 xterm: provide virtual/x-terminal-emulator layer.conf: add gnome-layer dynamic entry openbox-xdgmenu: Openbox menu generator He Zhe (2): ebtables: Add symbol link /sbin/ebtables lmbench: Fix setting LDLIBS failure Hongxu Jia (2): flatbuffers: add python3 support python3-wrapt: add native support Joe Slater (1): multipath-tools: fix error handling for udev_monitor_set_receive_buffer_size Khem Raj (9): pidgin-sipe: Do not add native libdir to pkgconfig search path sdbus-c++-libsystemd: Fix reallocarray check in meson networkmanager: Fix reallocarray check in meson and configure redis: Update to 6.0.9 python3-matplotlib: Disable LTO on mips/clang cyrus-sasl: Disable ntlm plugin by default postgresql: Use /dev/urandom when openssl is not used xrdp: Upgrade to 0.9.14 iwd: Upgrade to 1.10 Leon Anavi (33): python3-stevedore: Upgrade 3.2.2 -> 3.3.0 python3-pychromecast: Upgrade 7.5.1 -> 7.6.0 python3-humanize: Upgrade 3.1.0 -> 3.2.0 python3-fasteners: Upgrade 0.15 -> 0.16 python3-luma-core: Upgrade 2.0.1 -> 2.2.0 python3-chardet: Upgrade 3.0.4 -> 4.0.0 python3-watchdog: Upgrade 0.10.3 -> 1.0.2 python3-natsort: Upgrade 7.0.1 -> 7.1.0 python3-gmqtt: Upgrade 0.6.8 -> 0.6.9 python3-pymongo: Upgrade 3.11.0 -> 3.11.2 python3-requests: Upgrade 2.25.0 -> 2.25.1 python3-nocasedict: Upgrade 1.0.1 -> 1.0.2 python3-soupsieve: Upgrade 2.0.1 -> 2.1 python3-jsonpatch: Upgrade 1.26 -> 1.28 python3-psutil: Upgrade 5.7.3 -> 5.8.0 python3-argcomplete: Upgrade 1.12.1 -> 1.12.2 python3-multidict: Upgrade 5.0.0 -> 5.1.0 python3-nocaselist: Upgrade 1.0.3 -> 1.0.4 python3-prompt-toolkit: Upgrade 3.0.8 -> 3.0.9 python3-pychromecast: Upgrade 7.6.0 -> 7.7.1 python3-txaio: Upgrade 20.4.1 -> 20.12.1 python3-croniter: Upgrade 0.3.36 -> 0.3.37 python3-pandas: Upgrade 1.1.4 -> 1.2.0 python3-sympy: Upgrade 1.6.2 -> 1.7.1 python3-twine: Upgrade 3.2.0 -> 3.3.0 python3-humanfriendly: Upgrade 8.2 -> 9.1 python3-sqlalchemy: Upgrade 1.3.20 -> 1.3.22 python3-transitions: Upgrade 0.8.5 -> 0.8.6 python3-pytest-metadata: Upgrade 1.10.0 -> 1.11.0 python3-smbus2: Upgrade 0.3.0 -> 0.4.0 python3-cantools: Upgrade 35.5.0 -> 36.1.0 python3-sentry-sdk: Upgrade 0.19.1 -> 0.19.5 python3-babel: Upgrade 2.8.0 -> 2.9.0 Mark Jonas (1): beep: Update to 1.4.9 in new repository Martin Jansa (1): linuxconsole: move jscal to separate package, add to packagegroup Michael Vetter (1): jasper: upgrade 2.0.23 -> 2.0.24 Mingli Yu (3): traceroute: change the ALTERNATIVE_PRIORITY tftp-hpa: change the ALTERNATIVE_PRIORITY python3-astor: switch to python3 Ola X Nilsson (1): python3-idna Remove 2.8 Qi.Chen@windriver.com (1): python3-requests: upgrade to 2.25.0 Ramon Fried (2): bitwise: add new recipe yaml-cpp: add new recipe Roland Hieber (3): openct: remove lines that resulted in a no-op openct: clean up do_install openct: allow building as native package Sean Nyekjaer (1): nodejs: 12.19.1 -> 12.20.1 Stacy Gaikovaia (1): nodejs: 12.19.0 -> 12.19.1 Trevor Woerner (1): glmark2: fix precision handling bugs Wang Mingyu (1): zabbix: CVE-2020-15803 Security Advisory Wenlin Kang (1): syslog-ng: add bison-native to dependencies Yi Zhao (9): ebtables: do not install /etc/ethertypes yaffs2-utils: update to latest git rev f2fs-tools: upgrade 1.13.0 -> 1.14.0 dracut: upgrade 049 -> 051 ebtables: add missing file ebtables.common ebtables: remove upstream ebtables-legacy-save ebtables: do not install /etc/ethertypes tcpdump: add UPSTREAM_CHECK_REGEX phpmyadmin: 5.0.2 -> 5.0.4 Zang Ruochen (5): mcpp: Normalize the patch format of CVE python3-aenum: upgrade 2.2.4 -> 2.2.6 python3-autobahn: upgrade 20.7.1 -> 20.12.3 python3-bandit: upgrade 1.6.2 -> 1.7.0 python3-cachetools: upgrade 4.1.1 -> 4.2.0 Zheng Ruoqin (5): samba: CVE-2020-14318 Security Advisory samba: CVE-2020-14383 Security Advisory php: CVE-2020-7070 php: CVE-2020-7069 poppler: upgrade 20.11.0 -> 20.12.1 changqing.li@windriver.com (3): postgresql: upgrade 12.4 -> 13.1 nginx: upgrade 1.16.1 -> 1.18.0 nginx: upgrade 1.17.8 -> 1.19.6 jabdoa2 (2): libsdl2-mixer: Fix ogg/vorbis support in libsdl2-mixer libsdl2-mixer: set --disable-music-ogg-shared to link statically lumag (2): android-tools: fix package split android-tools: split adbd to the separate package zangrc (35): fuse3: upgrade 3.10.0 -> 3.10.1 openipmi: upgrade 2.0.29 -> 2.0.30 vblade: upgrade 24 -> 25 dumb-init: upgrade 1.2.2 -> 1.2.5 fio: upgrade 3.24 -> 3.25 hwdata: upgrade 0.341 -> 0.342 nano: upgrade 5.3 -> 5.4 ocl-icd: upgrade 2.2.13 -> 2.2.14 ebtables: upgrade 2.0.10-4 -> 2.0.11 iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3 opencl-headers: upgrade 2020.06.16 -> 2020.12.18 opencl-icd-loader: upgrade 2020.06.16 -> 2020.12.18 c-periphery: upgrade 2.2.5 -> 2.3.0 opencl-clhpp: upgrade 2.0.12 -> 2.0.13 uthash: upgrade 2.1.0 -> 2.2.0 libtalloc: upgrade 2.3.0 -> 2.3.1 libtevent: upgrade 0.10.1 -> 0.10.2 ace: upgrade 6.5.10 -> 6.5.12 python3-ldap: upgrade 3.2.0 -> 3.3.1 wolfssl: upgrade 4.5.0 -> 4.6.0 asio: upgrade 1.18.0 -> 1.18.1 dash: upgrade 0.5.11.2 -> 0.5.11.3 geoclue: upgrade 2.5.6 -> 2.5.7 libmicrohttpd: upgrade 0.9.71 -> 0.9.72 nss: upgrade 3.59 -> 3.60 paho-mqtt-c: upgrade 1.3.7 -> 1.3.8 terminus-font: upgrade 4.48 -> 4.49.1 libnet-ldap-perl: upgrade 0.66 -> 0.67 rdma-core: upgrade 32.0 -> 33.0 can-utils: upgrade 2020.11.0 -> 2020.12.0 cpprest: upgrade 2.10.16 -> 2.10.17 haveged: upgrade 1.9.13 -> 1.9.14 live555: upgrade 20201105 -> 20210101 smartmontools: upgrade 7.1 -> 7.2 openjpeg: upgrade 2.3.1 -> 2.4.0 zhengruoqin (12): pugixml: upgrade 1.11 -> 1.11.2 spdlog: upgrade 1.8.1 -> 1.8.2 spitools: upgrade 0.8.5 -> 0.8.6 uhubctl: upgrade 2.2.0 -> 2.3.0 xserver-xorg-cvt-native: upgrade 1.20.9 -> 1.20.10 zchunk: upgrade 1.1.7 -> 1.1.8 libencode-perl: upgrade 3.07 -> 3.08 bridge-utils: upgrade 1.6 -> 1.7 netplan: upgrade 0.100 -> 0.101 opensaf: upgrade 5.20.08 -> 5.20.11 cppzmq: upgrade 4.7.0 -> 4.7.1 gperftools: upgrade 2.8 -> 2.8.1 Signed-off-by: Andrew Geissler Change-Id: I53939ad487155ca87e27cfd77d65962458d892e0 --- .../recipes-filesystems/yaffs2/yaffs2-utils_git.bb | 2 +- .../recipes-support/fuse/fuse3_3.10.0.bb | 61 ---- .../recipes-support/fuse/fuse3_3.10.1.bb | 61 ++++ ...-Use-srcdir-prefix-to-denote-include-path.patch | 29 -- .../recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb | 19 -- .../recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb | 19 ++ .../dracut/0001-dracut.sh-improve-udevdir.patch | 39 --- .../dracut/0001-set-viriable-_drv-not-local.patch | 69 ----- .../recipes-devtools/dracut/dracut_git.bb | 7 +- .../recipes-connectivity/gupnp/gssdp_1.2.2.bb | 20 -- .../recipes-connectivity/gupnp/gssdp_1.2.3.bb | 20 ++ .../recipes-connectivity/gupnp/gupnp_1.2.2.bb | 8 - .../recipes-connectivity/gupnp/gupnp_1.2.4.bb | 8 + .../recipes-multimedia/fluidsynth/fluidsynth.inc | 4 +- .../recipes-connectivity/blueman/blueman_2.1.3.bb | 59 ---- .../recipes-connectivity/blueman/blueman_2.1.4.bb | 59 ++++ ...x-incorrect-EOF-check-in-ssl_context_info.patch | 57 ---- .../recipes-connectivity/mbedtls/mbedtls_2.24.0.bb | 45 --- .../recipes-connectivity/mbedtls/mbedtls_2.25.0.bb | 43 +++ .../netplan/0001-dbus-Remove-unused-variabes.patch | 22 +- ...1-don-t-fail-if-GLOB_BRACE-is-not-defined.patch | 30 ++ ...akefile-Exclude-.h-files-from-target-rule.patch | 16 +- .../recipes-connectivity/netplan/netplan_0.100.bb | 61 ---- .../recipes-connectivity/netplan/netplan_0.101.bb | 62 ++++ .../networkmanager/fix_reallocarray_check.patch | 27 ++ .../networkmanager/networkmanager_1.22.14.bb | 1 + .../samba/samba/CVE-2020-14318.patch | 142 +++++++++ .../samba/samba/CVE-2020-14383.patch | 112 +++++++ .../recipes-connectivity/samba/samba_4.10.18.bb | 2 + ...verseWords-available-for-big-and-little-e.patch | 32 -- .../recipes-connectivity/wolfssl/wolfssl_4.5.0.bb | 23 -- .../recipes-connectivity/wolfssl/wolfssl_4.6.0.bb | 22 ++ .../cyrus-sasl/cyrus-sasl_2.1.27.bb | 2 +- ...iusr-Compare-with-max-int-instead-of-max-.patch | 48 --- .../iscsi-initiator-utils_2.1.2.bb | 118 -------- .../iscsi-initiator-utils_2.1.3.bb | 117 ++++++++ .../recipes-daemons/opensaf/opensaf_5.20.08.bb | 78 ----- .../recipes-daemons/opensaf/opensaf_5.20.11.bb | 78 +++++ .../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 2 +- .../recipes-daemons/vblade/files/cross.patch | 4 +- .../recipes-daemons/vblade/files/gcc-10.patch | 85 ------ .../vblade/files/makefile-add-ldflags.patch | 2 +- .../recipes-daemons/vblade/vblade_24.bb | 56 ---- .../recipes-daemons/vblade/vblade_25.bb | 55 ++++ .../recipes-devtools/python/python3-ldap_3.2.0.bb | 31 -- .../recipes-devtools/python/python3-ldap_3.3.1.bb | 31 ++ .../0001-add-RARP-and-update-iana-url.patch | 45 --- .../0002-fix-compilation-warning.patch | 25 -- .../0003-add-info-about-Wl-no-as-needed.patch | 25 -- ...for-kernel-regression-bug-IPv6-source-des.patch | 28 -- ...-command-line-support-for-ebtables-restor.patch | 75 ----- ...-IPv6-mask-if-it-s-all-ones-based-on-patc.patch | 69 ----- .../0007-extensions-Use-stdint-types.patch | 67 ----- ...h-Remove-C-specific-compiler-hint-macro-_.patch | 48 --- ...low-RETURN-target-rules-in-user-defined-c.patch | 48 --- .../0010-Adjust-header-include-sequence.patch | 216 -------------- .../ebtables-2.0.10-4/01debian_defaultconfig.patch | 50 ---- .../ebtables/ebtables-2.0.10-4/ebtables-save | 43 --- .../ebtables/ebtables-2.0.10-4/ebtables.common | 163 ----------- .../ebtables/ebtables-2.0.10-4/ebtables.init | 26 -- .../ebtables/ebtables-2.0.10-4/ebtables.service | 11 - .../ebtables-2.0.10-4/installnonroot.patch | 43 --- .../ebtables/ebtables-2.0.10-4/no-as-needed.patch | 25 -- ...Makefile.am-do-not-install-etc-ethertypes.patch | 34 +++ .../0010-Adjust-header-include-sequence.patch | 84 ++++++ .../ebtables/ebtables-2.0.11/ebtables-legacy-save | 43 +++ .../ebtables/ebtables-2.0.11/ebtables.common | 163 +++++++++++ .../ebtables/ebtables-2.0.11/ebtables.service | 11 + .../recipes-filter/ebtables/ebtables_2.0.10-4.bb | 114 -------- .../recipes-filter/ebtables/ebtables_2.0.11.bb | 53 ++++ .../bridge-utils/bridge-utils_1.6.bb | 35 --- .../bridge-utils/bridge-utils_1.7.bb | 35 +++ .../0001-waf-add-support-of-cross_compile.patch | 62 ---- .../libtalloc/avoid-attr-unless-wanted.patch | 15 +- .../libtalloc/libtalloc/options-2.2.0.patch | 25 +- .../recipes-support/libtalloc/libtalloc_2.3.0.bb | 54 ---- .../recipes-support/libtalloc/libtalloc_2.3.1.bb | 53 ++++ .../0001-waf-add-support-of-cross_compile.patch | 62 ---- .../libtevent/avoid-attr-unless-wanted.patch | 24 +- .../libtevent/libtevent/options-0.10.0.patch | 25 +- .../recipes-support/libtevent/libtevent_0.10.1.bb | 58 ---- .../recipes-support/libtevent/libtevent_0.10.2.bb | 57 ++++ .../recipes-support/openipmi/openipmi_2.0.29.bb | 112 ------- .../recipes-support/openipmi/openipmi_2.0.30.bb | 112 +++++++ .../recipes-support/rdma-core/rdma-core_32.0.bb | 44 --- .../recipes-support/rdma-core/rdma-core_33.0.bb | 42 +++ .../recipes-support/tcpdump/tcpdump_4.9.3.bb | 2 + .../recipes-support/traceroute/traceroute_2.1.0.bb | 2 +- meta-openembedded/meta-oe/conf/layer.conf | 2 + .../packagegroups/packagegroup-meta-oe.bbappend | 3 + .../openbox/openbox-xdgmenu/7_6.diff | 13 + .../openbox-xdgmenu/fix-menu-generation.patch | 27 ++ .../openbox-xdgmenu/port-gnome-menus3.patch | 184 ++++++++++++ .../openbox/openbox-xdgmenu_0.3.bb | 36 +++ .../meta-oe/recipes-benchmark/fio/fio_3.24.bb | 45 --- .../meta-oe/recipes-benchmark/fio/fio_3.25.bb | 45 +++ .../files/0003-fix-precision-handling-bugs.patch | 138 +++++++++ .../recipes-benchmark/glmark2/glmark2_git.bb | 1 + ...t-CFLAGS-LDFLAGS-to-append-values-passed-.patch | 2 +- .../meta-oe/recipes-connectivity/ace/ace_6.5.10.bb | 42 --- .../meta-oe/recipes-connectivity/ace/ace_6.5.12.bb | 42 +++ .../meta-oe/recipes-connectivity/iwd/iwd_1.10.bb | 54 ++++ .../meta-oe/recipes-connectivity/iwd/iwd_1.9.bb | 54 ---- .../paho-mqtt-c/paho-mqtt-c_1.3.7.bb | 34 --- .../paho-mqtt-c/paho-mqtt-c_1.3.8.bb | 34 +++ .../zabbix/zabbix/CVE-2020-15803.patch | 36 +++ .../recipes-connectivity/zabbix/zabbix_4.4.6.bb | 1 + .../recipes-connectivity/zeromq/cppzmq_git.bb | 6 +- .../meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb | 26 ++ .../dbus-cxx/files/fix_build_musl.patch | 26 ++ .../meta-oe/recipes-core/opencl/ocl-icd_git.bb | 4 +- .../recipes-core/opencl/opencl-clhpp_git.bb | 4 +- .../recipes-core/opencl/opencl-headers_git.bb | 4 +- .../recipes-core/opencl/opencl-icd-loader_git.bb | 4 +- .../packagegroups/packagegroup-meta-oe.bb | 7 + .../0001-meson-Fix-reallocarray-check.patch | 25 ++ .../sdbus-c++/sdbus-c++-libsystemd_243.bb | 1 + .../files/0001-Improve-reproducibility.patch | 20 +- .../meta-oe/recipes-dbs/postgresql/postgresql.inc | 2 +- .../recipes-dbs/postgresql/postgresql_12.4.bb | 11 - .../recipes-dbs/postgresql/postgresql_13.1.bb | 11 + .../10-adbd-configfs.conf | 4 + .../android-gadget-cleanup | 24 ++ .../android-gadget-setup | 35 +++ .../android-gadget-start | 7 + .../android-tools-conf-configfs_1.0.bb | 35 +++ .../android-tools/android-tools-conf_1.0.bb | 7 + .../android-tools/android-tools_5.1.1.r37.bb | 13 +- .../flatbuffers/flatbuffers_1.12.0.bb | 12 +- .../mcpp/files/CVE-2019-14274.patch | 34 +++ .../recipes-devtools/mcpp/files/ice-mcpp.patch | 31 -- .../meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb | 3 +- .../recipes-devtools/nodejs/nodejs_12.19.0.bb | 161 ----------- .../recipes-devtools/nodejs/nodejs_12.20.1.bb | 161 +++++++++++ .../recipes-devtools/php/php/CVE-2020-7069.patch | 158 ++++++++++ .../recipes-devtools/php/php/CVE-2020-7070.patch | 24 ++ .../meta-oe/recipes-devtools/php/php_7.4.9.bb | 2 + .../recipes-devtools/pugixml/pugixml_1.11.2.bb | 25 ++ .../recipes-devtools/pugixml/pugixml_1.11.bb | 25 -- .../meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb | 4 +- .../meta-oe/recipes-extended/beep/beep_1.2.2.bb | 25 -- .../meta-oe/recipes-extended/beep/beep_1.4.9.bb | 32 ++ ...se-Werror-as-it-fails-with-newer-clang-11.patch | 63 ++++ .../recipes-extended/bitwise/bitwise_0.41.bb | 24 ++ ...-Fix-build-when-build-dir-is-not-same-as-.patch | 29 ++ .../recipes-extended/dumb-init/dumb-init_1.2.2.bb | 15 - .../recipes-extended/dumb-init/dumb-init_1.2.5.bb | 15 + .../recipes-extended/haveged/haveged_1.9.13.bb | 47 --- .../recipes-extended/haveged/haveged_1.9.14.bb | 47 +++ .../linuxconsole/linuxconsole_1.7.0.bb | 37 ++- .../meta-oe/recipes-extended/redis/redis_6.0.8.bb | 69 ----- .../meta-oe/recipes-extended/redis/redis_6.0.9.bb | 67 +++++ .../smartmontools/smartmontools_7.1.bb | 52 ---- .../smartmontools/smartmontools_7.2.bb | 52 ++++ .../recipes-extended/socketcan/can-utils_git.bb | 4 +- .../meta-oe/recipes-graphics/feh/feh_3.6.1.bb | 31 ++ .../meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 39 +++ .../recipes-graphics/jasper/jasper_2.0.23.bb | 24 -- .../recipes-graphics/jasper/jasper_2.0.24.bb | 24 ++ .../recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb | 2 +- .../meta-oe/recipes-graphics/openbox/obconf_git.bb | 33 +++ ...fixed-include-dir-to-usr-include-.-Obviou.patch | 36 +++ .../openjpeg/openjpeg/CVE-2020-15389.patch | 51 ---- .../openjpeg/openjpeg/CVE-2020-6851.patch | 36 --- .../openjpeg/openjpeg/CVE-2020-8112.patch | 50 ---- .../recipes-graphics/openjpeg/openjpeg_2.3.1.bb | 23 -- .../recipes-graphics/openjpeg/openjpeg_2.4.0.bb | 21 ++ .../terminus-font/terminus-font_4.48.bb | 45 --- .../terminus-font/terminus-font_4.49.1.bb | 45 +++ .../meta-oe/recipes-graphics/xorg-app/xterm_353.bb | 36 --- .../meta-oe/recipes-graphics/xorg-app/xterm_362.bb | 48 +++ .../recipes-multimedia/live555/live555_20201105.bb | 62 ---- .../recipes-multimedia/live555/live555_20210101.bb | 62 ++++ .../recipes-navigation/geoclue/geoclue_2.5.6.bb | 47 --- .../recipes-navigation/geoclue/geoclue_2.5.7.bb | 47 +++ .../meta-oe/recipes-shells/dash/dash_0.5.11.2.bb | 27 -- .../meta-oe/recipes-shells/dash/dash_0.5.11.3.bb | 27 ++ .../meta-oe/recipes-support/asio/asio_1.18.0.bb | 29 -- .../meta-oe/recipes-support/asio/asio_1.18.1.bb | 29 ++ .../c-periphery/c-periphery_2.2.5.bb | 21 -- .../c-periphery/c-periphery_2.3.0.bb | 21 ++ .../recipes-support/cpprest/cpprest_2.10.16.bb | 19 -- .../recipes-support/cpprest/cpprest_2.10.17.bb | 19 ++ .../recipes-support/gperftools/gperftools_2.8.1.bb | 50 ++++ .../recipes-support/gperftools/gperftools_2.8.bb | 50 ---- .../meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 +- .../libmicrohttpd/libmicrohttpd_0.9.71.bb | 30 -- .../libmicrohttpd/libmicrohttpd_0.9.72.bb | 30 ++ ...ost-enviroment-to-decide-if-a-test-is-bui.patch | 46 +++ .../recipes-support/libssh2/files/run-ptest | 2 +- .../recipes-support/libssh2/libssh2_1.9.0.bb | 11 +- ...h-uevent.c-fix-error-handling-for-udev_mo.patch | 39 +++ .../multipath-tools/multipath-tools_0.8.4.bb | 1 + .../meta-oe/recipes-support/nano/nano_5.3.bb | 21 -- .../meta-oe/recipes-support/nano/nano_5.4.bb | 21 ++ .../meta-oe/recipes-support/nss/nss_3.59.bb | 271 ----------------- .../meta-oe/recipes-support/nss/nss_3.60.bb | 271 +++++++++++++++++ .../recipes-support/openct/openct_0.6.20.bb | 33 +-- ...o-not-add-native-paths-to-pkgconfig-searc.patch | 36 +++ .../recipes-support/pidgin/pidgin-sipe_1.25.0.bb | 1 + ...0001-Do-not-overwrite-all-our-build-flags.patch | 17 +- .../recipes-support/poppler/poppler_20.11.0.bb | 51 ---- .../recipes-support/poppler/poppler_20.12.1.bb | 51 ++++ .../meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb | 22 -- .../meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb | 22 ++ .../recipes-support/spitools/spitools_git.bb | 4 +- .../recipes-support/syslog-ng/syslog-ng.inc | 2 +- .../recipes-support/uhubctl/uhubctl_2.2.0.bb | 21 -- .../recipes-support/uhubctl/uhubctl_2.3.0.bb | 21 ++ .../meta-oe/recipes-support/uthash/uthash_2.1.0.bb | 46 --- .../meta-oe/recipes-support/uthash/uthash_2.2.0.bb | 46 +++ ...tions-linux-drm-Adjustment-for-Linux-5.10.patch | 321 +++++++++++++++++++++ ...obj-r0drv-linux.c-Changes-to-support-the-.patch | 119 ++++++++ ...sf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch | 46 +++ .../vboxguestdrivers/vboxguestdrivers_6.1.16.bb | 3 + ...piler-warnings-about-snprintf-truncations.patch | 28 ++ .../0001-correct-the-location-of-errno.h.patch | 30 ++ ...cv-doesn-t-require-pointers-to-be-aligned.patch | 28 ++ .../meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb | 97 ------- .../meta-oe/recipes-support/xrdp/xrdp_0.9.14.bb | 96 ++++++ .../xserver-xorg-cvt-native_1.20.10.bb | 41 +++ .../xserver-xorg-cvt-native_1.20.9.bb | 41 --- .../recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb | 17 ++ .../meta-oe/recipes-support/zchunk/zchunk_1.1.7.bb | 22 -- .../meta-oe/recipes-support/zchunk/zchunk_1.1.8.bb | 22 ++ .../recipes-perl/libencode/libencode-perl_3.07.bb | 106 ------- .../recipes-perl/libencode/libencode-perl_3.08.bb | 106 +++++++ .../recipes-perl/libnet/libnet-ldap-perl_0.66.bb | 45 --- .../recipes-perl/libnet/libnet-ldap-perl_0.67.bb | 45 +++ .../recipes-devtools/python/python3-aenum_2.2.4.bb | 11 - .../recipes-devtools/python/python3-aenum_2.2.6.bb | 11 + .../python/python3-argcomplete_1.12.1.bb | 18 -- .../python/python3-argcomplete_1.12.2.bb | 17 ++ .../0001-rtrip.py-convert-to-python3.patch | 36 +++ .../recipes-devtools/python/python3-astor_0.8.1.bb | 4 +- .../python/python3-autobahn_20.12.3.bb | 24 ++ .../python/python3-autobahn_20.7.1.bb | 24 -- .../recipes-devtools/python/python3-babel_2.8.0.bb | 27 -- .../recipes-devtools/python/python3-babel_2.9.0.bb | 26 ++ .../python/python3-bandit_1.6.2.bb | 14 - .../python/python3-bandit_1.7.0.bb | 14 + .../python/python3-cachetools_4.1.1.bb | 29 -- .../python/python3-cachetools_4.2.0.bb | 33 +++ .../python/python3-cantools_35.5.0.bb | 13 - .../python/python3-cantools_36.1.0.bb | 13 + .../python/python3-chardet_3.0.4.bb | 24 -- .../python/python3-chardet_4.0.0.bb | 23 ++ .../python/python3-croniter_0.3.36.bb | 12 - .../python/python3-croniter_0.3.37.bb | 12 + .../python/python3-fasteners_0.15.bb | 9 - .../python/python3-fasteners_0.16.bb | 8 + .../recipes-devtools/python/python3-gmqtt_0.6.8.bb | 20 -- .../recipes-devtools/python/python3-gmqtt_0.6.9.bb | 19 ++ .../python/python3-humanfriendly_8.2.bb | 25 -- .../python/python3-humanfriendly_9.1.bb | 24 ++ .../python/python3-humanize_3.1.0.bb | 20 -- .../python/python3-humanize_3.2.0.bb | 19 ++ .../recipes-devtools/python/python3-idna_2.8.bb | 2 - .../python/python3-jsonpatch_1.26.bb | 11 - .../python/python3-jsonpatch_1.28.bb | 10 + .../python/python3-luma-core_2.0.1.bb | 19 -- .../python/python3-luma-core_2.2.0.bb | 19 ++ .../python/python3-matplotlib_3.3.2.bb | 2 + .../python/python3-multidict_5.0.0.bb | 25 -- .../python/python3-multidict_5.1.0.bb | 24 ++ .../python/python3-natsort_7.0.1.bb | 11 - .../python/python3-natsort_7.1.0.bb | 11 + .../python/python3-nocasedict_1.0.1.bb | 9 - .../python/python3-nocasedict_1.0.2.bb | 8 + .../python/python3-nocaselist_1.0.3.bb | 9 - .../python/python3-nocaselist_1.0.4.bb | 8 + .../python/python3-pandas_1.1.4.bb | 25 -- .../python/python3-pandas_1.2.0.bb | 24 ++ .../python/python3-prompt-toolkit_3.0.8.bb | 24 -- .../python/python3-prompt-toolkit_3.0.9.bb | 23 ++ .../python/python3-psutil_5.7.3.bb | 25 -- .../python/python3-psutil_5.8.0.bb | 24 ++ .../python/python3-pychromecast_7.5.1.bb | 11 - .../python/python3-pychromecast_7.7.1.bb | 10 + .../python/python3-pymongo_3.11.0.bb | 31 -- .../python/python3-pymongo_3.11.2.bb | 30 ++ .../python/python3-pytest-metadata_1.10.0.bb | 18 -- .../python/python3-pytest-metadata_1.11.0.bb | 17 ++ .../python/python3-requests_2.24.0.bb | 28 -- .../python/python3-requests_2.25.1.bb | 25 ++ .../python/python3-sentry-sdk_0.19.1.bb | 12 - .../python/python3-sentry-sdk_0.19.5.bb | 11 + .../python/python3-smbus2_0.3.0.bb | 19 -- .../python/python3-smbus2_0.4.0.bb | 18 ++ .../python/python3-soupsieve_2.0.1.bb | 26 -- .../python/python3-soupsieve_2.1.bb | 25 ++ .../python/python3-sqlalchemy_1.3.20.bb | 20 -- .../python/python3-sqlalchemy_1.3.22.bb | 19 ++ .../python/python3-stevedore_3.2.2.bb | 15 - .../python/python3-stevedore_3.3.0.bb | 14 + .../recipes-devtools/python/python3-sympy_1.6.2.bb | 16 - .../recipes-devtools/python/python3-sympy_1.7.1.bb | 15 + .../python/python3-transitions_0.8.5.bb | 9 - .../python/python3-transitions_0.8.6.bb | 9 + .../recipes-devtools/python/python3-twine_3.2.0.bb | 15 - .../recipes-devtools/python/python3-twine_3.3.0.bb | 14 + .../python/python3-txaio_20.12.1.bb | 14 + .../python/python3-txaio_20.4.1.bb | 14 - .../python/python3-watchdog_0.10.3.bb | 19 -- .../python/python3-watchdog_1.0.2.bb | 18 ++ .../python/python3-wrapt_1.12.1.bb | 2 + .../recipes-httpd/nginx/nginx_1.16.1.bb | 6 - .../recipes-httpd/nginx/nginx_1.17.8.bb | 10 - .../recipes-httpd/nginx/nginx_1.18.0.bb | 6 + .../recipes-httpd/nginx/nginx_1.19.6.bb | 10 + .../recipes-php/phpmyadmin/phpmyadmin_5.0.2.bb | 41 --- .../recipes-php/phpmyadmin/phpmyadmin_5.0.4.bb | 41 +++ .../recipes-apps/mousepad/mousepad_0.4.2.bb | 16 - .../recipes-apps/mousepad/mousepad_0.5.1.bb | 16 + .../not-create-link-to-locale.patch | 6 +- .../xfce4-panel-profiles_1.0.10.bb | 30 -- .../xfce4-panel-profiles_1.0.12.bb | 29 ++ .../xfce4-screensaver/fix-pam-config.patch | 14 - .../xfce4-screensaver/xfce4-screensaver_0.1.10.bb | 27 -- .../xfce4-screensaver/xfce4-screensaver_4.16.0.bb | 24 ++ .../xfce4-screenshooter_1.9.7.bb | 22 -- .../xfce4-screenshooter_1.9.8.bb | 21 ++ .../xfce4-taskmanager/xfce4-taskmanager_1.2.3.bb | 10 - .../xfce4-taskmanager/xfce4-taskmanager_1.4.0.bb | 9 + .../xfce4-terminal/xfce4-terminal_0.8.10.bb | 13 + .../xfce4-terminal/xfce4-terminal_0.8.9.2.bb | 14 - .../calculator/xfce4-calculator-plugin_0.7.0.bb | 9 - .../calculator/xfce4-calculator-plugin_0.7.1.bb | 8 + .../closebutton/xfce4-closebutton-plugin_git.bb | 8 +- .../cpugraph/xfce4-cpugraph-plugin_1.1.0.bb | 9 - .../cpugraph/xfce4-cpugraph-plugin_1.2.0.bb | 8 + .../datetime/xfce4-datetime-plugin_0.8.0.bb | 9 - .../datetime/xfce4-datetime-plugin_0.8.1.bb | 8 + .../diskperf/xfce4-diskperf-plugin_2.6.2.bb | 10 - .../diskperf/xfce4-diskperf-plugin_2.6.3.bb | 9 + .../embed/xfce4-embed-plugin_1.6.0.bb | 12 - .../equake/xfce4-equake-plugin_1.3.8.1.bb | 14 - .../fsguard/xfce4-fsguard-plugin_1.1.1.bb | 9 - .../fsguard/xfce4-fsguard-plugin_1.1.2.bb | 8 + .../genmon/xfce4-genmon-plugin_4.0.2.bb | 9 - .../genmon/xfce4-genmon-plugin_4.1.0.bb | 8 + ...1-CMakeLists.txt-fix-library-install-path.patch | 39 --- .../hotcorner/xfce4-hotcorner-plugin_0.0.2.bb | 14 - .../0001-check-for-fstab.h-during-configure.patch | 30 +- .../mount/xfce4-mount-plugin_1.1.3.bb | 11 - .../mount/xfce4-mount-plugin_1.1.5.bb | 11 + ...atus-icon.c-remove-deprecated-g_type_init.patch | 32 -- .../notes/files/01_fix_format-string.patch | 53 ---- .../notes/xfce4-notes-plugin_1.8.1.bb | 20 -- ...multiple-definition-errors-under-GCC-10.0.patch | 118 -------- .../sensors/xfce4-sensors-plugin_1.3.92.bb | 28 -- .../sensors/xfce4-sensors-plugin_1.3.95.bb | 25 ++ .../xfce4-smartbookmark-plugin_0.5.1.bb | 9 - .../xfce4-smartbookmark-plugin_0.5.2.bb | 8 + .../systemload/xfce4-systemload-plugin_1.2.3.bb | 11 - .../systemload/xfce4-systemload-plugin_1.2.4.bb | 10 + .../verve/xfce4-verve-plugin_2.0.0.bb | 9 - .../verve/xfce4-verve-plugin_2.0.1.bb | 8 + .../wavelan/xfce4-wavelan-plugin_0.6.1.bb | 9 - .../wavelan/xfce4-wavelan-plugin_0.6.2.bb | 8 + .../whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb | 11 - .../whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb | 10 + .../xkb/xfce4-xkb-plugin_0.8.1.bb | 16 - .../xkb/xfce4-xkb-plugin_0.8.2.bb | 15 + .../meta-xfce/recipes-xfce/exo/exo_0.12.11.bb | 41 --- .../meta-xfce/recipes-xfce/exo/exo_4.16.0.bb | 24 ++ .../meta-xfce/recipes-xfce/garcon/garcon_0.7.0.bb | 17 -- .../meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb | 20 ++ ...-private-xfce4-keyboard-shortcuts.xml-fix.patch | 2 +- .../recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb | 34 --- .../recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb | 25 ++ .../libxfce4util/libxfce4util_4.14.0.bb | 10 - .../libxfce4util/libxfce4util_4.16.0.bb | 9 + .../packagegroups/packagegroup-xfce-extended.bb | 4 - .../thunar-volman/thunar-volman_0.9.5.bb | 17 -- .../thunar-volman/thunar-volman_4.16.0.bb | 16 + .../meta-xfce/recipes-xfce/thunar/thunar_1.8.15.bb | 29 -- .../meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb | 28 ++ .../recipes-xfce/tumbler/tumbler_0.3.1.bb | 30 -- .../recipes-xfce/tumbler/tumbler_4.16.0.bb | 30 ++ .../xfce4-appfinder/xfce4-appfinder_4.14.0.bb | 14 - .../xfce4-appfinder/xfce4-appfinder_4.16.0.bb | 13 + .../0001-Run-native-xdt-csource-on-tests.patch | 33 +++ .../xfce4-dev-tools/xfce4-dev-tools_4.14.0.bb | 23 -- .../xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb | 25 ++ .../recipes-xfce/xfce4-panel/xfce4-panel_4.14.4.bb | 41 --- .../recipes-xfce/xfce4-panel/xfce4-panel_4.16.0.bb | 40 +++ .../xfce4-power-manager_1.6.6.bb | 43 --- .../xfce4-power-manager_4.16.0.bb | 42 +++ .../xfce4-session/xfce4-session_4.14.2.bb | 40 --- .../xfce4-session/xfce4-session_4.16.0.bb | 37 +++ .../xfce4-settings/xfce4-settings_4.14.3.bb | 33 --- .../xfce4-settings/xfce4-settings_4.16.0.bb | 30 ++ .../meta-xfce/recipes-xfce/xfconf/xfconf_4.14.3.bb | 20 -- .../meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb | 19 ++ .../recipes-xfce/xfdesktop/xfdesktop_4.14.2.bb | 17 -- .../recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb | 16 + ...ositor-Revert-to-GLX-as-default-vblank-me.patch | 92 ------ .../meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb | 38 --- .../meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb | 37 +++ 400 files changed, 6809 insertions(+), 6414 deletions(-) delete mode 100644 meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.0.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.1.bb delete mode 100644 meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch delete mode 100644 meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb delete mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch delete mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.3.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.4.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.3.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.4.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/fix-incorrect-EOF-check-in-ssl_context_info.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.24.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.100.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.101.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14318.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14383.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-e.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.5.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.6.0.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/vblade/files/gcc-10.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_24.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb delete mode 100644 meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.2.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.3.1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch delete mode 100755 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables-save delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common delete mode 100755 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.service delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/no-as-needed.patch create mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch create mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0010-Adjust-header-include-sequence.patch create mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save create mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.common create mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.service delete mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-waf-add-support-of-cross_compile.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-waf-add-support-of-cross_compile.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.30.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_32.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_33.0.bb create mode 100644 meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend create mode 100644 meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff create mode 100644 meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch create mode 100644 meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch create mode 100644 meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.24.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.25.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/CVE-2020-15803.patch create mode 100644 meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch create mode 100644 meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf create mode 100644 meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup create mode 100644 meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup create mode 100644 meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start create mode 100644 meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.20.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7069.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7070.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/beep/beep_1.2.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/beep/files/0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.41.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/bitwise/files/0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.23.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.24.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-15389.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_353.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_362.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20201105.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210101.bb delete mode 100644 meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb delete mode 100644 meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.17.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_5.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss_3.59.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.11.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.14.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.9.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.8.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.07.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.08.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.66.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.67.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-astor/0001-rtrip.py-convert-to-python3.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.12.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.7.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.8.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.9.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.6.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.5.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_4.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.36.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.37.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.16.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_8.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.8.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.26.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.28.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.8.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.10.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.11.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.24.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.25.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.20.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.22.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.2.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.7.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_20.12.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_20.4.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_0.10.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_1.0.2.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.2.bb create mode 100644 meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.4.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.10.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.10.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.3.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.4.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.1.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.3.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.6.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.1.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin/0001-CMakeLists.txt-fix-library-install-path.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.3.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.95.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.3.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.4.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.2.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.11.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.7.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.14.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.5.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.15.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.3.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.14.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-Run-native-xdt-csource-on-tests.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.14.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.4.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.3.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.3.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.14.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb index 7ecae4c1c8..bd0886d671 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb @@ -19,7 +19,7 @@ SRC_URI = "git://www.aleph1.co.uk/yaffs2;protocol=git;branch=master \ file://0001-define-loff_t-if-not-already-defined.patch \ " -SRCREV = "b4ce1bb1b46accb1619dc07164ef6945feded9db" +SRCREV = "9a6f486e56f927eeb8dc7e4e0d84f6bb95eeaa0f" UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.0.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.0.bb deleted file mode 100644 index c8680d9508..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.0.bb +++ /dev/null @@ -1,61 +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[sha256sum] = "26517954567f237a7dbcb532755ba0d2c77575c5d90db7566b6e40ec05b0a039" - -S = "${WORKDIR}/fuse-${PV}" - -UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" -UPSTREAM_CHECK_REGEX = "fuse\-(?P3(\.\d+)+).tar.xz" - -inherit meson pkgconfig ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - bash \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/test - cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ -} - -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.10.1.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.1.bb new file mode 100644 index 0000000000..80ce028722 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.1.bb @@ -0,0 +1,61 @@ +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] = "d82d74d4c03e099f806e4bb31483955637c69226576bf0ca9bd142f1d50ae451" + +S = "${WORKDIR}/fuse-${PV}" + +UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" +UPSTREAM_CHECK_REGEX = "fuse\-(?P3(\.\d+)+).tar.xz" + +inherit meson pkgconfig ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + bash \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ +} + +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-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch deleted file mode 100644 index 0a3261b4e7..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0fb9d6bc25e903f7831a38468845ea143fb5afd5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 11 Aug 2018 18:49:03 -0700 -Subject: [PATCH] f2fs-tools: Use srcdir prefix to denote include path - -This helps builds when builddir != srcdir - -Upstream-Status: Submitted [https://lkml.org/lkml/2018/8/12/1] -Signed-off-by: Khem Raj ---- - tools/sg_write_buffer/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/sg_write_buffer/Makefile.am b/tools/sg_write_buffer/Makefile.am -index 922c328..19c438d 100644 ---- a/tools/sg_write_buffer/Makefile.am -+++ b/tools/sg_write_buffer/Makefile.am -@@ -1,7 +1,7 @@ - ## Makefile.am - - if LINUX --AM_CPPFLAGS = -I./include -+AM_CPPFLAGS = -I$(srcdir)/include - AM_CFLAGS = -Wall - sbin_PROGRAMS = sg_write_buffer - sg_write_buffer_SOURCES = sg_write_buffer.c \ --- -2.18.0 - diff --git a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb deleted file mode 100644 index 98bd478f32..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Tools for Flash-Friendly File System (F2FS)" -HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" - -# to provide libuuid -DEPENDS = "util-linux" - -# v1.13.0 -SRCREV = "284f77f0075a16a2ad1f3b0fb89b7f64a1bc755d" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ - file://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \ - " -S = "${WORKDIR}/git" - -inherit pkgconfig autotools - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb new file mode 100644 index 0000000000..d0b299f0b3 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Tools for Flash-Friendly File System (F2FS)" +HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" + +# to provide libuuid +DEPENDS = "util-linux" + +SRCREV = "d41dcbdf46dc3841cd0a0507e6573e38cb6c55bb" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ + " +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch deleted file mode 100644 index 06e0a094f9..0000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 974f728410052bc8fa18d93dc0c1a991bcdb96e6 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Wed, 3 Apr 2019 15:24:47 +0800 -Subject: [PATCH] dracut.sh: improve udevdir - -In commit [9d1b81c dracut.sh: improve udevdir and systemdutildir -fallback logic], it checked a common binary `collect' to localte -udevdir. - -But upstream systemd drop binary `collect'. -[https://github.com/systemd/systemd/commit/a168792c2d95695fd30c0371d4b3890a9df1eafb] - -So check binary `ata_id' to instead. - -Upstream-Status: Submitted [https://github.com/dracutdevs/dracut/pull/558] - -Signed-off-by: Hongxu Jia ---- - dracut.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index 3dc2adc..cc8b01a 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1311,8 +1311,8 @@ done - [[ -d $udevdir ]] \ - || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)" - if ! [[ -d "$udevdir" ]]; then -- [[ -e /lib/udev/collect ]] && udevdir=/lib/udev -- [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev -+ [[ -e /lib/udev/ata_id ]] && udevdir=/lib/udev -+ [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev - fi - - [[ -d $systemdutildir ]] \ --- -2.7.4 - diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch deleted file mode 100644 index 13d2cfa877..0000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-set-viriable-_drv-not-local.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 6e0da103effe64832eea52fad5c44a328f7141b7 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 20 Jun 2019 17:31:11 +0800 -Subject: [PATCH] set viriable _drv not local - -If shebang is set to /bin/sh and /bin/sh is a symlink to /bin/bash, -bash turn on posix mode. - -Since bash is upgraded to 5.0, it follows 'IEEE 1003.2 POSIX Shell -Standard', to implement 'functions do not have local traps or options, -and it is not possible to define local variables' - -For more detail, see variables.c:push_posix_temp_var in the following commit -http://git.savannah.gnu.org/cgit/bash.git/commit/?id=d233b485e83c3a784b803fb894280773f16f2deb - -The IEEE 1003.2 POSIX Shell Standard: -https://www.cs.ait.ac.th/~on/O/oreilly/unix/ksh/appa_02.htm - -While /bin/sh points to bash 5.0, it caused the following issue: - -$ cat <case.sh -fsck_drv_com(){ - echo "issuing \$_drv" -} - -fsck_able() { - _drv="_drv=e2fsck fsck_drv_com" -} - -fsck_single() { - local _drv - fsck_able - eval "\$_drv" -} -fsck_single -ENDOF -$ chmod a+x case.sh - -Unexpected: -$ ./cash.sh -issuing _drv=e2fsck fsck_drv_com - -Set viriable _drv not local, get expected result: -$ ./case.sh -issuing e2fsck - -Upstream-Status: Submitted [https://github.com/dracutdevs/dracut/pull/587] - -Signed-off-by: Hongxu Jia ---- - modules.d/99fs-lib/fs-lib.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh -index d39ca1b..60877ee 100755 ---- a/modules.d/99fs-lib/fs-lib.sh -+++ b/modules.d/99fs-lib/fs-lib.sh -@@ -142,7 +142,7 @@ fsck_single() { - local _fs="${2:-auto}" - local _fsopts="$3" - local _fop="$4" -- local _drv -+ _drv="" - - [ $# -lt 2 ] && return 255 - # if UUID= marks more than one device, take only the first one --- -2.7.4 - diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index 13cf5f6ded..ce975f5a14 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -6,14 +6,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PE = "1" -PV = "049" +PV = "051" -# v048 tag -SRCREV = "225e4b94cbdb702cf512490dcd2ad9ca5f5b22c1" +SRCREV = "e473057ae1de303340dec297c786c4a701cc61bd" SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http \ file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ - file://0001-dracut.sh-improve-udevdir.patch \ - file://0001-set-viriable-_drv-not-local.patch \ " DEPENDS += "kmod" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb deleted file mode 100644 index ddaddd2094..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Resource discovery and announcement over SSDP" -DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP (Simpe Service Discovery Protocol)." -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -DEPENDS = "glib-2.0 libsoup-2.4" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "f00a470ebcba96f34def8f83ac5891ed" -SRC_URI[sha256sum] = "cabb9e3b456b8354a55e23eb0207545d974643cda6d623523470ebbc4188b0a4" - -GTKDOC_MESON_OPTION = 'gtk_doc' - -inherit meson pkgconfig gobject-introspection vala gtk-doc - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sniffer', '', d)}" -PACKAGECONFIG[sniffer] = "-Dsniffer=true,-Dsniffer=false,gtk+3," - -PACKAGES =+ "gssdp-tools" - -FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.3.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.3.bb new file mode 100644 index 0000000000..7d82c3e2e6 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "Resource discovery and announcement over SSDP" +DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP (Simpe Service Discovery Protocol)." +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" +DEPENDS = "glib-2.0 libsoup-2.4" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "ef3295a965c06ce0f683522391fbb910" +SRC_URI[sha256sum] = "a263dcb6730e3b3dc4bbbff80cf3fab4cd364021981d419db6dd5a8e148aa7e8" + +GTKDOC_MESON_OPTION = 'gtk_doc' + +inherit meson pkgconfig gobject-introspection vala gtk-doc + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sniffer', '', d)}" +PACKAGECONFIG[sniffer] = "-Dsniffer=true,-Dsniffer=false,gtk+3," + +PACKAGES =+ "gssdp-tools" + +FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb deleted file mode 100644 index e603497161..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gupnp.inc - -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "2ade3d29c624ad98d70113e6e93908a5" -SRC_URI[sha256sum] = "9a80bd953e5c8772ad26b72f8da01cbe7241a113edd6084903f413ce751c9989" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.4.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.4.bb new file mode 100644 index 0000000000..c7b330fa00 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.4.bb @@ -0,0 +1,8 @@ +require gupnp.inc + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "7c9c7cd80e36d9fb1e5b0267571fc17d" +SRC_URI[sha256sum] = "f7a0307ea51f5e44d1b832f493dd9045444a3a4e211ef85dfd9aa5dd6eaea7d1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 73c1d0db69..847a22311c 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.1.x" -SRCREV = "6776569abe9a885bcec14141692fa93c0568d51c" +SRCREV = "fd9bf6a6b0d10a984d2eb0e0e549700b7aa590ec" S = "${WORKDIR}/git" -PV = "2.1.5" +PV = "2.1.6" inherit cmake pkgconfig lib_package diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.3.bb deleted file mode 100644 index 9143a67ae8..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.3.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "Blueman is a GTK+ Bluetooth Manager" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "bluez5 python3-pygobject python3-cython-native python3-setuptools-native intltool-native" - -inherit autotools systemd gsettings python3native gtk-icon-cache - -SRC_URI = " \ - https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ - file://0001-Search-for-cython3.patch \ - file://0002-fix-fail-to-enable-bluetooth.patch \ -" -SRC_URI[sha256sum] = "3bd02e0cc9e2c1424df1fc2015da710a280ef4c657515727e47eafabf8c2cfde" - -EXTRA_OECONF = " \ - --disable-appindicator \ - --disable-runtime-deps-check \ - --disable-schemas-compile \ -" - -SYSTEMD_SERVICE_${PN} = "${BPN}-mechanism.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" - -RRECOMENDS_${PN} += "adwaita-icon-theme" -RDEPENDS_${PN} += " \ - python3-core \ - python3-dbus \ - packagegroup-tools-bluetooth \ -" - -PACKAGECONFIG ??= "thunar" -PACKAGECONFIG[thunar] = "--enable-thunar-sendto,--disable-thunar-sendto" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/Thunar \ - ${systemd_user_unitdir} \ - ${exec_prefix}${systemd_system_unitdir} \ - ${PYTHON_SITEPACKAGES_DIR} \ -" - -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_blueman.a" - -# In code, path to python is a variable that is replaced with path to native version of it -# during the configure stage, e.g ../recipe-sysroot-native/usr/bin/python3-native/python3. -# Replace it with #!/usr/bin/env python3 -do_install_append() { - sed -i "1s/.*/#!\/usr\/bin\/env python3/" ${D}${prefix}/libexec/blueman-rfcomm-watcher \ - ${D}${prefix}/libexec/blueman-mechanism \ - ${D}${bindir}/blueman-tray \ - ${D}${bindir}/blueman-services \ - ${D}${bindir}/blueman-sendto \ - ${D}${bindir}/blueman-report \ - ${D}${bindir}/blueman-manager \ - ${D}${bindir}/blueman-assistant \ - ${D}${bindir}/blueman-applet \ - ${D}${bindir}/blueman-adapters -} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.4.bb new file mode 100644 index 0000000000..29bef230e4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.4.bb @@ -0,0 +1,59 @@ +DESCRIPTION = "Blueman is a GTK+ Bluetooth Manager" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "bluez5 python3-pygobject python3-cython-native python3-setuptools-native intltool-native" + +inherit autotools systemd gsettings python3native gtk-icon-cache + +SRC_URI = " \ + https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ + file://0001-Search-for-cython3.patch \ + file://0002-fix-fail-to-enable-bluetooth.patch \ +" +SRC_URI[sha256sum] = "1d9c3d39a564d88851aa8de509f16bfa586b0b50f4307dc6c6347ba4833664da" + +EXTRA_OECONF = " \ + --disable-appindicator \ + --disable-runtime-deps-check \ + --disable-schemas-compile \ +" + +SYSTEMD_SERVICE_${PN} = "${BPN}-mechanism.service" +SYSTEMD_AUTO_ENABLE_${PN} = "disable" + +RRECOMENDS_${PN} += "adwaita-icon-theme" +RDEPENDS_${PN} += " \ + python3-core \ + python3-dbus \ + packagegroup-tools-bluetooth \ +" + +PACKAGECONFIG ??= "thunar" +PACKAGECONFIG[thunar] = "--enable-thunar-sendto,--disable-thunar-sendto" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/Thunar \ + ${systemd_user_unitdir} \ + ${exec_prefix}${systemd_system_unitdir} \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_blueman.a" + +# In code, path to python is a variable that is replaced with path to native version of it +# during the configure stage, e.g ../recipe-sysroot-native/usr/bin/python3-native/python3. +# Replace it with #!/usr/bin/env python3 +do_install_append() { + sed -i "1s/.*/#!\/usr\/bin\/env python3/" ${D}${prefix}/libexec/blueman-rfcomm-watcher \ + ${D}${prefix}/libexec/blueman-mechanism \ + ${D}${bindir}/blueman-tray \ + ${D}${bindir}/blueman-services \ + ${D}${bindir}/blueman-sendto \ + ${D}${bindir}/blueman-report \ + ${D}${bindir}/blueman-manager \ + ${D}${bindir}/blueman-assistant \ + ${D}${bindir}/blueman-applet \ + ${D}${bindir}/blueman-adapters +} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/fix-incorrect-EOF-check-in-ssl_context_info.patch b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/fix-incorrect-EOF-check-in-ssl_context_info.patch deleted file mode 100644 index 836fce91e6..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/fix-incorrect-EOF-check-in-ssl_context_info.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d696e7d91e42a190d06760279d2e396392143454 Mon Sep 17 00:00:00 2001 -From: Nayna Jain -Date: Thu, 13 Aug 2020 19:17:53 +0000 -Subject: [PATCH] programs/ssl: Fix incorrect EOF check in ssl_context_info.c - -In `read_next_b64_code()`, the result of fgetc() is stored into a char, -but later compared against EOF, which is generally -1. On platforms -where char is unsigned, this generates a compiler warning/error that the -comparison will never be true (causing a build failure). The value will -never match, with the function ultimately bailing with a "Too many bad -symbols are detected" error. - -On platforms with signed char, EOF is detected, but a file containing a -0xFF character will causes a premature end of file exit of the loop. - -Fix this by changing the result to an int. - -Fixes #3794. - -Signed-off-by: Nayna Jain -Signed-off-by: David Brown ---- - ChangeLog.d/bugfix_3794.txt | 4 ++++ - programs/ssl/ssl_context_info.c | 4 ++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - create mode 100644 ChangeLog.d/bugfix_3794.txt - -diff --git a/ChangeLog.d/bugfix_3794.txt b/ChangeLog.d/bugfix_3794.txt -new file mode 100644 -index 0000000000..a483ea76ae ---- /dev/null -+++ b/ChangeLog.d/bugfix_3794.txt -@@ -0,0 +1,4 @@ -+Bugfix -+ * Fix handling of EOF against 0xff bytes and on platforms with -+ unsigned chars. Fixes a build failure on platforms where char is -+ unsigned. Fixes #3794. -diff --git a/programs/ssl/ssl_context_info.c b/programs/ssl/ssl_context_info.c -index df8819a804..d109c1e6f7 100644 ---- a/programs/ssl/ssl_context_info.c -+++ b/programs/ssl/ssl_context_info.c -@@ -377,13 +377,13 @@ size_t read_next_b64_code( uint8_t **b64, size_t *max_len ) - int valid_balance = 0; /* balance between valid and invalid characters */ - size_t len = 0; - char pad = 0; -- char c = 0; -+ int c = 0; - - while( EOF != c ) - { - char c_valid = 0; - -- c = (char) fgetc( b64_file ); -+ c = fgetc( b64_file ); - - if( pad > 0 ) - { diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.24.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.24.0.bb deleted file mode 100644 index e3a0169566..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.24.0.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Lightweight crypto and SSL/TLS library" -DESCRIPTION = "mbedtls is a lean open source crypto library \ -for providing SSL and TLS support in your programs. It offers \ -an intuitive API and documented header files, so you can actually \ -understand what the code does. It features: \ - \ - - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4, \ - Camellia and XTEA \ - - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5 \ - - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG \ - - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \ - ECDSA and ECDH \ - - SSL v3 and TLS 1.0, 1.1 and 1.2 \ - - Abstraction layers for ciphers, hashes, public key operations, \ - platform abstraction and threading \ -" - -HOMEPAGE = "https://tls.mbed.org/" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SECTION = "libs" - -S = "${WORKDIR}/git" -SRCREV = "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8" -SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=development \ - file://fix-incorrect-EOF-check-in-ssl_context_info.patch \ -" - -inherit cmake - -PACKAGECONFIG ??= "shared-libs programs" -PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" -PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" - -EXTRA_OECMAKE = "-DENABLE_TESTING=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" - -PROVIDES += "polarssl" -RPROVIDES_${PN} = "polarssl" - -PACKAGES =+ "${PN}-programs" -FILES_${PN}-programs = "${bindir}/" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb new file mode 100644 index 0000000000..27c1b209dc --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb @@ -0,0 +1,43 @@ +SUMMARY = "Lightweight crypto and SSL/TLS library" +DESCRIPTION = "mbedtls is a lean open source crypto library \ +for providing SSL and TLS support in your programs. It offers \ +an intuitive API and documented header files, so you can actually \ +understand what the code does. It features: \ + \ + - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4, \ + Camellia and XTEA \ + - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5 \ + - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG \ + - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \ + ECDSA and ECDH \ + - SSL v3 and TLS 1.0, 1.1 and 1.2 \ + - Abstraction layers for ciphers, hashes, public key operations, \ + platform abstraction and threading \ +" + +HOMEPAGE = "https://tls.mbed.org/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SECTION = "libs" + +S = "${WORKDIR}/git" +SRCREV = "1c54b5410fd48d6bcada97e30cac417c5c7eea67" +SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=development" + +inherit cmake + +PACKAGECONFIG ??= "shared-libs programs" +PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" +PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" + +EXTRA_OECMAKE = "-DENABLE_TESTING=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" + +PROVIDES += "polarssl" +RPROVIDES_${PN} = "polarssl" + +PACKAGES =+ "${PN}-programs" +FILES_${PN}-programs = "${bindir}/" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch index af28ba71e7..407e24ca0e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch @@ -1,6 +1,3 @@ -From e5bd4c3853fb394edc8cbea17fad82ce23bd0fae Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 27 Nov 2020 12:21:32 -0800 Subject: [PATCH 1/2] dbus: Remove unused variabes This issue is seen when using clang to compile it @@ -19,11 +16,13 @@ Signed-off-by: Khem Raj src/parse.c | 1 - 3 files changed, 5 deletions(-) +diff --git a/src/dbus.c b/src/dbus.c +index 9606fea..8e1ed9d 100644 --- a/src/dbus.c +++ b/src/dbus.c -@@ -45,9 +45,6 @@ static int method_apply(sd_bus_message * - - static int method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { +@@ -242,9 +242,6 @@ static int + method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) + { sd_bus_message *reply = NULL; - g_autoptr(GError) err = NULL; - g_autofree gchar *stdout = NULL; @@ -31,9 +30,11 @@ Signed-off-by: Khem Raj gint exit_status = 0; exit_status = sd_bus_message_new_method_return(m, &reply); +diff --git a/src/networkd.c b/src/networkd.c +index 7c86cd6..7200740 100644 --- a/src/networkd.c +++ b/src/networkd.c -@@ -896,7 +896,6 @@ append_wpa_auth_conf(GString* s, const N +@@ -897,7 +897,6 @@ append_wpa_auth_conf(GString* s, const NetplanAuthenticationSettings* auth, cons static void write_wpa_unit(const NetplanNetDefinition* def, const char* rootdir) { @@ -41,9 +42,11 @@ Signed-off-by: Khem Raj g_autofree gchar *stdouth = NULL; stdouth = systemd_escape(def->id); +diff --git a/src/parse.c b/src/parse.c +index 033c657..faca27f 100644 --- a/src/parse.c +++ b/src/parse.c -@@ -1898,7 +1898,6 @@ handle_wireguard_peers(yaml_document_t* +@@ -1899,7 +1899,6 @@ handle_wireguard_peers(yaml_document_t* doc, yaml_node_t* node, const void* _, G } for (yaml_node_item_t *i = node->data.sequence.items.start; i < node->data.sequence.items.top; i++) { @@ -51,3 +54,6 @@ Signed-off-by: Khem Raj yaml_node_t *entry = yaml_document_get_node(doc, *i); assert_type(entry, YAML_MAPPING_NODE); +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch new file mode 100644 index 0000000000..dab8693c71 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch @@ -0,0 +1,30 @@ +From ceb4111af317ecc54d97bb21878dcccbfdb2983e Mon Sep 17 00:00:00 2001 +From: Zang Ruochen +Date: Fri, 25 Dec 2020 11:41:43 +0900 +Subject: [PATCH] don't fail if GLOB_BRACE is not defined + +Signed-off-by: Zang Ruochen +--- + src/util.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/util.c b/src/util.c +index 7e59985..eb8e573 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -23,6 +23,12 @@ + + #include "util.h" + ++/* Don't fail if the standard library ++ * doesn't provide brace expansion */ ++#ifndef GLOB_BRACE ++#define GLOB_BRACE 0 ++#endif ++ + GHashTable* wifi_frequency_24; + GHashTable* wifi_frequency_5; + +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch index cd75d1cb1c..68aabd6a48 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch @@ -1,6 +1,3 @@ -From 5abb6b8343b5d2633844144979b40f398450b544 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 27 Nov 2020 12:22:32 -0800 Subject: [PATCH 2/2] Makefile: Exclude .h files from target rule This ensures that src/_features.h is not added to compiler cmdline which @@ -17,14 +14,19 @@ Signed-off-by: Khem Raj Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/Makefile b/Makefile +index 4fa6bd8..567d326 100644 --- a/Makefile +++ b/Makefile -@@ -47,7 +47,7 @@ generate: libnetplan.so.$(NETPLAN_SOVER) +@@ -46,7 +46,7 @@ generate: libnetplan.so.$(NETPLAN_SOVER) nm.o networkd.o openvswitch.o generate. $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -L. -lnetplan `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` - netplan-dbus: src/dbus.c src/_features.h -- $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --cflags --libs libsystemd glib-2.0` -+ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(patsubst %.h,,$^) `pkg-config --cflags --libs libsystemd glib-2.0` + netplan-dbus: src/dbus.c src/_features.h util.o +- $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0` ++ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(patsubst %.h,,$^) `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0` src/_features.h: src/[^_]*.[hc] printf "#include \nstatic const char *feature_flags[] __attribute__((__unused__)) = {\n" > $@ +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.100.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.100.bb deleted file mode 100644 index 2f74a22c05..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.100.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "The network configuration abstraction renderer" -DESCRIPTION = "Netplan is a utility for easily configuring networking on a \ -linux system. You simply create a YAML description of the required network \ -interfaces and what each should be configured to do. From this description \ -Netplan will generate all the necessary configuration for your chosen renderer \ -tool." -HOMEPAGE = "https://netplan.io" -SECTION = "net/misc" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -S = "${WORKDIR}/git" -SRCREV = "b7d32aebc880f3161b8f97ee56b729c0c54dd0e4" -PV = "0.100+git${SRCPV}" - -SRC_URI = " \ - git://github.com/CanonicalLtd/netplan.git \ - file://0001-dbus-Remove-unused-variabes.patch \ - file://0002-Makefile-Exclude-.h-files-from-target-rule.patch \ -" - -DEPENDS = "glib-2.0 libyaml ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -RDEPENDS_${PN} = "python3 python3-core python3-pyyaml python3-netifaces python3-nose python3-coverage python3-pycodestyle python3-pyflakes util-linux-libuuid libnetplan" - -inherit pkgconfig systemd - -TARGET_CC_ARCH += "${LDFLAGS}" - -EXTRA_OEMAKE = "generate netplan/_features.py" -EXTRA_OEMAKE =+ "${@bb.utils.contains('DISTRO_FEATURES','systemd','netplan-dbus dbus/io.netplan.Netplan.service','',d)}" - -do_install() { - install -d ${D}${sbindir} ${D}${libdir} ${D}${base_libdir}/netplan ${D}${datadir}/netplan/netplan/cli/commands ${D}${sysconfdir}/netplan - install -m 755 ${S}/generate ${D}${base_libdir}/netplan/ - install -m 644 ${S}/netplan/*.py ${D}${datadir}/netplan/netplan - install -m 644 ${S}/netplan/cli/*.py ${D}${datadir}/netplan/netplan/cli - install -m 644 ${S}/netplan/cli/commands/*.py ${D}${datadir}/netplan/netplan/cli/commands - install -m 755 ${S}/src/netplan.script ${D}${datadir}/netplan/ - ln -srf ${D}${datadir}/netplan/netplan.script ${D}${sbindir}/netplan - - install -d ${D}/${systemd_unitdir}/system ${D}${systemd_unitdir}/system-generators - ln -srf ${D}/${base_libdir}/netplan/generate ${D}${systemd_unitdir}/system-generators - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${datadir}/dbus-1/system.d ${D}${datadir}/dbus-1/system-services - install -m 755 ${S}/netplan-dbus ${D}${base_libdir}/netplan - install -m 644 ${S}/dbus/io.netplan.Netplan.conf ${D}${datadir}/dbus-1/system.d - install -m 644 ${S}/dbus/io.netplan.Netplan.service ${D}${datadir}/dbus-1/system-services - fi - - install -m 755 ${S}/libnetplan.so.0.0 ${D}${libdir} - ln -rfs ${D}${libdir}/libnetplan.so.0.0 ${D}${libdir}/libnetplan.so -} - -PACKAGES += "${PN}-dbus libnetplan" - -FILES_libnetplan = "${libdir}/libnetplan.so.0.0" -FILES_${PN} = "${sbindir} ${base_libdir}/netplan/generate ${datadir}/netplan ${sysconfdir}/netplan ${systemd_unitdir}" -FILES_${PN}-dbus = "${base_libdir}/netplan/netplan-dbus ${datadir}/dbus-1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.101.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.101.bb new file mode 100644 index 0000000000..a3afcd2d56 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.101.bb @@ -0,0 +1,62 @@ +SUMMARY = "The network configuration abstraction renderer" +DESCRIPTION = "Netplan is a utility for easily configuring networking on a \ +linux system. You simply create a YAML description of the required network \ +interfaces and what each should be configured to do. From this description \ +Netplan will generate all the necessary configuration for your chosen renderer \ +tool." +HOMEPAGE = "https://netplan.io" +SECTION = "net/misc" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +S = "${WORKDIR}/git" +SRCREV = "e445b87b9dff439ec564c245d030b03d61eb0f24" +PV = "0.101+git${SRCPV}" + +SRC_URI = " \ + git://github.com/CanonicalLtd/netplan.git \ + file://0001-dbus-Remove-unused-variabes.patch \ + file://0002-Makefile-Exclude-.h-files-from-target-rule.patch \ +" +SRC_URI_append_libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" + +DEPENDS = "glib-2.0 libyaml ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +RDEPENDS_${PN} = "python3 python3-core python3-pyyaml python3-netifaces python3-nose python3-coverage python3-pycodestyle python3-pyflakes util-linux-libuuid libnetplan" + +inherit pkgconfig systemd + +TARGET_CC_ARCH += "${LDFLAGS}" + +EXTRA_OEMAKE = "generate netplan/_features.py" +EXTRA_OEMAKE =+ "${@bb.utils.contains('DISTRO_FEATURES','systemd','netplan-dbus dbus/io.netplan.Netplan.service','',d)}" + +do_install() { + install -d ${D}${sbindir} ${D}${libdir} ${D}${base_libdir}/netplan ${D}${datadir}/netplan/netplan/cli/commands ${D}${sysconfdir}/netplan + install -m 755 ${S}/generate ${D}${base_libdir}/netplan/ + install -m 644 ${S}/netplan/*.py ${D}${datadir}/netplan/netplan + install -m 644 ${S}/netplan/cli/*.py ${D}${datadir}/netplan/netplan/cli + install -m 644 ${S}/netplan/cli/commands/*.py ${D}${datadir}/netplan/netplan/cli/commands + install -m 755 ${S}/src/netplan.script ${D}${datadir}/netplan/ + ln -srf ${D}${datadir}/netplan/netplan.script ${D}${sbindir}/netplan + + install -d ${D}/${systemd_unitdir}/system ${D}${systemd_unitdir}/system-generators + ln -srf ${D}/${base_libdir}/netplan/generate ${D}${systemd_unitdir}/system-generators + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${datadir}/dbus-1/system.d ${D}${datadir}/dbus-1/system-services + install -m 755 ${S}/netplan-dbus ${D}${base_libdir}/netplan + install -m 644 ${S}/dbus/io.netplan.Netplan.conf ${D}${datadir}/dbus-1/system.d + install -m 644 ${S}/dbus/io.netplan.Netplan.service ${D}${datadir}/dbus-1/system-services + fi + + install -m 755 ${S}/libnetplan.so.0.0 ${D}${libdir} + ln -rfs ${D}${libdir}/libnetplan.so.0.0 ${D}${libdir}/libnetplan.so +} + +PACKAGES += "${PN}-dbus libnetplan" + +FILES_libnetplan = "${libdir}/libnetplan.so.0.0" +FILES_${PN} = "${sbindir} ${base_libdir}/netplan/generate ${datadir}/netplan ${sysconfdir}/netplan ${systemd_unitdir}" +FILES_${PN}-dbus = "${base_libdir}/netplan/netplan-dbus ${datadir}/dbus-1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch new file mode 100644 index 0000000000..0a8de54106 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch @@ -0,0 +1,27 @@ +reallocarray() is coming from stdlib.h which maybe indirectly included +by malloc.h but not on all libc implementations + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/meson.build ++++ b/meson.build +@@ -114,7 +114,7 @@ config_h.set10('HAVE_GETRANDOM', use_sys + # FIXME secure_getenv check is not useful? + config_h.set('HAVE_SECURE_GETENV', cc.has_function('secure_getenv')) + config_h.set('HAVE___SECURE_GETENV', cc.has_function('__secure_getenv')) +-config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include ')) ++config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include ')) + config_h.set10('HAVE_DECL_EXPLICIT_BZERO', cc.has_function('explicit_bzero', prefix: '#include ')) + config_h.set10('HAVE_DECL_MEMFD_CREATE', cc.has_function('memfd_create', prefix: '#include ')) + +--- a/configure.ac ++++ b/configure.ac +@@ -82,7 +82,7 @@ AC_CHECK_DECLS([ + AC_CHECK_DECLS([ + reallocarray], + [], [], [[ +-#include ++#include + ]]) + + AC_CHECK_DECLS([ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb index 2613076a7e..aa8ab899bb 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb @@ -27,6 +27,7 @@ SRC_URI = " \ file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ file://0002-Do-not-create-settings-settings-property-documentati.patch \ file://0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ + file://fix_reallocarray_check.patch \ " SRC_URI_append_libc-musl = " \ file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14318.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14318.patch new file mode 100644 index 0000000000..ff1225db07 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14318.patch @@ -0,0 +1,142 @@ +From ccf53dfdcd39f3526dbc2f20e1245674155380ff Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin +Date: Fri, 11 Dec 2020 11:32:44 +0900 +Subject: [PATCH] s4: torture: Add smb2.notify.handle-permissions test. + +s3: smbd: Ensure change notifies can't get set unless the + directory handle is open for SEC_DIR_LIST. + +CVE-2020-14318 + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=14434 + +Signed-off-by: Jeremy Allison + +Signed-off-by: Zheng Ruoqin +--- + source3/smbd/notify.c | 8 ++++ + source4/torture/smb2/notify.c | 82 ++++++++++++++++++++++++++++++++++- + 2 files changed, 89 insertions(+), 1 deletion(-) + +diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c +index 44c0b09..d23c03b 100644 +--- a/source3/smbd/notify.c ++++ b/source3/smbd/notify.c +@@ -283,6 +283,14 @@ NTSTATUS change_notify_create(struct files_struct *fsp, uint32_t filter, + char fullpath[len+1]; + NTSTATUS status = NT_STATUS_NOT_IMPLEMENTED; + ++ /* ++ * Setting a changenotify needs READ/LIST access ++ * on the directory handle. ++ */ ++ if (!(fsp->access_mask & SEC_DIR_LIST)) { ++ return NT_STATUS_ACCESS_DENIED; ++ } ++ + if (fsp->notify != NULL) { + DEBUG(1, ("change_notify_create: fsp->notify != NULL, " + "fname = %s\n", fsp->fsp_name->base_name)); +diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c +index ebb4f8a..a5c9b94 100644 +--- a/source4/torture/smb2/notify.c ++++ b/source4/torture/smb2/notify.c +@@ -2569,6 +2569,83 @@ done: + return ok; + } + ++/* ++ Test asking for a change notify on a handle without permissions. ++*/ ++ ++#define BASEDIR_HPERM BASEDIR "_HPERM" ++ ++static bool torture_smb2_notify_handle_permissions( ++ struct torture_context *torture, ++ struct smb2_tree *tree) ++{ ++ bool ret = true; ++ NTSTATUS status; ++ union smb_notify notify; ++ union smb_open io; ++ struct smb2_handle h1 = {{0}}; ++ struct smb2_request *req; ++ ++ smb2_deltree(tree, BASEDIR_HPERM); ++ smb2_util_rmdir(tree, BASEDIR_HPERM); ++ ++ torture_comment(torture, ++ "TESTING CHANGE NOTIFY " ++ "ON A HANDLE WITHOUT PERMISSIONS\n"); ++ ++ /* ++ get a handle on the directory ++ */ ++ ZERO_STRUCT(io.smb2); ++ io.generic.level = RAW_OPEN_SMB2; ++ io.smb2.in.create_flags = 0; ++ io.smb2.in.desired_access = SEC_FILE_READ_ATTRIBUTE; ++ io.smb2.in.create_options = NTCREATEX_OPTIONS_DIRECTORY; ++ io.smb2.in.file_attributes = FILE_ATTRIBUTE_NORMAL; ++ io.smb2.in.share_access = NTCREATEX_SHARE_ACCESS_READ | ++ NTCREATEX_SHARE_ACCESS_WRITE; ++ io.smb2.in.alloc_size = 0; ++ io.smb2.in.create_disposition = NTCREATEX_DISP_CREATE; ++ io.smb2.in.impersonation_level = SMB2_IMPERSONATION_ANONYMOUS; ++ io.smb2.in.security_flags = 0; ++ io.smb2.in.fname = BASEDIR_HPERM; ++ ++ status = smb2_create(tree, torture, &io.smb2); ++ CHECK_STATUS(status, NT_STATUS_OK); ++ h1 = io.smb2.out.file.handle; ++ ++ /* ask for a change notify, ++ on file or directory name changes */ ++ ZERO_STRUCT(notify.smb2); ++ notify.smb2.level = RAW_NOTIFY_SMB2; ++ notify.smb2.in.buffer_size = 1000; ++ notify.smb2.in.completion_filter = FILE_NOTIFY_CHANGE_NAME; ++ notify.smb2.in.file.handle = h1; ++ notify.smb2.in.recursive = true; ++ ++ req = smb2_notify_send(tree, ¬ify.smb2); ++ torture_assert_goto(torture, ++ req != NULL, ++ ret, ++ done, ++ "smb2_notify_send failed\n"); ++ ++ /* ++ * Cancel it, we don't really want to wait. ++ */ ++ smb2_cancel(req); ++ status = smb2_notify_recv(req, torture, ¬ify.smb2); ++ /* Handle h1 doesn't have permissions for ChangeNotify. */ ++ CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED); ++ ++done: ++ if (!smb2_util_handle_empty(h1)) { ++ smb2_util_close(tree, h1); ++ } ++ smb2_deltree(tree, BASEDIR_HPERM); ++ return ret; ++} ++ + /* + basic testing of SMB2 change notify + */ +@@ -2602,7 +2679,10 @@ struct torture_suite *torture_smb2_notify_init(TALLOC_CTX *ctx) + torture_smb2_notify_rmdir3); + torture_suite_add_2smb2_test(suite, "rmdir4", + torture_smb2_notify_rmdir4); +- ++ torture_suite_add_1smb2_test(suite, ++ "handle-permissions", ++ torture_smb2_notify_handle_permissions); ++ + suite->description = talloc_strdup(suite, "SMB2-NOTIFY tests"); + + return suite; +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14383.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14383.patch new file mode 100644 index 0000000000..3341b80a38 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14383.patch @@ -0,0 +1,112 @@ +From ff17443fe761eda864d13957bec45f5bac478fe3 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin +Date: Fri, 11 Dec 2020 14:34:31 +0900 +Subject: [PATCH] CVE-2020-14383: s4/dns: Ensure variable initialization with + NULL. do not crash when additional data not found +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Found by Francis Brosnan Blázquez . +Based on patches from Francis Brosnan Blázquez +and Jeremy Allison + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=14472 +BUG: https://bugzilla.samba.org/show_bug.cgi?id=12795 + +Signed-off-by: Douglas Bagnall +Reviewed-by: Jeremy Allison + +Autobuild-User(master): Douglas Bagnall +Autobuild-Date(master): Mon Aug 24 00:21:41 UTC 2020 on sn-devel-184 + +(based on commit df98e7db04c901259dd089e20cd557bdbdeaf379) +(based on commit 7afe449e7201be92bed8e53cbb37b74af720ef4e + +Signed-off-by: Zheng Ruoqin +--- + .../rpc_server/dnsserver/dcerpc_dnsserver.c | 31 ++++++++++--------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +diff --git a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c +index 910de9a1..618c7096 100644 +--- a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c ++++ b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c +@@ -1754,15 +1754,17 @@ static WERROR dnsserver_enumerate_records(struct dnsserver_state *dsstate, + TALLOC_CTX *tmp_ctx; + char *name; + const char * const attrs[] = { "name", "dnsRecord", NULL }; +- struct ldb_result *res; +- struct DNS_RPC_RECORDS_ARRAY *recs; ++ struct ldb_result *res = NULL; ++ struct DNS_RPC_RECORDS_ARRAY *recs = NULL; + char **add_names = NULL; +- char *rname; ++ char *rname = NULL; + const char *preference_name = NULL; + int add_count = 0; + int i, ret, len; + WERROR status; +- struct dns_tree *tree, *base, *node; ++ struct dns_tree *tree = NULL; ++ struct dns_tree *base = NULL; ++ struct dns_tree *node = NULL; + + tmp_ctx = talloc_new(mem_ctx); + W_ERROR_HAVE_NO_MEMORY(tmp_ctx); +@@ -1845,15 +1847,15 @@ static WERROR dnsserver_enumerate_records(struct dnsserver_state *dsstate, + } + } + +- talloc_free(res); +- talloc_free(tree); +- talloc_free(name); ++ TALLOC_FREE(res); ++ TALLOC_FREE(tree); ++ TALLOC_FREE(name); + + /* Add any additional records */ + if (select_flag & DNS_RPC_VIEW_ADDITIONAL_DATA) { + for (i=0; izones; z2; z2 = z2->next) { + char *encoded_name; +@@ -1865,14 +1867,15 @@ static WERROR dnsserver_enumerate_records(struct dnsserver_state *dsstate, + LDB_SCOPE_ONELEVEL, attrs, + "(&(objectClass=dnsNode)(name=%s)(!(dNSTombstoned=TRUE)))", + encoded_name); +- talloc_free(name); ++ TALLOC_FREE(name); + if (ret != LDB_SUCCESS) { + continue; + } + if (res->count == 1) { ++ msg = res->msgs[0]; + break; + } else { +- talloc_free(res); ++ TALLOC_FREE(res); + continue; + } + } +@@ -1885,10 +1888,10 @@ static WERROR dnsserver_enumerate_records(struct dnsserver_state *dsstate, + } + status = dns_fill_records_array(tmp_ctx, NULL, DNS_TYPE_A, + select_flag, rname, +- res->msgs[0], 0, recs, ++ msg, 0, recs, + NULL, NULL); +- talloc_free(rname); +- talloc_free(res); ++ TALLOC_FREE(rname); ++ TALLOC_FREE(res); + } + } + +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb index b5085c913b..1a982368ec 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb @@ -28,6 +28,8 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://0002-util_sec.c-Move-__thread-variable-to-global-scope.patch \ file://0001-Add-options-to-configure-the-use-of-libbsd.patch \ file://0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch \ + file://CVE-2020-14318.patch \ + file://CVE-2020-14383.patch \ " SRC_URI_append_libc-musl = " \ file://samba-pam.patch \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-e.patch b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-e.patch deleted file mode 100644 index 4676769a43..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-e.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b90acc91d0cd276befe7f08f87ba2dc5ee7122ff Mon Sep 17 00:00:00 2001 -From: Tesfa Mael -Date: Wed, 26 Aug 2020 10:13:06 -0700 -Subject: [PATCH] Make ByteReverseWords available for big and little endian - ---- - wolfcrypt/src/misc.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/wolfcrypt/src/misc.c b/wolfcrypt/src/misc.c -index fe66ee0a1..23bfa1adc 100644 ---- a/wolfcrypt/src/misc.c -+++ b/wolfcrypt/src/misc.c -@@ -120,7 +120,6 @@ WC_STATIC WC_INLINE word32 ByteReverseWord32(word32 value) - return rotlFixed(value, 16U); - #endif - } --#if defined(LITTLE_ENDIAN_ORDER) - /* This routine performs a byte swap of words array of a given count. */ - WC_STATIC WC_INLINE void ByteReverseWords(word32* out, const word32* in, - word32 byteCount) -@@ -131,7 +130,6 @@ WC_STATIC WC_INLINE void ByteReverseWords(word32* out, const word32* in, - out[i] = ByteReverseWord32(in[i]); - - } --#endif /* LITTLE_ENDIAN_ORDER */ - - #if defined(WORD64_AVAILABLE) && !defined(WOLFSSL_NO_WORD64_OPS) - --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.5.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.5.0.bb deleted file mode 100644 index 61cf1cc626..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.5.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "wolfSSL Lightweight Embedded SSL/TLS Library" -DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \ - in C and optimized for embedded and RTOS environments. It can \ - be up to 20 times smaller than OpenSSL while still supporting \ - a full TLS client and server, up to TLS 1.3" -HOMEPAGE = "https://www.wolfssl.com/products/wolfssl" -BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -PROVIDES += "cyassl" -RPROVIDES_${PN} = "cyassl" - -SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https \ - file://0001-Make-ByteReverseWords-available-for-big-and-little-e.patch \ -" -SRCREV = "0fa5af9929ce2ee99e8789996a3048f41a99830e" -S = "${WORKDIR}/git" - -inherit autotools - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.6.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.6.0.bb new file mode 100644 index 0000000000..ad7e92341b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.6.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "wolfSSL Lightweight Embedded SSL/TLS Library" +DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \ + in C and optimized for embedded and RTOS environments. It can \ + be up to 20 times smaller than OpenSSL while still supporting \ + a full TLS client and server, up to TLS 1.3" +HOMEPAGE = "https://www.wolfssl.com/products/wolfssl" +BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues" +SECTION = "libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +PROVIDES += "cyassl" +RPROVIDES_${PN} = "cyassl" + +SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https \ +" +SRCREV = "9c87f979a7f1d3a6d786b260653d566c1d31a1c4" +S = "${WORKDIR}/git" + +inherit autotools + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb index d55dc4ab7e..33de8ca7e2 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb @@ -29,7 +29,7 @@ EXTRA_OECONF += "--with-dblib=berkeley \ --with-plugindir='${libdir}/sasl2' \ andrew_cv_runpath_switch=none" -PACKAGECONFIG ??= "ntlm \ +PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)} \ " PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch deleted file mode 100644 index c71f01299b..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7bdaa32c80bb7d37668c1ff6d88bb02428459a0f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 21 Oct 2020 09:11:20 -0700 -Subject: [PATCH] libopeniscsiusr: Compare with max int instead of max long - -This compares value member of int_list_tbl struct which is of unsigned -int type. - -struct int_list_tbl { -const char *name; -unsigned int value; -}; - -Clang compiler reports this comparison when --Wtautological-constant-out-of-range-compare is enabled - -| idbm.c:1042:2: error: result of comparison of constant 18446744073709551615 with expression of type 'unsigned int' is always true [-Werror,-Wtautological-constant-out-of-range-compare] -| _rec_int_list(SESSION_CHAP_ALGS, recs, node, session.auth.chap_algs, -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| idbm.c:263:23: note: expanded from macro '_rec_int_list' -| if (_org->_name[_i] != ~0UL) { \ -| ~~~~~~~~~~~~~~~ ^ ~~~~ - -Since max value for int can be less than unsinged long e.g. on LP64 its -better to use UINT_MAX here - -Upstream-Status: Submitted [https://github.com/open-iscsi/open-iscsi/pull/227] -Signed-off-by: Khem Raj ---- - libopeniscsiusr/idbm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c -index 7bc2381..060196f 100644 ---- a/libopeniscsiusr/idbm.c -+++ b/libopeniscsiusr/idbm.c -@@ -260,7 +260,7 @@ do {\ - _recs[_n].type = TYPE_INT_LIST; \ - _strncpy(_recs[_n].name, _key, NAME_MAXVAL); \ - for (unsigned int _i = 0; _i < ARRAY_LEN(_org->_name); _i++) { \ -- if (_org->_name[_i] != ~0UL) { \ -+ if (_org->_name[_i] != UINT_MAX) { \ - for (unsigned int _j = 0; _j < ARRAY_LEN(_tbl); _j++) { \ - if (_tbl[_j].value == _org->_name[_i]) { \ - strcat(_recs[_n].value, _tbl[_j].name); \ --- -2.29.0 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb deleted file mode 100644 index dfcd4ee3cb..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb +++ /dev/null @@ -1,118 +0,0 @@ -SUMMARY = "iSCSI daemon and utility programs" -DESCRIPTION = "Open-iSCSI project is a high performance, transport \ -independent, multi-platform implementation of RFC3720. The iscsi package \ -provides the server daemon for the iSCSI protocol, as well as the utility \ -programs used to manage it. iSCSI is a protocol for distributed \ -disk access using SCSI commands sent over Internet Protocol networks." -HOMEPAGE = "http://www.open-iscsi.com/" -LICENSE = "GPLv2 & LGPLv2.1" -SECTION = "net" -DEPENDS = "openssl flex-native bison-native open-isns util-linux kmod" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRCREV ?= "802688debcd88c48edabe86deb7e7ed47ebadc26" - -SRC_URI = "git://github.com/open-iscsi/open-iscsi \ - file://0001-Makefile-Do-not-set-Werror.patch \ - file://0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch \ - file://initd.debian \ - file://99_iscsi-initiator-utils \ - file://iscsi-initiator \ - file://iscsi-initiator.service \ - file://iscsi-initiator-targets.service \ - file://set_initiatorname \ - " -S = "${WORKDIR}/git" - -inherit update-rc.d systemd autotools pkgconfig - -EXTRA_OECONF = " \ - --target=${TARGET_SYS} \ - --host=${BUILD_SYS} \ -" - -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd NO_SYSTEMD=1', d)}" - -EXTRA_OEMAKE = ' \ - OS="${TARGET_SYS}" \ - TARGET="${TARGET_OS}" \ - BASE="${prefix}" \ - MANDIR="${mandir}" \ - OPTFLAGS="-DNO_SYSTEMD ${CFLAGS}" \ - PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \ -' - - -do_configure () { - cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} -} - -do_compile () { - # Make sure we DO NOT regenerate prom_lex.c. - if [ -f ${S}/utils/fwparam_ibft/prom_lex.l ]; then - mv ${S}/utils/fwparam_ibft/prom_lex.l ${S}/utils/fwparam_ibft/prom_lex.l.unused - fi - oe_runmake -C ${S} ${EXTRA_OEMAKE} user -} - -do_install () { - #install necessary directories - install -d ${D}${sbindir} \ - ${D}${sysconfdir}/init.d \ - ${D}${sysconfdir}/iscsi \ - ${D}${localstatedir}/lib/iscsi/nodes \ - ${D}${localstatedir}/lib/iscsi/send_targets \ - ${D}${localstatedir}/lib/iscsi/static \ - ${D}${localstatedir}/lib/iscsi/isns \ - ${D}${localstatedir}/lib/iscsi/slp \ - ${D}${localstatedir}/lib/iscsi/ifaces \ - ${D}${libdir} \ - ${D}${mandir}/man8 - - install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \ - ${S}/utils/iscsi-iname \ - ${S}/usr/iscsistart ${D}/${sbindir} - - cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} - install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 - install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi - install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid - - sed -i -e "s:= /sbin/iscsid:= ${sbindir}/iscsid:" ${D}${sysconfdir}/iscsi/iscsid.conf - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /run/${BPN}/lock - - - -" \ - > ${D}${sysconfdir}/tmpfiles.d/iscsi.conf - install -d ${D}/etc/default/ - install -p -m 755 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/iscsi-initiator.service \ - ${WORKDIR}/iscsi-initiator-targets.service \ - ${D}${systemd_unitdir}/system/ - install -d ${D}${nonarch_libdir}/iscsi - install -m 0755 ${WORKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi - else - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles - fi -} - -pkg_postinst_${PN}() { - if [ "x$D" = "x" ]; then - if [ -e /etc/init.d/populate-volatile.sh ]; then - /etc/init.d/populate-volatile.sh update - elif command -v systemd-tmpfiles >/dev/null; then - systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/iscsi.conf - fi - fi -} - -SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " -INITSCRIPT_NAME = "iscsid" -INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ." - -FILES_${PN} += "${nonarch_libdir}/iscsi" diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb new file mode 100644 index 0000000000..4a9cf9db40 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb @@ -0,0 +1,117 @@ +SUMMARY = "iSCSI daemon and utility programs" +DESCRIPTION = "Open-iSCSI project is a high performance, transport \ +independent, multi-platform implementation of RFC3720. The iscsi package \ +provides the server daemon for the iSCSI protocol, as well as the utility \ +programs used to manage it. iSCSI is a protocol for distributed \ +disk access using SCSI commands sent over Internet Protocol networks." +HOMEPAGE = "http://www.open-iscsi.com/" +LICENSE = "GPLv2 & LGPLv2.1" +SECTION = "net" +DEPENDS = "openssl flex-native bison-native open-isns util-linux kmod" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV ?= "34e3ffb194f6fa3028c0eb2ff57e7db2d1026771" + +SRC_URI = "git://github.com/open-iscsi/open-iscsi \ + file://0001-Makefile-Do-not-set-Werror.patch \ + file://initd.debian \ + file://99_iscsi-initiator-utils \ + file://iscsi-initiator \ + file://iscsi-initiator.service \ + file://iscsi-initiator-targets.service \ + file://set_initiatorname \ + " +S = "${WORKDIR}/git" + +inherit update-rc.d systemd autotools pkgconfig + +EXTRA_OECONF = " \ + --target=${TARGET_SYS} \ + --host=${BUILD_SYS} \ +" + +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd NO_SYSTEMD=1', d)}" + +EXTRA_OEMAKE = ' \ + OS="${TARGET_SYS}" \ + TARGET="${TARGET_OS}" \ + BASE="${prefix}" \ + MANDIR="${mandir}" \ + OPTFLAGS="-DNO_SYSTEMD ${CFLAGS}" \ + PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \ +' + + +do_configure () { + cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} +} + +do_compile () { + # Make sure we DO NOT regenerate prom_lex.c. + if [ -f ${S}/utils/fwparam_ibft/prom_lex.l ]; then + mv ${S}/utils/fwparam_ibft/prom_lex.l ${S}/utils/fwparam_ibft/prom_lex.l.unused + fi + oe_runmake -C ${S} ${EXTRA_OEMAKE} user +} + +do_install () { + #install necessary directories + install -d ${D}${sbindir} \ + ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/iscsi \ + ${D}${localstatedir}/lib/iscsi/nodes \ + ${D}${localstatedir}/lib/iscsi/send_targets \ + ${D}${localstatedir}/lib/iscsi/static \ + ${D}${localstatedir}/lib/iscsi/isns \ + ${D}${localstatedir}/lib/iscsi/slp \ + ${D}${localstatedir}/lib/iscsi/ifaces \ + ${D}${libdir} \ + ${D}${mandir}/man8 + + install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \ + ${S}/utils/iscsi-iname \ + ${S}/usr/iscsistart ${D}/${sbindir} + + cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} + install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 + install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi + install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid + + sed -i -e "s:= /sbin/iscsid:= ${sbindir}/iscsid:" ${D}${sysconfdir}/iscsi/iscsid.conf + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /run/${BPN}/lock - - - -" \ + > ${D}${sysconfdir}/tmpfiles.d/iscsi.conf + install -d ${D}/etc/default/ + install -p -m 755 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/iscsi-initiator.service \ + ${WORKDIR}/iscsi-initiator-targets.service \ + ${D}${systemd_unitdir}/system/ + install -d ${D}${nonarch_libdir}/iscsi + install -m 0755 ${WORKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi + else + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles + fi +} + +pkg_postinst_${PN}() { + if [ "x$D" = "x" ]; then + if [ -e /etc/init.d/populate-volatile.sh ]; then + /etc/init.d/populate-volatile.sh update + elif command -v systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/iscsi.conf + fi + fi +} + +SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " +INITSCRIPT_NAME = "iscsid" +INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ." + +FILES_${PN} += "${nonarch_libdir}/iscsi" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb deleted file mode 100644 index 5516fc43ae..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "OpenSAF is an open source implementation of the SAF AIS specification" -DESCRIPTION = "OpenSAF is an open source project established to develop a base platform \ -middleware consistent with Service Availability Forum (SA Forum) \ -specifications, under the LGPLv2.1 license. The OpenSAF Foundation was \ -established by leading Communications and Enterprise Computing Companies to \ -facilitate the OpenSAF Project and to accelerate the adoption of the OpenSAF \ -code base in commercial products. \ -The OpenSAF project was launched in mid 2007 and has been under development by \ -an informal group of supporters of the OpenSAF initiative. The OpenSAF \ -Foundation was founded on January 22nd 2008 with Emerson Network Power, \ -Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." -HOMEPAGE = "http://www.opensaf.org" -SECTION = "admin" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" - -DEPENDS = "libxml2 python3" -TOOLCHAIN = "gcc" - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ - file://0001-configure-Pass-linker-specific-options-with-Wl.patch \ - file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ - file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ - file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ - file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ - file://0001-immom_python-convert-to-python3.patch \ - file://0001-Fix-build-with-fno-common.patch \ - file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ - " -SRC_URI[md5sum] = "02cfe732d194339237da6adce8e54384" -SRC_URI[sha256sum] = "84268b90dc48a6675e5a77e2b20390a04bb59deb48a829102a9dbc4b9ac27483" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" - -inherit autotools useradd systemd pkgconfig - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-f -r opensaf" -USERADD_PARAM_${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" - -SYSTEMD_SERVICE_${PN} += "opensafd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -PACKAGECONFIG[systemd] = ",,systemd" -PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03,,openhpi" -PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" - -CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" -CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" -LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" - -do_install_append() { - rm -fr "${D}${localstatedir}/lock" - rm -fr "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" - rmdir --ignore-fail-on-non-empty "${D}${datadir}/java" - if [ ! -d "${D}${sysconfdir}/init.d" ]; then - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ - fi -} - -FILES_${PN} += "${libdir}/libSa*.so ${systemd_unitdir}/system/*.service" -FILES_${PN}-dev += "${libdir}/libopensaf_core.so" -FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" - -INSANE_SKIP_${PN} = "dev-so" - -RDEPENDS_${PN} += "bash python3-core" - -# http://errors.yoctoproject.org/Errors/Details/186970/ -COMPATIBLE_HOST_libc-musl = 'null' - -FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb new file mode 100644 index 0000000000..ade2816f58 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb @@ -0,0 +1,78 @@ +SUMMARY = "OpenSAF is an open source implementation of the SAF AIS specification" +DESCRIPTION = "OpenSAF is an open source project established to develop a base platform \ +middleware consistent with Service Availability Forum (SA Forum) \ +specifications, under the LGPLv2.1 license. The OpenSAF Foundation was \ +established by leading Communications and Enterprise Computing Companies to \ +facilitate the OpenSAF Project and to accelerate the adoption of the OpenSAF \ +code base in commercial products. \ +The OpenSAF project was launched in mid 2007 and has been under development by \ +an informal group of supporters of the OpenSAF initiative. The OpenSAF \ +Foundation was founded on January 22nd 2008 with Emerson Network Power, \ +Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." +HOMEPAGE = "http://www.opensaf.org" +SECTION = "admin" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" + +DEPENDS = "libxml2 python3" +TOOLCHAIN = "gcc" + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ + file://0001-configure-Pass-linker-specific-options-with-Wl.patch \ + file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ + file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ + file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ + file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ + file://0001-immom_python-convert-to-python3.patch \ + file://0001-Fix-build-with-fno-common.patch \ + file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ + " +SRC_URI[md5sum] = "9c7871a2b45f262b7aee2e9d073798e4" +SRC_URI[sha256sum] = "11b62e6d20c449a297da0c0c15b560747c9ec884305beffed4ca4c192fa9f22c" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" + +inherit autotools useradd systemd pkgconfig + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "-f -r opensaf" +USERADD_PARAM_${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" + +SYSTEMD_SERVICE_${PN} += "opensafd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +PACKAGECONFIG[systemd] = ",,systemd" +PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03,,openhpi" +PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" + +CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" +CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" +LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" + +do_install_append() { + rm -fr "${D}${localstatedir}/lock" + rm -fr "${D}${localstatedir}/run" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + rmdir --ignore-fail-on-non-empty "${D}${datadir}/java" + if [ ! -d "${D}${sysconfdir}/init.d" ]; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ + fi +} + +FILES_${PN} += "${libdir}/libSa*.so ${systemd_unitdir}/system/*.service" +FILES_${PN}-dev += "${libdir}/libopensaf_core.so" +FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" + +INSANE_SKIP_${PN} = "dev-so" + +RDEPENDS_${PN} += "bash python3-core" + +# http://errors.yoctoproject.org/Errors/Details/186970/ +COMPATIBLE_HOST_libc-musl = 'null' + +FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 4c62da8181..dc1d6c67ef 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -89,7 +89,7 @@ ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" ALTERNATIVE_${PN} = "tftp" ALTERNATIVE_TARGET[tftp] = "${bindir}/tftp-hpa" -ALTERNATIVE_PRIORITY = "60" +ALTERNATIVE_PRIORITY = "100" SYSTEMD_PACKAGES = "tftp-hpa-server" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch index d2eb156143..f3dc31c93d 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch @@ -8,8 +8,8 @@ diff -urN vblade-19.old//makefile vblade-19//makefile @@ -9,8 +9,6 @@ mandir = ${sharedir}/man - O=aoe.o bpf.o ${PLATFORM}.o ata.o --CFLAGS += -Wall -g -O2 + O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o +-CFLAGS += -Wall -g -O2 -fno-common -CC = gcc vblade: $O diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/gcc-10.patch b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/gcc-10.patch deleted file mode 100644 index 9a42aa3699..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/gcc-10.patch +++ /dev/null @@ -1,85 +0,0 @@ -From af17efc862b9acfd63ce2ecb21f75ed890a93a5d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20K=C3=B6lbl?= -Date: Thu, 9 Jul 2020 14:29:18 +0200 -Subject: [PATCH] Fix linkage of global identifiers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Align the code to the standard and modern compilers. - -Upstream-Status: Submitted [https://github.com/OpenAoE/vblade/pull/15] -Signed-off-by: Andreas Kölbl ---- - dat.c | 12 ++++++++++++ - dat.h | 19 ++++++++++--------- - makefile | 7 +++++-- - 3 files changed, 27 insertions(+), 11 deletions(-) - create mode 100644 dat.c - ---- /dev/null -+++ b/dat.c -@@ -0,0 +1,12 @@ -+/* dat.c: Global memory for vblade AoE target */ -+#include "dat.h" -+ -+int shelf, slot; -+ulong aoetag; -+uchar mac[6]; -+int bfd; // block file descriptor -+int sfd; // socket file descriptor -+vlong size; // size of vblade -+vlong offset; -+char *progname; -+char serial[Nserial+1]; ---- a/dat.h -+++ b/dat.h -@@ -1,4 +1,5 @@ - /* dat.h: include file for vblade AoE target */ -+#include - - #define nil ((void *)0) - /* -@@ -163,12 +164,12 @@ enum { - Nserial= 20, - }; - --int shelf, slot; --ulong aoetag; --uchar mac[6]; --int bfd; // block file descriptor --int sfd; // socket file descriptor --vlong size; // size of vblade --vlong offset; --char *progname; --char serial[Nserial+1]; -+extern int shelf, slot; -+extern ulong aoetag; -+extern uchar mac[6]; -+extern int bfd; // block file descriptor -+extern int sfd; // socket file descriptor -+extern vlong size; // size of vblade -+extern vlong offset; -+extern char *progname; -+extern char serial[Nserial+1]; ---- a/makefile -+++ b/makefile -@@ -8,7 +8,7 @@ sbindir = ${prefix}/sbin - sharedir = ${prefix}/share - mandir = ${sharedir}/man - --O=aoe.o bpf.o ${PLATFORM}.o ata.o -+O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o - - vblade: $O - ${CC} ${LDFLAGS} -o vblade $O -@@ -25,6 +25,9 @@ ata.o : ata.c config.h dat.h fns.h makef - bpf.o : bpf.c - ${CC} ${CFLAGS} -c $< - -+dat.o : dat.c -+ ${CC} ${CFLAGS} -c $< -+ - config.h : config/config.h.in makefile - @if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \ - sh -xc "cp config/config.h.in config.h"; \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch index a74452db69..71af47ac73 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch @@ -9,7 +9,7 @@ index 98008da..c328ba7 100644 --- a/makefile +++ b/makefile @@ -11,7 +11,7 @@ mandir = ${sharedir}/man - O=aoe.o bpf.o ${PLATFORM}.o ata.o + O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o vblade: $O - ${CC} -o vblade $O diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_24.bb b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_24.bb deleted file mode 100644 index 09ba8cfd93..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_24.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Virtual EtherDrive blade AoE target" -SECTION = "admin" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" - -SRCREV = "a7f48bda5bf1646f6450601049bf4b74053adbb3" -SRC_URI = "git://github.com/OpenAoE/vblade \ - file://cross.patch \ - file://makefile-add-ldflags.patch \ - file://gcc-10.patch \ - file://${BPN}.conf \ - file://${BPN}.init \ - file://${BPN}.service \ - file://volatiles.99_vblade \ - " - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "https://github.com/OpenAoE/vblade/archive/" - -inherit autotools-brokensep update-rc.d systemd - -do_install() { - install -D -m 0755 ${S}/vblade ${D}/${sbindir}/vblade - install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed - install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8 - - install -D -m 0644 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf - install -D -m 0755 ${WORKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} - - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}/${sysconfdir}/default/volatiles - install -m 0755 ${WORKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade - fi - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/${BPN}.init ${D}/${bindir}/ - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /var/run/${BPN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/vblade.service ${D}${systemd_system_unitdir} - sed -e 's,@BINDIR@,${bindir},g' -i ${D}${systemd_system_unitdir}/*.service - fi - -} - -INITSCRIPT_NAME = "vblade" -INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." - -SYSTEMD_SERVICE_${PN} = "vblade.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb new file mode 100644 index 0000000000..647abbfd26 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb @@ -0,0 +1,55 @@ +SUMMARY = "Virtual EtherDrive blade AoE target" +SECTION = "admin" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" + +SRCREV = "5f1a0ba8b9815e3f08a3e2635a17f78bbf2a5b10" +SRC_URI = "git://github.com/OpenAoE/vblade \ + file://cross.patch \ + file://makefile-add-ldflags.patch \ + file://${BPN}.conf \ + file://${BPN}.init \ + file://${BPN}.service \ + file://volatiles.99_vblade \ + " + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/OpenAoE/vblade/archive/" + +inherit autotools-brokensep update-rc.d systemd + +do_install() { + install -D -m 0755 ${S}/vblade ${D}/${sbindir}/vblade + install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed + install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8 + + install -D -m 0644 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf + install -D -m 0755 ${WORKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}/${sysconfdir}/default/volatiles + install -m 0755 ${WORKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}/${bindir} + install -m 0755 ${WORKDIR}/${BPN}.init ${D}/${bindir}/ + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /var/run/${BPN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/vblade.service ${D}${systemd_system_unitdir} + sed -e 's,@BINDIR@,${bindir},g' -i ${D}${systemd_system_unitdir}/*.service + fi + +} + +INITSCRIPT_NAME = "vblade" +INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." + +SYSTEMD_SERVICE_${PN} = "vblade.service" +SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.2.0.bb b/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.2.0.bb deleted file mode 100644 index f46ddbf449..0000000000 --- a/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.2.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (C) 2012 Wind River Systems, Inc. -# -SUMMARY = "Provides a wrapper in Python to LDAP" -DESCRIPTION = "This module provides access to the LDAP \ -(Lightweight Directory Access Protocol) through Python operations \ -instead of C API. The module mainly acts as a wrapper for the \ -OpenLDAP 2.x libraries. Errors will appear as exceptions." - -LICENSE = "PSF" -HOMEPAGE = "http://www.python-ldap.org/" -DEPENDS = "python3 openldap cyrus-sasl" - -PYPI_PACKAGE = "python-ldap" -inherit pypi setuptools3 - -LIC_FILES_CHKSUM = "file://LICENCE;md5=36ce9d726d0321b73c1521704d07db1b" -SRC_URI[md5sum] = "fe22522208dc9b06d16eb70f8553eaab" -SRC_URI[sha256sum] = "7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e" - -do_configure_prepend() { - sed -i -e 's:^library_dirs =.*::' ${S}/setup.cfg - sed -i -e 's:^include_dirs =.*:include_dirs = =/usr/include/sasl/:' ${S}/setup.cfg -} - -RDEPENDS_${PN} = " \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-pyasn1 \ - ${PYTHON_PN}-pyasn1-modules \ -" diff --git a/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.3.1.bb b/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.3.1.bb new file mode 100644 index 0000000000..4a2ab3efbb --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.3.1.bb @@ -0,0 +1,31 @@ +# +# Copyright (C) 2012 Wind River Systems, Inc. +# +SUMMARY = "Provides a wrapper in Python to LDAP" +DESCRIPTION = "This module provides access to the LDAP \ +(Lightweight Directory Access Protocol) through Python operations \ +instead of C API. The module mainly acts as a wrapper for the \ +OpenLDAP 2.x libraries. Errors will appear as exceptions." + +LICENSE = "PSF" +HOMEPAGE = "http://www.python-ldap.org/" +DEPENDS = "python3 openldap cyrus-sasl" + +PYPI_PACKAGE = "python-ldap" +inherit pypi setuptools3 + +LIC_FILES_CHKSUM = "file://LICENCE;md5=36ce9d726d0321b73c1521704d07db1b" +SRC_URI[md5sum] = "7608579722c491e42f5f63b3f88a95fb" +SRC_URI[sha256sum] = "4711cacf013e298754abd70058ccc995758177fb425f1c2d30e71adfc1d00aa5" + +do_configure_prepend() { + sed -i -e 's:^library_dirs =.*::' ${S}/setup.cfg + sed -i -e 's:^include_dirs =.*:include_dirs = =/usr/include/sasl/:' ${S}/setup.cfg +} + +RDEPENDS_${PN} = " \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-pyasn1 \ + ${PYTHON_PN}-pyasn1-modules \ +" diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch deleted file mode 100644 index 90b69792b8..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dd35afc9ce1004128a754d5eeb8c5c2cb32ae420 Mon Sep 17 00:00:00 2001 -From: Bart De Schuymer -Date: Tue, 3 Jul 2012 18:47:32 +0000 -Subject: [PATCH 01/10] add RARP and update iana url - ---- - ethertypes | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/ethertypes b/ethertypes -index 5e700f6..813177b 100644 ---- a/ethertypes -+++ b/ethertypes -@@ -5,6 +5,7 @@ - # - # This list could be found on: - # http://www.iana.org/assignments/ethernet-numbers -+# http://www.iana.org/assignments/ieee-802-numbers - # - # ... #Comment - # -@@ -21,15 +22,16 @@ LAT 6004 # DEC LAT - DIAG 6005 # DEC Diagnostics - CUST 6006 # DEC Customer use - SCA 6007 # DEC Systems Comms Arch --TEB 6558 # Trans Ether Bridging [RFC1701] --RAW_FR 6559 # Raw Frame Relay [RFC1701] -+TEB 6558 # Trans Ether Bridging [RFC1701] -+RAW_FR 6559 # Raw Frame Relay [RFC1701] -+RARP 8035 # Reverse ARP [RFC903] - AARP 80F3 # Appletalk AARP --ATALK 809B # Appletalk -+ATALK 809B # Appletalk - 802_1Q 8100 8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame - IPX 8137 # Novell IPX - NetBEUI 8191 # NetBEUI - IPv6 86DD ip6 # IP version 6 --PPP 880B # PPP -+PPP 880B # PPP - ATMMPOA 884C # MultiProtocol over ATM - PPP_DISC 8863 # PPPoE discovery messages - PPP_SES 8864 # PPPoE session messages --- -2.12.1 - diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch deleted file mode 100644 index 87b0e9b877..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2a5333fc8b4825251adfb717d980d89cefde38d6 Mon Sep 17 00:00:00 2001 -From: Petri Gynther -Date: Sun, 24 Feb 2013 10:56:59 +0100 -Subject: [PATCH 02/10] fix compilation warning - ---- - communication.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/communication.c b/communication.c -index 62ed667..ba058c0 100644 ---- a/communication.c -+++ b/communication.c -@@ -282,7 +282,7 @@ static int store_counters_in_file(char *filename, struct ebt_u_replace *repl) - } - close_file: - fclose(file); -- return 0; -+ return ret; - } - - /* Gets executed after ebt_deliver_table. Delivers the counters to the kernel --- -2.12.1 - diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch deleted file mode 100644 index c8573a464f..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a6faf3b50d6af4768b7b853cb536944fb18e1450 Mon Sep 17 00:00:00 2001 -From: Bart De Schuymer -Date: Wed, 3 Jul 2013 22:12:47 +0200 -Subject: [PATCH 03/10] add info about -Wl,-no-as-needed - ---- - INSTALL | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/INSTALL b/INSTALL -index 4a05c67..e90d5c1 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -39,6 +39,8 @@ That's all - You can also use a base directory different from the root directory (/), - using the DESTDIR option. See the Makefile for more details. - -+You might need to set LDFLAGS=-Wl,-no-as-needed to build ebtables correctly -+on your system. - - ADDITIONAL PROGRAMS: - ---------------------- --- -2.12.1 - diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch deleted file mode 100644 index d8f2795bca..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b0617af37b8b1aafb43e8019135bea44c2d94c28 Mon Sep 17 00:00:00 2001 -From: Luis Fernando -Date: Wed, 3 Jul 2013 22:19:55 +0200 -Subject: [PATCH 04/10] workaround for kernel regression bug: IPv6 - source/destination addresses are potentially not matched correctly - ---- - extensions/ebt_ip6.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c -index 0465e77..bbdc4ae 100644 ---- a/extensions/ebt_ip6.c -+++ b/extensions/ebt_ip6.c -@@ -312,6 +312,10 @@ static void init(struct ebt_entry_match *match) - - ipinfo->invflags = 0; - ipinfo->bitmask = 0; -+ memset(ipinfo->saddr.s6_addr, 0, sizeof(ipinfo->saddr.s6_addr)); -+ memset(ipinfo->smsk.s6_addr, 0, sizeof(ipinfo->smsk.s6_addr)); -+ memset(ipinfo->daddr.s6_addr, 0, sizeof(ipinfo->daddr.s6_addr)); -+ memset(ipinfo->dmsk.s6_addr, 0, sizeof(ipinfo->dmsk.s6_addr)); - } - - #define OPT_SOURCE 0x01 --- -2.12.1 - diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch deleted file mode 100644 index 9585fd20e3..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 15d3ab8a4a167dc44396b003d2ec01841949972f Mon Sep 17 00:00:00 2001 -From: Sanket Shah -Date: Wed, 31 Jul 2013 21:40:08 +0200 -Subject: [PATCH 05/10] Add --noflush command line support for ebtables-restore - ---- - ebtables-restore.c | 29 +++++++++++++++++++++++++---- - 1 file changed, 25 insertions(+), 4 deletions(-) - -diff --git a/ebtables-restore.c b/ebtables-restore.c -index ea02960..bb4d0cf 100644 ---- a/ebtables-restore.c -+++ b/ebtables-restore.c -@@ -22,13 +22,25 @@ - #include - #include - #include -+#include - #include "include/ebtables_u.h" - -+static const struct option options[] = { -+ {.name = "noflush", .has_arg = 0, .val = 'n'}, -+ { 0 } -+}; -+ - static struct ebt_u_replace replace[3]; - void ebt_early_init_once(); - - #define OPT_KERNELDATA 0x800 /* Also defined in ebtables.c */ - -+static void print_usage() -+{ -+ fprintf(stderr, "Usage: ebtables-restore [ --noflush ]\n"); -+ exit(1); -+} -+ - static void copy_table_names() - { - strcpy(replace[0].name, "filter"); -@@ -41,11 +53,20 @@ static void copy_table_names() - int main(int argc_, char *argv_[]) - { - char *argv[EBTD_ARGC_MAX], cmdline[EBTD_CMDLINE_MAXLN]; -- int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace; -+ int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace, c, flush = 1; - char ebtables_str[] = "ebtables"; - -- if (argc_ != 1) -- ebtrest_print_error("options are not supported"); -+ while ((c = getopt_long(argc_, argv_, "n", options, NULL)) != -1) { -+ switch(c) { -+ case 'n': -+ flush = 0; -+ break; -+ default: -+ print_usage(); -+ break; -+ } -+ } -+ - ebt_silent = 0; - copy_table_names(); - ebt_early_init_once(); -@@ -68,7 +89,7 @@ int main(int argc_, char *argv_[]) - ebtrest_print_error("table '%s' was not recognized", cmdline+1); - table_nr = i; - replace[table_nr].command = 11; -- ebt_get_kernel_table(&replace[table_nr], 1); -+ ebt_get_kernel_table(&replace[table_nr], flush); - replace[table_nr].command = 0; - replace[table_nr].flags = OPT_KERNELDATA; /* Prevent do_command from initialising replace */ - continue; --- -2.12.1 - diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch deleted file mode 100644 index 21f8e588d4..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 85a0f6d77a9d5c0e7ef7948395f0f6b1612dc987 Mon Sep 17 00:00:00 2001 -From: Bart De Schuymer -Date: Mon, 14 Apr 2014 22:04:55 +0200 -Subject: [PATCH 06/10] don't print IPv6 mask if it's all ones (based on patch - by Mariusz Mazur ) - ---- - extensions/ebt_ip6.c | 4 ++-- - include/ebtables_u.h | 1 + - useful_functions.c | 13 +++++++++++++ - 3 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c -index bbdc4ae..e3e0956 100644 ---- a/extensions/ebt_ip6.c -+++ b/extensions/ebt_ip6.c -@@ -449,14 +449,14 @@ static void print(const struct ebt_u_entry *entry, - if (ipinfo->invflags & EBT_IP6_SOURCE) - printf("! "); - printf("%s", ebt_ip6_to_numeric(&ipinfo->saddr)); -- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->smsk)); -+ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->smsk)); - } - if (ipinfo->bitmask & EBT_IP6_DEST) { - printf("--ip6-dst "); - if (ipinfo->invflags & EBT_IP6_DEST) - printf("! "); - printf("%s", ebt_ip6_to_numeric(&ipinfo->daddr)); -- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->dmsk)); -+ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->dmsk)); - } - if (ipinfo->bitmask & EBT_IP6_TCLASS) { - printf("--ip6-tclass "); -diff --git a/include/ebtables_u.h b/include/ebtables_u.h -index ab615c1..35a5bcc 100644 ---- a/include/ebtables_u.h -+++ b/include/ebtables_u.h -@@ -303,6 +303,7 @@ char *ebt_mask_to_dotted(uint32_t mask); - void ebt_parse_ip6_address(char *address, struct in6_addr *addr, - struct in6_addr *msk); - char *ebt_ip6_to_numeric(const struct in6_addr *addrp); -+char *ebt_ip6_mask_to_string(const struct in6_addr *msk); - - - int do_command(int argc, char *argv[], int exec_style, -diff --git a/useful_functions.c b/useful_functions.c -index d20b68e..d14cbe9 100644 ---- a/useful_functions.c -+++ b/useful_functions.c -@@ -411,3 +411,16 @@ char *ebt_ip6_to_numeric(const struct in6_addr *addrp) - static char buf[50+1]; - return (char *)inet_ntop(AF_INET6, addrp, buf, sizeof(buf)); - } -+ -+char *ebt_ip6_mask_to_string(const struct in6_addr *msk) -+{ -+ /* /0000:0000:0000:0000:0000:000.000.000.000 -+ * /0000:0000:0000:0000:0000:0000:0000:0000 */ -+ static char buf[51+1]; -+ if (msk->s6_addr32[0] == 0xFFFFFFFFL && msk->s6_addr32[1] == 0xFFFFFFFFL && -+ msk->s6_addr32[2] == 0xFFFFFFFFL && msk->s6_addr32[3] == 0xFFFFFFFFL) -+ *buf = '\0'; -+ else -+ sprintf(buf, "/%s", ebt_ip6_to_numeric(msk)); -+ return buf; -+} --- -2.12.1 - diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch deleted file mode 100644 index 6fbe7df4ca..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch +++ /dev/null @@ -1,67 +0,0 @@ -From a60c7d4a6d05387aceb8ae9c38390d0f9bae84a2 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 12:22:39 +0200 -Subject: [PATCH 07/10] extensions: Use stdint types - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso ---- - extensions/ebt_ip6.c | 4 ++-- - extensions/ebt_limit.c | 10 +++++----- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c -index e3e0956..dd48547 100644 ---- a/extensions/ebt_ip6.c -+++ b/extensions/ebt_ip6.c -@@ -53,8 +53,8 @@ static const struct option opts[] = - - struct icmpv6_names { - const char *name; -- u_int8_t type; -- u_int8_t code_min, code_max; -+ uint8_t type; -+ uint8_t code_min, code_max; - }; - - static const struct icmpv6_names icmpv6_codes[] = { -diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c -index ee40e5c..d189a09 100644 ---- a/extensions/ebt_limit.c -+++ b/extensions/ebt_limit.c -@@ -59,11 +59,11 @@ static void print_help(void) - " default %u\n", EBT_LIMIT_BURST); - } - --static int parse_rate(const char *rate, u_int32_t *val) -+static int parse_rate(const char *rate, uint32_t *val) - { - const char *delim; -- u_int32_t r; -- u_int32_t mult = 1; /* Seconds by default. */ -+ uint32_t r; -+ uint32_t mult = 1; /* Seconds by default. */ - - delim = strchr(rate, '/'); - if (delim) { -@@ -151,7 +151,7 @@ static void final_check(const struct ebt_u_entry *entry, - struct rates - { - const char *name; -- u_int32_t mult; -+ uint32_t mult; - }; - - static struct rates g_rates[] = -@@ -162,7 +162,7 @@ static struct rates g_rates[] = - { "sec", EBT_LIMIT_SCALE } - }; - --static void print_rate(u_int32_t period) -+static void print_rate(uint32_t period) - { - unsigned int i; - --- -2.12.1 - diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch deleted file mode 100644 index df3f521437..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6ed23c8c2bc5efc3956e7bb6155afc8f45e6ae1a Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 12:31:58 +0200 -Subject: [PATCH 08/10] ethernetdb.h: Remove C++ specific compiler hint macro - _THROW - -Fixes compilation with musl libc - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso ---- - include/ethernetdb.h | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/include/ethernetdb.h b/include/ethernetdb.h -index 46d8bfd..1683abe 100644 ---- a/include/ethernetdb.h -+++ b/include/ethernetdb.h -@@ -38,21 +38,20 @@ struct ethertypeent { - - /* Open ethertype data base files and mark them as staying open even - after a later search if STAY_OPEN is non-zero. */ --extern void setethertypeent(int __stay_open) __THROW; -+extern void setethertypeent(int __stay_open); - - /* Close ethertype data base files and clear `stay open' flag. */ --extern void endethertypeent(void) __THROW; -+extern void endethertypeent(void); - - /* Get next entry from ethertype data base file. Open data base if - necessary. */ --extern struct ethertypeent *getethertypeent(void) __THROW; -+extern struct ethertypeent *getethertypeent(void); - - /* Return entry from ethertype data base for network with NAME. */ --extern struct ethertypeent *getethertypebyname(__const char *__name) -- __THROW; -+extern struct ethertypeent *getethertypebyname(__const char *__name); - - /* Return entry from ethertype data base which number is PROTO. */ --extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW; -+extern struct ethertypeent *getethertypebynumber(int __ethertype); - - - #endif /* ethernetdb.h */ --- -2.12.1 - diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch deleted file mode 100644 index 248582c188..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e6b367c0c2668341c47242d099f4d2048ae575ef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alin=20N=C4=83stac?= -Date: Thu, 22 Oct 2015 16:41:03 +0200 -Subject: [PATCH 09/10] ebtables: Allow RETURN target rules in user defined - chains - -During loop checking ebtables marks entries with '1 << NF_BR_NUMHOOKS' if -they're called from a base chain rather than a user defined chain. - -This can be used by ebtables targets that can encode a special return -value to bail out if e.g. RETURN is used from a base chain. - -Unfortunately, this is broken, since the '1 << NF_BR_NUMHOOKS' is also -copied to called user-defined-chains (i.e., a user defined chain can no -longer be distinguished from a base chain): - -root@OpenWrt:~# ebtables -N foo -root@OpenWrt:~# ebtables -A OUTPUT -j foo -root@OpenWrt:~# ebtables -A foo -j mark --mark-or 3 --mark-target RETURN ---mark-target RETURN not allowed on base chain. - -This works if -A OUTPUT -j foo is omitted, but will still appear -if we try to call foo from OUTPUT afterwards. - -After this patch we still reject -'-A OUTPUT -j mark .. --mark-target RETURN'. - -Signed-off-by: Florian Westphal ---- - libebtc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libebtc.c b/libebtc.c -index 17ba8f2..74830ec 100644 ---- a/libebtc.c -+++ b/libebtc.c -@@ -1102,7 +1102,7 @@ void ebt_check_for_loops(struct ebt_u_replace *replace) - /* check if we've dealt with this chain already */ - if (entries2->hook_mask & (1<hook_mask |= entries->hook_mask; -+ entries2->hook_mask |= entries->hook_mask & ~(1 << NF_BR_NUMHOOKS); - /* Jump to the chain, make sure we know how to get back */ - stack[sp].chain_nr = chain_nr; - stack[sp].n = j; --- -2.12.1 - diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch deleted file mode 100644 index a6ef9cd099..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch +++ /dev/null @@ -1,216 +0,0 @@ -From b7cee37734007fced7a4d5ed586c3a9e5ad92878 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 26 Mar 2017 13:12:21 -0700 -Subject: [PATCH 10/10] Adjust header include sequence - -This fixes the build with musl - -Signed-off-by: Khem Raj ---- - extensions/ebt_among.c | 2 +- - extensions/ebt_arpreply.c | 2 +- - extensions/ebt_nat.c | 2 +- - include/linux/if_ether.h | 126 ---------------------------------------------- - useful_functions.c | 4 +- - 5 files changed, 5 insertions(+), 131 deletions(-) - delete mode 100644 include/linux/if_ether.h - -diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c -index f97d07e..b096847 100644 ---- a/extensions/ebt_among.c -+++ b/extensions/ebt_among.c -@@ -12,8 +12,8 @@ - #include - #include - #include --#include "../include/ebtables_u.h" - #include -+#include "../include/ebtables_u.h" - #include "../include/ethernetdb.h" - #include - #include -diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c -index c3757f3..c5102a4 100644 ---- a/extensions/ebt_arpreply.c -+++ b/extensions/ebt_arpreply.c -@@ -11,8 +11,8 @@ - #include - #include - #include --#include "../include/ebtables_u.h" - #include -+#include "../include/ebtables_u.h" - #include - - static int mac_supplied; -diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c -index e6afbf8..8d318d1 100644 ---- a/extensions/ebt_nat.c -+++ b/extensions/ebt_nat.c -@@ -10,8 +10,8 @@ - #include - #include - #include --#include "../include/ebtables_u.h" - #include -+#include "../include/ebtables_u.h" - #include - - static int to_source_supplied, to_dest_supplied; -diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h -deleted file mode 100644 -index 28a15ff..0000000 ---- a/include/linux/if_ether.h -+++ /dev/null -@@ -1,126 +0,0 @@ --/* -- * INET An implementation of the TCP/IP protocol suite for the LINUX -- * operating system. INET is implemented using the BSD Socket -- * interface as the means of communication with the user level. -- * -- * Global definitions for the Ethernet IEEE 802.3 interface. -- * -- * Version: @(#)if_ether.h 1.0.1a 02/08/94 -- * -- * Author: Fred N. van Kempen, -- * Donald Becker, -- * Alan Cox, -- * Steve Whitehouse, -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License -- * as published by the Free Software Foundation; either version -- * 2 of the License, or (at your option) any later version. -- */ -- --#ifndef _LINUX_IF_ETHER_H --#define _LINUX_IF_ETHER_H -- --#include -- --/* -- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -- * and FCS/CRC (frame check sequence). -- */ -- --#define ETH_ALEN 6 /* Octets in one ethernet addr */ --#define ETH_HLEN 14 /* Total octets in header. */ --#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ --#define ETH_DATA_LEN 1500 /* Max. octets in payload */ --#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ --#define ETH_FCS_LEN 4 /* Octets in the FCS */ -- --/* -- * These are the defined Ethernet Protocol ID's. -- */ -- --#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */ --#define ETH_P_PUP 0x0200 /* Xerox PUP packet */ --#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */ --#define ETH_P_IP 0x0800 /* Internet Protocol packet */ --#define ETH_P_X25 0x0805 /* CCITT X.25 */ --#define ETH_P_ARP 0x0806 /* Address Resolution packet */ --#define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */ --#define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */ --#define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */ --#define ETH_P_DEC 0x6000 /* DEC Assigned proto */ --#define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */ --#define ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */ --#define ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */ --#define ETH_P_LAT 0x6004 /* DEC LAT */ --#define ETH_P_DIAG 0x6005 /* DEC Diagnostics */ --#define ETH_P_CUST 0x6006 /* DEC Customer use */ --#define ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */ --#define ETH_P_TEB 0x6558 /* Trans Ether Bridging */ --#define ETH_P_RARP 0x8035 /* Reverse Addr Res packet */ --#define ETH_P_ATALK 0x809B /* Appletalk DDP */ --#define ETH_P_AARP 0x80F3 /* Appletalk AARP */ --#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */ --#define ETH_P_IPX 0x8137 /* IPX over DIX */ --#define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */ --#define ETH_P_PAUSE 0x8808 /* IEEE Pause frames. See 802.3 31B */ --#define ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */ --#define ETH_P_WCCP 0x883E /* Web-cache coordination protocol -- * defined in draft-wilson-wrec-wccp-v2-00.txt */ --#define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */ --#define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */ --#define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */ --#define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */ --#define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ --#define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */ --#define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport -- * over Ethernet -- */ --#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ --#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ --#define ETH_P_TIPC 0x88CA /* TIPC */ --#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */ --#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ --#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ --#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ -- --/* -- * Non DIX types. Won't clash for 1500 types. -- */ -- --#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */ --#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */ --#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */ --#define ETH_P_802_2 0x0004 /* 802.2 frames */ --#define ETH_P_SNAP 0x0005 /* Internal only */ --#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */ --#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ --#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ --#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ --#define ETH_P_CAN 0x000C /* Controller Area Network */ --#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ --#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ --#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */ --#define ETH_P_CONTROL 0x0016 /* Card specific control frames */ --#define ETH_P_IRDA 0x0017 /* Linux-IrDA */ --#define ETH_P_ECONET 0x0018 /* Acorn Econet */ --#define ETH_P_HDLC 0x0019 /* HDLC frames */ --#define ETH_P_ARCNET 0x001A /* 1A for ArcNet :-) */ --#define ETH_P_DSA 0x001B /* Distributed Switch Arch. */ --#define ETH_P_TRAILER 0x001C /* Trailer switch tagging */ --#define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */ --#define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */ --#define ETH_P_CAIF 0x00F7 /* ST-Ericsson CAIF protocol */ -- --/* -- * This is an Ethernet frame header. -- */ -- --struct ethhdr { -- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ -- unsigned char h_source[ETH_ALEN]; /* source ether addr */ -- __be16 h_proto; /* packet type ID field */ --} __attribute__((packed)); -- -- --#endif /* _LINUX_IF_ETHER_H */ -diff --git a/useful_functions.c b/useful_functions.c -index d14cbe9..c304f4d 100644 ---- a/useful_functions.c -+++ b/useful_functions.c -@@ -22,8 +22,6 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ --#include "include/ebtables_u.h" --#include "include/ethernetdb.h" - #include - #include - #include -@@ -33,6 +31,8 @@ - #include - #include - #include -+#include "include/ebtables_u.h" -+#include "include/ethernetdb.h" - - const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0}; - const unsigned char msk_type_unicast[ETH_ALEN] = {1,0,0,0,0,0}; --- -2.12.1 - diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch deleted file mode 100644 index c260403eaf..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## debian_defaultconfig.dpatch by -## -## DP: Debian enhancements to the ebtables "sysconfig" default settings. - -@DPATCH@ - ---- ebtables-2.0.8.1.orig/ebtables-config -+++ ebtables-2.0.8.1/ebtables-config -@@ -1,17 +1,3 @@ --# Save (and possibly restore) in text format. --# Value: yes|no, default: yes --# Save the firewall rules in text format to __SYSCONFIG__/ebtables --# If EBTABLES_BINARY_FORMAT="no" then restoring the firewall rules --# is done using this text format. --EBTABLES_TEXT_FORMAT="yes" -- --# Save (and restore) in binary format. --# Value: yes|no, default: yes --# Save (and restore) the firewall rules in binary format to (and from) --# __SYSCONFIG__/ebtables.. Enabling this option will make --# firewall initialisation a lot faster. --EBTABLES_BINARY_FORMAT="yes" -- - # Unload modules on restart and stop - # Value: yes|no, default: yes - # This option has to be 'yes' to get to a sane state for a firewall -@@ -19,6 +5,12 @@ - # modules. - EBTABLES_MODULES_UNLOAD="yes" - -+# Load firewall rules on system startup. -+# Value: yes|no, default: no -+# Restores the ebtables rulesets from the last saved state when the -+# system boots up. -+EBTABLES_LOAD_ON_START="no" -+ - # Save current firewall rules on stop. - # Value: yes|no, default: no - # Saves all firewall rules if firewall gets stopped -@@ -35,3 +27,9 @@ - # Save rule counters when saving a kernel table to a file. If the - # rule counters were saved, they will be restored when restoring the table. - EBTABLES_SAVE_COUNTER="no" -+ -+# Backup suffix for ruleset save files. -+# Value: , default: "~" -+# Keep one backup level of saved rules. -+# Set this variable to the empty string to disable backups. -+EBTABLES_BACKUP_SUFFIX="~" diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables-save b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables-save deleted file mode 100755 index 2d7fc4ed7c..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables-save +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -EBTABLES="/sbin/ebtables" - -[ -x "$EBTABLES" ] || exit 1 - -echo "# Generated by ebtables-save v1.0 on $(date)" - -cnt="" -[ "x$EBTABLES_SAVE_COUNTER" = "xyes" ] && cnt="--Lc" - -for table_name in $(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//); do - table=$($EBTABLES -t $table_name -L $cnt) - [ $? -eq 0 ] || { echo "$table"; exit -1; } - - chain="" - rules="" - while read line; do - [ -z "$line" ] && continue - - case "$line" in - Bridge\ table:\ *) - echo "*${line:14}" - ;; - Bridge\ chain:\ *) - chain="${line:14}" - chain="${chain%%,*}" - policy="${line##*policy: }" - echo ":$chain $policy" - ;; - *) - if [ "$cnt" = "--Lc" ]; then - line=${line/, pcnt \=/ -c} - line=${line/-- bcnt \=/} - fi - rules="$rules-A $chain $line\n" - ;; - esac - done <&1 1>/dev/null | grep -q permission - if [ $? -eq 0 ]; then - echo "Error: insufficient privileges to access the ebtables rulesets." - exit 1 - fi - for table in filter nat broute; do - /sbin/ebtables -t $table -L &> /dev/null - if [ $? -eq 0 ]; then - EBTABLES_SUPPORTED_TABLES="${EBTABLES_SUPPORTED_TABLES} $table" - fi - done -} - -load() { - RETVAL=0 - get_supported_tables - echo -n "Restoring ebtables rulesets: " - for table in $EBTABLES_SUPPORTED_TABLES; do - echo -n "$table " - if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then - /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit - RET=$? - if [ $RET -ne 0 ]; then - echo -n "(failed) " - RETVAL=$RET - fi - else - echo -n "(no saved state) " - fi - done - if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then - echo -n "no kernel support. " - else - echo -n "done. " - fi - if [ $RETVAL -eq 0 ]; then - echo "ok" - else - echo "fail" - fi -} - -clear_rules() { - RETVAL=0 - get_supported_tables - echo -n "Clearing ebtables rulesets: " - for table in $EBTABLES_SUPPORTED_TABLES; do - echo -n "$table " - /sbin/ebtables -t $table --init-table - done - - if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then - for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -d' ' -f1) ebtables; do - rmmod $mod 2> /dev/null - done - fi - if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then - echo -n "no kernel support. " - else - echo -n "done. " - fi - if [ $RETVAL -eq 0 ]; then - echo "ok" - else - echo "fail" - fi -} - -save() { - RETVAL=0 - get_supported_tables - echo -n "Saving ebtables rulesets: " - for table in $EBTABLES_SUPPORTED_TABLES; do - echo -n "$table " - [ -n "$EBTABLES_BACKUP_SUFFIX" ] && [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] && \ - mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX - /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save - RET=$? - if [ $RET -ne 0 ]; then - echo -n "(failed) " - RETVAL=$RET - else - if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then - /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z - fi - fi - done - if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then - echo -n "no kernel support. " - else - echo -n "done. " - fi - if [ $RETVAL -eq 0 ]; then - echo "ok" - else - echo "fail" - fi -} - -case "$1" in - start) - [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load - ;; - stop) - [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save - clear_rules - ;; - restart|reload|force-reload) - [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save - clear_rules - [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load - ;; - load) - load - ;; - save) - save - ;; - status) - get_supported_tables - if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then - echo "No kernel support for ebtables." - RETVAL=1 - else - echo -n "Ebtables support available, number of installed rules: " - for table in $EBTABLES_SUPPORTED_TABLES; do - COUNT=$(( $(/sbin/ebtables -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 )) - echo -n "$table($COUNT) " - done - echo ok - RETVAL=0 - fi - ;; - *) - echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2 - RETVAL=1 -esac - -exit $RETVAL diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init deleted file mode 100755 index c9a77a29e8..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# init script for the Ethernet Bridge filter tables -# -# Written by Dag Wieers -# Modified by Rok Papez -# Bart De Schuymer -# Adapted to Debian by Jan Christoph Nordholz -# Adapted to OpenEmbedded by Roman I Khimov -# -# chkconfig: - 15 85 -# description: Ethernet Bridge filtering tables -# -### BEGIN INIT INFO -# Provides: ebtables -# Required-Start: -# Required-Stop: -# Should-Start: $local_fs -# Should-Stop: $local_fs -# Default-Start: S -# Default-Stop: 0 6 -# Short-Description: ebtables ruleset management -# Description: Saves and restores the state of the ebtables rulesets. -### END INIT INFO - -/usr/sbin/ebtables.common $1 diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.service b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.service deleted file mode 100644 index 3abd1fe3e2..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Ethernet Bridge Filtering Tables - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=@SBINDIR@/ebtables.common start -ExecStop=@SBINDIR@/ebtables.common stop - -[Install] -WantedBy=multi-user.target diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch deleted file mode 100644 index bcd9bed238..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/Makefile b/Makefile -index c1106a4..7ea6b7a 100644 ---- a/Makefile -+++ b/Makefile -@@ -157,31 +157,31 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\//\\\//g') - scripts: ebtables-save ebtables.sysv ebtables-config - cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ - mkdir -p $(DESTDIR)$(BINDIR) -- install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save -+ install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save - cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_ - if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi -- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi -+ if test -d $(DESTDIR)$(INITDIR); then install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi - cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_ - if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(SYSCONFIGDIR); fi -- if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi -+ if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi - rm -f ebtables-save_ ebtables.sysv_ ebtables-config_ - - tmp4:=$(shell printf $(LOCKFILE) | sed 's/\//\\\//g') - $(MANDIR)/man8/ebtables.8: ebtables.8 - mkdir -p $(DESTDIR)$(@D) - sed -e 's/$$(VERSION)/$(PROGVERSION)/' -e 's/$$(DATE)/$(PROGDATE)/' -e 's/$$(LOCKFILE)/$(tmp4)/' ebtables.8 > ebtables.8_ -- install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@ -+ install -m 0644 ebtables.8_ $(DESTDIR)$@ - rm -f ebtables.8_ - - $(DESTDIR)$(ETHERTYPESFILE): ethertypes - mkdir -p $(@D) -- install -m 0644 -o root -g root $< $@ -+ install -m 0644 $< $@ - - .PHONY: exec - exec: ebtables ebtables-restore - mkdir -p $(DESTDIR)$(BINDIR) -- install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME) -- install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore -+ install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME) -+ install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore - - .PHONY: install - install: $(MANDIR)/man8/ebtables.8 $(DESTDIR)$(ETHERTYPESFILE) exec scripts diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/no-as-needed.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/no-as-needed.patch deleted file mode 100644 index 336119d6ba..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/no-as-needed.patch +++ /dev/null @@ -1,25 +0,0 @@ -link ebtables with --no-as-needed and adjust the link order to fix runtime crash - -Program terminated with signal 11, Segmentation fault. -#0 0x00007ffaa837fb53 in ebt_initialize_entry () from /lib64/ebtables/libebtc.so -(gdb) bt -#0 0x00007ffaa837fb53 in ebt_initialize_entry () from /lib64/ebtables/libebtc.so -#1 0x00007ffaa83824dc in do_command () from /lib64/ebtables/libebtc.so -#2 0x000000000040065c in ?? () -#3 0x00007ffaa7fed755 in __libc_start_main () from /lib64/libc.so.6 -#4 0x0000000000400691 in ?? () - -Signed-off-by: Khem Raj -Index: ebtables-v2.0.10-4/Makefile -=================================================================== ---- ebtables-v2.0.10-4.orig/Makefile 2011-12-15 12:02:47.000000000 -0800 -+++ ebtables-v2.0.10-4/Makefile 2012-12-17 22:09:45.065973753 -0800 -@@ -90,7 +90,7 @@ - $(CC) -shared $(LDFLAGS) -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2) - - ebtables: $(OBJECTS) ebtables-standalone.o libebtc.so -- $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ -+ $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -Wl,--no-as-needed $(EXT_LIBSI) -lebtc \ - -Wl,-rpath,$(LIBDIR) - - ebtablesu: ebtablesu.c diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch new file mode 100644 index 0000000000..f2dbb552ea --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch @@ -0,0 +1,34 @@ +From a822e8dbca017e426a4c1c3ca835d0d03cbb4a4d Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 31 Dec 2020 16:09:56 +0800 +Subject: [PATCH] Makefile.am: do not install /etc/ethertypes + +The /etc/ethertypes is provided by netbase since 6.0[1]. +Do not instal the file in ebtables, otherwise there would be a conflict: +Error: Transaction test error: + file /etc/ethertypes conflicts between attempted installs of netbase-1:6.2-r0.corei7_64 and ebtables-2.0.10+4-r4.corei7_64 + +[1] https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35) + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index b879941..2237002 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,7 +26,6 @@ AM_CFLAGS = ${regular_CFLAGS} + + sbin_PROGRAMS = ebtables-legacy ebtablesd ebtablesu ebtables-legacy-restore + EXTRA_PROGRAMS = static examples/ulog/test_ulog +-sysconf_DATA = ethertypes + sbin_SCRIPTS = ebtables-legacy-save + man8_MANS = ebtables-legacy.8 + lib_LTLIBRARIES = libebtc.la +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0010-Adjust-header-include-sequence.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0010-Adjust-header-include-sequence.patch new file mode 100644 index 0000000000..1f3fcfe370 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0010-Adjust-header-include-sequence.patch @@ -0,0 +1,84 @@ +From b7cee37734007fced7a4d5ed586c3a9e5ad92878 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 26 Mar 2017 13:12:21 -0700 +Subject: [PATCH 10/10] Adjust header include sequence + +This fixes the build with musl + +Signed-off-by: Khem Raj +Signed-off-by: Zang Ruochen +--- + extensions/ebt_among.c | 2 +- + extensions/ebt_arpreply.c | 2 +- + extensions/ebt_nat.c | 2 +- + useful_functions.c | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c +index 30c098c..af73bd9 100644 +--- a/extensions/ebt_among.c ++++ b/extensions/ebt_among.c +@@ -12,8 +12,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include "../include/ethernetdb.h" + #include + #include +diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c +index 399868b..7b6b5ae 100644 +--- a/extensions/ebt_arpreply.c ++++ b/extensions/ebt_arpreply.c +@@ -11,8 +11,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int mac_supplied; +diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c +index fe7e987..1899df3 100644 +--- a/extensions/ebt_nat.c ++++ b/extensions/ebt_nat.c +@@ -10,8 +10,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int to_source_supplied, to_dest_supplied; +diff --git a/useful_functions.c b/useful_functions.c +index 133ae2f..c7adc66 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -22,8 +22,6 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +-#include "include/ebtables_u.h" +-#include "include/ethernetdb.h" + #include + #include + #include +@@ -36,6 +34,8 @@ + #include + #include + #include ++#include "include/ebtables_u.h" ++#include "include/ethernetdb.h" + + + const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0}; +-- +2.25.1 + + diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save new file mode 100644 index 0000000000..2133600f77 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save @@ -0,0 +1,43 @@ +#!/bin/bash + +EBTABLES="/usr/sbin/ebtables-legacy" + +[ -x "$EBTABLES" ] || exit 1 + +echo "# Generated by ebtables-save v1.0 on $(date)" + +cnt="" +[ "x$EBTABLES_SAVE_COUNTER" = "xyes" ] && cnt="--Lc" + +for table_name in $(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//); do + table=$($EBTABLES -t $table_name -L $cnt) + [ $? -eq 0 ] || { echo "$table"; exit -1; } + + chain="" + rules="" + while read line; do + [ -z "$line" ] && continue + + case "$line" in + Bridge\ table:\ *) + echo "*${line:14}" + ;; + Bridge\ chain:\ *) + chain="${line:14}" + chain="${chain%%,*}" + policy="${line##*policy: }" + echo ":$chain $policy" + ;; + *) + if [ "$cnt" = "--Lc" ]; then + line=${line/, pcnt \=/ -c} + line=${line/-- bcnt \=/} + fi + rules="$rules-A $chain $line\n" + ;; + esac + done <&1 1>/dev/null | grep -q permission + if [ $? -eq 0 ]; then + echo "Error: insufficient privileges to access the ebtables rulesets." + exit 1 + fi + for table in filter nat broute; do + /usr/sbin/ebtables-legacy -t $table -L &> /dev/null + if [ $? -eq 0 ]; then + EBTABLES_SUPPORTED_TABLES="${EBTABLES_SUPPORTED_TABLES} $table" + fi + done +} + +load() { + RETVAL=0 + get_supported_tables + echo -n "Restoring ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit + RET=$? + if [ $RET -ne 0 ]; then + echo -n "(failed) " + RETVAL=$RET + fi + else + echo -n "(no saved state) " + fi + done + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +clear_rules() { + RETVAL=0 + get_supported_tables + echo -n "Clearing ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + /usr/sbin/ebtables-legacy -t $table --init-table + done + + if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then + for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -d' ' -f1) ebtables; do + rmmod $mod 2> /dev/null + done + fi + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +save() { + RETVAL=0 + get_supported_tables + echo -n "Saving ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + [ -n "$EBTABLES_BACKUP_SUFFIX" ] && [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] && \ + mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save + RET=$? + if [ $RET -ne 0 ]; then + echo -n "(failed) " + RETVAL=$RET + else + if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z + fi + fi + done + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +case "$1" in + start) + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + stop) + [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save + clear_rules + ;; + restart|reload|force-reload) + [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save + clear_rules + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + load) + load + ;; + save) + save + ;; + status) + get_supported_tables + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo "No kernel support for ebtables." + RETVAL=1 + else + echo -n "Ebtables support available, number of installed rules: " + for table in $EBTABLES_SUPPORTED_TABLES; do + COUNT=$(( $(/usr/sbin/ebtables-legacy -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 )) + echo -n "$table($COUNT) " + done + echo ok + RETVAL=0 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2 + RETVAL=1 +esac + +exit $RETVAL diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.service b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.service new file mode 100644 index 0000000000..3abd1fe3e2 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.service @@ -0,0 +1,11 @@ +[Unit] +Description=Ethernet Bridge Filtering Tables + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=@SBINDIR@/ebtables.common start +ExecStop=@SBINDIR@/ebtables.common stop + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb deleted file mode 100644 index 276784009f..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ /dev/null @@ -1,114 +0,0 @@ -SUMMARY = "Filtering tool for a Linux-based bridging firewall" -HOMEPAGE = "http://sourceforge.net/projects/ebtables/" -DESCRIPTION = "Utility for basic Ethernet frame filtering on a Linux bridge, \ - advanced logging, MAC DNAT/SNAT and brouting." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e" -SECTION = "net" -PR = "r4" - -RDEPENDS_${PN} += "bash" - -RRECOMMENDS_${PN} += "kernel-module-ebtables \ - " - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ebtables/files/ebtables/" - -SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ - file://ebtables-save \ - file://installnonroot.patch \ - file://01debian_defaultconfig.patch \ - file://ebtables.init \ - file://ebtables.common \ - file://ebtables.service \ - file://no-as-needed.patch \ - file://0001-add-RARP-and-update-iana-url.patch \ - file://0002-fix-compilation-warning.patch \ - file://0003-add-info-about-Wl-no-as-needed.patch \ - file://0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch \ - file://0005-Add-noflush-command-line-support-for-ebtables-restor.patch \ - file://0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch \ - file://0007-extensions-Use-stdint-types.patch \ - file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ - file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ - " - -SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch" - -SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0" -SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d" - -# It is using '-' but not '.' as delimiter for the version in the releases page, -# which causes the version comparison unmatched. -#UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/ebtables/files/ebtables/" -#UPSTREAM_CHECK_REGEX = "ebtables-(?P\d+(\-\d+)+)" - -RECIPE_UPSTREAM_VERSION = "2.0.10-4" -RECIPE_UPSTREAM_DATE = "Dec 15, 2011" -CHECK_DATE = "May 25, 2018" - -S = "${WORKDIR}/ebtables-v${PV}" - -inherit update-rc.d systemd - -python __anonymous () { - import re - - karch = d.getVar('TARGET_ARCH') - multilib = d.getVar('MLPREFIX') - - if multilib and ( karch == 'powerpc64' or karch == 'arm' ): - searchstr = "lib.?32" - reg = re.compile(searchstr) - if reg.search(multilib): - d.appendVar('CFLAGS' ,' -DKERNEL_64_USERSPACE_32 -DEBT_MIN_ALIGN=8') -} - -EXTRA_OEMAKE = " \ - BINDIR=${base_sbindir} \ - MANDIR=${mandir} \ - ETHERTYPESPATH=${sysconfdir} \ - INITDIR=${sysconfdir}/init.d \ - SYSCONFIGDIR=${sysconfdir}/default \ - LIBDIR=${base_libdir}/ebtables \ - 'CC=${CC}' \ - 'CFLAGS=${CFLAGS}' \ - 'LDFLAGS=${LDFLAGS} -Wl,--no-as-needed' \ - 'LD=${LD}' \ -" - -do_install () { - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/ebtables.common ${D}${sbindir}/ebtables.common - # Fix hardcoded paths in scripts - sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${sbindir}/ebtables.common - sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sbindir}/ebtables.common - - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/default - install -d ${D}${sysconfdir}/ebtables - oe_runmake DESTDIR='${D}' install - install -m 0755 ${WORKDIR}/ebtables.init ${D}/${sysconfdir}/init.d/ebtables - mv ${D}${sysconfdir}/default/ebtables-config ${D}${sysconfdir}/default/ebtables - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/ebtables - - # Replace upstream ebtables-save perl script with Fedora bash based rewrite - # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save - install -m 0755 ${WORKDIR}/ebtables-save ${D}${base_sbindir}/ebtables-save - sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${base_sbindir}/ebtables-save - - # Install systemd service files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ebtables.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service -} - -CONFFILES_${PN} += "${sysconfdir}/default/ebtables" - -INITSCRIPT_NAME = "ebtables" -INITSCRIPT_PARAMS = "start 41 S . stop 41 6 ." - -SYSTEMD_SERVICE_${PN} = "ebtables.service" - -FILES_${PN}-dbg += "${base_libdir}/ebtables/.debug" -FILES_${PN} += "${base_libdir}/ebtables/*.so" diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb new file mode 100644 index 0000000000..bc33c18c0b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb @@ -0,0 +1,53 @@ +SUMMARY = "Filtering tool for a Linux-based bridging firewall" +HOMEPAGE = "http://sourceforge.net/projects/ebtables/" +DESCRIPTION = "Utility for basic Ethernet frame filtering on a Linux bridge, \ + advanced logging, MAC DNAT/SNAT and brouting." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e" +SECTION = "net" + +RDEPENDS_${PN} += "bash perl" + +RRECOMMENDS_${PN} += "kernel-module-ebtables \ + " + +SRC_URI = "http://ftp.netfilter.org/pub/ebtables/ebtables-${PV}.tar.gz \ + file://0001-Makefile.am-do-not-install-etc-ethertypes.patch \ + file://ebtables-legacy-save \ + file://ebtables.common \ + file://ebtables.service \ + " + +SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch" + +SRC_URI[md5sum] = "071c8b0a59241667a0044fb040d4fc72" +SRC_URI[sha256sum] = "b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a" + +inherit systemd autotools + +do_install_append () { + # Replace upstream ebtables-save perl script with Fedora bash based rewrite + # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save + rm -f ${D}${sbindir}/ebtables-legacy-save + install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${sbindir}/ebtables-legacy-save + + # Install systemd service files + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/ebtables.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service + install -m 0755 ${WORKDIR}/ebtables.common ${D}${sbindir}/ebtables.common + fi + + install -d ${D}${base_sbindir} + ln -sf ${sbindir}/ebtables-legacy ${D}${base_sbindir}/ebtables +} + +do_configure_prepend () { + ( cd ${S}; ./autogen.sh ) +} + +FILES_${PN}-dbg += "${base_libdir}/ebtables/.debug" +FILES_${PN} += "${base_libdir}/ebtables/*.so" + +SYSTEMD_SERVICE_${PN} = "ebtables.service" diff --git a/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb b/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb deleted file mode 100644 index 1c87c48bfa..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Tools for ethernet bridging" -HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge" -SECTION = "net" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" - -SRCREV = "42c1aefc303fdf891fbb099ea51f00dca83ab606" - -SRC_URI = "\ - git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git \ - file://kernel-headers.patch \ - file://0005-build-don-t-ignore-CFLAGS-from-environment.patch \ - file://0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ -" - -S = "${WORKDIR}/git" - -DEPENDS = "sysfsutils" - -inherit autotools-brokensep update-alternatives - -ALTERNATIVE_${PN} = "brctl" -ALTERNATIVE_PRIORITY[brctl] = "100" -ALTERNATIVE_LINK_NAME[brctl] = "${sbindir}/brctl" - -EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}" - -do_install_append () { - install -d ${D}/${datadir}/bridge-utils - install -d ${D}/${sysconfdir}/network/if-pre-up.d - install -d ${D}/${sysconfdir}/network/if-post-down.d -} - -RRECOMMENDS_${PN} = "kernel-module-bridge" diff --git a/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb b/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb new file mode 100644 index 0000000000..3692323433 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb @@ -0,0 +1,35 @@ +SUMMARY = "Tools for ethernet bridging" +HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge" +SECTION = "net" +LICENSE = "GPLv2" + +LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" + +SRCREV = "ab8a2cc330253321be7bc69dea88bfaa3d48415e" + +SRC_URI = "\ + git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git \ + file://kernel-headers.patch \ + file://0005-build-don-t-ignore-CFLAGS-from-environment.patch \ + file://0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ +" + +S = "${WORKDIR}/git" + +DEPENDS = "sysfsutils" + +inherit autotools-brokensep update-alternatives + +ALTERNATIVE_${PN} = "brctl" +ALTERNATIVE_PRIORITY[brctl] = "100" +ALTERNATIVE_LINK_NAME[brctl] = "${sbindir}/brctl" + +EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}" + +do_install_append () { + install -d ${D}/${datadir}/bridge-utils + install -d ${D}/${sysconfdir}/network/if-pre-up.d + install -d ${D}/${sysconfdir}/network/if-post-down.d +} + +RRECOMMENDS_${PN} = "kernel-module-bridge" diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-waf-add-support-of-cross_compile.patch b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-waf-add-support-of-cross_compile.patch deleted file mode 100644 index e58339afbb..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-waf-add-support-of-cross_compile.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 4b8463ff43f8983a706b181c5292491f9f954be1 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 25 Jan 2019 15:00:59 +0800 -Subject: [PATCH] waf: add support of cross_compile - -After upgrade, waf also upgraded - -on 1.5.19, for cross_compile, subprocess.Popen is set to be -samba_cross.cross_Popen, which will not execute testprog on -host, but only read result from cross-answers.txt which is -passed by option --cross-answer - -part of old code: - args = Utils.to_list(kw.get('exec_args', [])) - proc = Utils.pproc.Popen([lastprog] + args, stdout=Utils.pproc.PIPE, stderr=Utils.pproc.PIPE) - -but on new version, exec_args is not used and cause do_configure -failed with Exec format error - -fixed by append cross anser related args to cmd - -Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/merge_requests/211] - -Signed-off-by: Changqing Li ---- - third_party/waf/waflib/Tools/c_config.py | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/third_party/waf/waflib/Tools/c_config.py b/third_party/waf/waflib/Tools/c_config.py -index 7608215..767cf33 100644 ---- a/third_party/waf/waflib/Tools/c_config.py -+++ b/third_party/waf/waflib/Tools/c_config.py -@@ -660,20 +660,21 @@ class test_exec(Task.Task): - """ - color = 'PINK' - def run(self): -+ args = self.generator.bld.kw.get('exec_args', []) - if getattr(self.generator, 'rpath', None): - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) -- else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args) -+ else: -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args) - else: - env = self.env.env or {} - env.update(dict(os.environ)) - for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): - env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args, env=env) - else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args, env=env) - - @feature('test_exec') - @after_method('apply_link') --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch index db3ddce2c1..5b7f69ec07 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch @@ -1,6 +1,6 @@ ---- a/lib/replace/wscript 2015-11-13 16:04:04.000000000 +0100 -+++ b/lib/replace/wscript 2015-11-13 16:23:20.000000000 +0100 -@@ -837,8 +837,6 @@ def build(bld): +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -947,8 +947,6 @@ def build(bld): if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c' if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' @@ -9,12 +9,13 @@ if not bld.CONFIG_SET('HAVE_CLOSEFROM'): REPLACE_SOURCE += ' closefrom.c' -@@ -852,7 +850,7 @@ def build(bld): +@@ -962,7 +960,7 @@ def build(bld): # at the moment: # hide_symbols=bld.BUILTIN_LIBRARY('replace'), private_library=True, -- deps='crypt dl nsl socket rt attr' + extra_libs) -+ deps='crypt dl nsl socket rt ' + extra_libs) +- deps='dl attr' + extra_libs) ++ deps='dl' + extra_libs) - replace_test_cflags="-Wno-format-zero-length" + replace_test_cflags = '' if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'): + diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.2.0.patch b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.2.0.patch index 3847b013e8..46fef1096b 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.2.0.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.2.0.patch @@ -1,6 +1,6 @@ -From c6d76c8ade57b996a8123b1c1a3a28ba4666e9c6 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 20 Jun 2019 10:57:06 +0800 +From 8a82056ba2f70137714f225d82993aa4b11042da Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Fri, 25 Dec 2020 14:14:08 +0900 Subject: [PATCH] talloc: Add configure options for packages Add configure options for the following packages: @@ -22,12 +22,12 @@ Signed-off-by: Joe Slater Modified tp apply to version 2.2.0 Signed-off-by: Changqing Li --- - lib/replace/wscript | 91 ++++++++++++++++++++++++++++++++++++++++------------- - wscript | 7 ++++- - 2 files changed, 76 insertions(+), 22 deletions(-) + lib/replace/wscript | 89 +++++++++++++++++++++++++++++++++++---------- + wscript | 7 +++- + 2 files changed, 75 insertions(+), 21 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 1d01e1e..7bc7666 100644 +index a2bc604..2e2e7bf 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -25,6 +25,41 @@ def options(opt): @@ -81,10 +81,9 @@ index 1d01e1e..7bc7666 100644 + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') + conf.CHECK_HEADERS('attr/xattr.h compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') -- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('locale.h ndir.h pwd.h') - conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') -+ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') + @@ -103,7 +102,7 @@ index 1d01e1e..7bc7666 100644 conf.CHECK_HEADERS('port.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -110,8 +158,9 @@ def configure(conf): +@@ -121,8 +169,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') @@ -115,7 +114,7 @@ index 1d01e1e..7bc7666 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -380,20 +429,20 @@ def configure(conf): +@@ -418,20 +467,20 @@ def configure(conf): strlcpy_in_bsd = False @@ -151,7 +150,7 @@ index 1d01e1e..7bc7666 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index e402069..9976f4c 100644 +index b955d21..4ac6e1e 100644 --- a/wscript +++ b/wscript @@ -31,7 +31,12 @@ def options(opt): @@ -169,5 +168,5 @@ index e402069..9976f4c 100644 def configure(conf): conf.RECURSE('lib/replace') -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb deleted file mode 100644 index 59deb15b63..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://talloc.samba.org" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & GPL-3.0+" -LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \ - file://pytalloc.h;beginline=1;endline=18;md5=2c498cc6f2263672483237b20f46b43d" - - -SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ - file://options-2.2.0.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ -" -SRC_URI[md5sum] = "8416b153547add81cd1a4d24e598c890" -SRC_URI[sha256sum] = "75d5bcb34482545a82ffb06da8f6c797f963a0da450d0830c669267b14992fc6" - -inherit waf-samba - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" - -S = "${WORKDIR}/talloc-${PV}" - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -EXTRA_OECONF += "--disable-rpath \ - --disable-rpath-install \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --disable-silent-rules \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -PACKAGES += "pytalloc pytalloc-dev" - -RPROVIDES_${PN}-dbg += "pytalloc-dbg" - -FILES_pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ - ${libdir}/libpytalloc-util.so.2 \ - ${libdir}/libpytalloc-util.so.2.1.1 \ - " -FILES_pytalloc-dev = "${libdir}/libpytalloc-util.so" -RDEPENDS_pytalloc = "python3" diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.1.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.1.bb new file mode 100644 index 0000000000..07d54b71fb --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.1.bb @@ -0,0 +1,53 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "http://talloc.samba.org" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & GPL-3.0+" +LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \ + file://pytalloc.h;beginline=1;endline=18;md5=2c498cc6f2263672483237b20f46b43d" + + +SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ + file://options-2.2.0.patch \ +" +SRC_URI[md5sum] = "ce40593428c0de6b85946189dcc37b5e" +SRC_URI[sha256sum] = "ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77" + +inherit waf-samba + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" + +S = "${WORKDIR}/talloc-${PV}" + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +EXTRA_OECONF += "--disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --disable-silent-rules \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +PACKAGES += "pytalloc pytalloc-dev" + +RPROVIDES_${PN}-dbg += "pytalloc-dbg" + +FILES_pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ + ${libdir}/libpytalloc-util.so.2 \ + ${libdir}/libpytalloc-util.so.2.1.1 \ + " +FILES_pytalloc-dev = "${libdir}/libpytalloc-util.so" +RDEPENDS_pytalloc = "python3" diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-waf-add-support-of-cross_compile.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-waf-add-support-of-cross_compile.patch deleted file mode 100644 index a717f1bbbc..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-waf-add-support-of-cross_compile.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 4b8463ff43f8983a706b181c5292491f9f954be1 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 25 Jan 2019 15:00:59 +0800 -Subject: [PATCH] waf: add support of cross_compile - -After upgrade, waf also upgraded. - -on 1.5.19, for cross_compile, subprocess.Popen is set to be -samba_cross.cross_Popen, which will not execute testprog on -host, but only read result from cross-answers.txt which is -passed by option --cross-answer - -part of old code: - args = Utils.to_list(kw.get('exec_args', [])) - proc = Utils.pproc.Popen([lastprog] + args, stdout=Utils.pproc.PIPE, stderr=Utils.pproc.PIPE) - -but on new version, exec_args is not used and cause do_configure -failed with Exec format error - -fixed by append cross anser related args to cmd - -Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/merge_requests/211] - -Signed-off-by: Changqing Li ---- - third_party/waf/waflib/Tools/c_config.py | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/third_party/waf/waflib/Tools/c_config.py b/third_party/waf/waflib/Tools/c_config.py -index 7608215..767cf33 100644 ---- a/third_party/waf/waflib/Tools/c_config.py -+++ b/third_party/waf/waflib/Tools/c_config.py -@@ -660,20 +660,21 @@ class test_exec(Task.Task): - """ - color = 'PINK' - def run(self): -+ args = self.generator.bld.kw.get('exec_args', []) - if getattr(self.generator, 'rpath', None): - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) -- else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args) -+ else: -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args) - else: - env = self.env.env or {} - env.update(dict(os.environ)) - for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): - env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args, env=env) - else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args, env=env) - - @feature('test_exec') - @after_method('apply_link') --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch index 35890335a3..b71192b7d2 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch @@ -1,8 +1,17 @@ +From 6c4a634cdf70147f773bb1806692c78bbb95c6f2 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Fri, 25 Dec 2020 15:10:58 +0900 +Subject: [PATCH] test + +--- + lib/replace/wscript | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + diff --git a/lib/replace/wscript b/lib/replace/wscript -index 079761d..07e0104 100644 +index e4642e8..163e94d 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -793,8 +793,6 @@ def build(bld): +@@ -945,8 +945,6 @@ def build(bld): if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c' if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' @@ -11,12 +20,15 @@ index 079761d..07e0104 100644 if not bld.CONFIG_SET('HAVE_CLOSEFROM'): REPLACE_SOURCE += ' closefrom.c' -@@ -808,7 +806,7 @@ def build(bld): +@@ -960,7 +958,7 @@ def build(bld): # at the moment: # hide_symbols=bld.BUILTIN_LIBRARY('replace'), private_library=True, -- deps='crypt dl nsl socket rt attr' + extra_libs) -+ deps='crypt dl nsl socket rt ' + extra_libs) +- deps='dl attr' + extra_libs) ++ deps='dl' + extra_libs) - replace_test_cflags="-Wno-format-zero-length" + replace_test_cflags = '' if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'): +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.10.0.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.10.0.patch index 882af0644a..42da2468f2 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.10.0.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.10.0.patch @@ -1,6 +1,6 @@ -From b2b19aa9968258b22cf31db0b9dba6bcf96046cf Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 20 Jun 2019 13:55:44 +0800 +From c012aa03613e6e74a0598185b222c7b531df1e2d Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Fri, 25 Dec 2020 15:03:17 +0900 Subject: [PATCH] Add configure options for packages Add configure options for the following packages: @@ -22,12 +22,12 @@ Signed-off-by: Joe Slater Update patch to version 0.10.0 Signed-off-by: Changqing Li --- - lib/replace/wscript | 89 ++++++++++++++++++++++++++++++++++++++++------------- + lib/replace/wscript | 87 ++++++++++++++++++++++++++++++++++----------- wscript | 6 ++++ - 2 files changed, 74 insertions(+), 21 deletions(-) + 2 files changed, 73 insertions(+), 20 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 1d01e1e..5cf444a 100644 +index a2bc604..e4642e8 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -25,6 +25,41 @@ def options(opt): @@ -81,13 +81,12 @@ index 1d01e1e..5cf444a 100644 + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') + conf.CHECK_HEADERS('compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') -- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('locale.h ndir.h pwd.h') - conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') -+ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') -+ ++ + if Options.options.enable_acl: + conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') + @@ -103,7 +102,7 @@ index 1d01e1e..5cf444a 100644 conf.CHECK_HEADERS('port.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -110,8 +158,9 @@ def configure(conf): +@@ -121,8 +169,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') @@ -115,7 +114,7 @@ index 1d01e1e..5cf444a 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -380,20 +429,18 @@ def configure(conf): +@@ -418,20 +467,18 @@ def configure(conf): strlcpy_in_bsd = False @@ -149,7 +148,7 @@ index 1d01e1e..5cf444a 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index ded182a..824a6dd 100644 +index 93af416..a0898b1 100644 --- a/wscript +++ b/wscript @@ -25,6 +25,12 @@ def options(opt): @@ -166,5 +165,5 @@ index ded182a..824a6dd 100644 def configure(conf): conf.RECURSE('lib/replace') -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.1.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.1.bb deleted file mode 100644 index f1b170dafd..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.1.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://tevent.samba.org" -SECTION = "libs" -LICENSE = "LGPLv3+" - -DEPENDS += "libtalloc libtirpc" -RDEPENDS_python3-tevent = "python3" - -SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ - file://options-0.10.0.patch \ - file://0001-libtevent-fix-musl-libc-compile-error.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ -" -LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" - -SRC_URI[md5sum] = "1060eb69d6994a847eecb73c4d391ced" -SRC_URI[sha256sum] = "79a4da68b38b86ac71d8ac824ee3605ab22a6a91cfa83033a7db73f3dd6910b6" - -inherit waf-samba - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" - -S = "${WORKDIR}/tevent-${PV}" - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -EXTRA_OECONF += "--disable-rpath \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - --without-gettext \ - " -do_install_append() { - # add this link for cross check python module existence. eg: on x86-64 host, check python module - # under recipe-sysroot which is mips64. - cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s _tevent.*.so _tevent.so -} - -PACKAGES += "python3-tevent" - -RPROVIDES_${PN}-dbg += "python3-tevent-dbg" - -FILES_python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" - -INSANE_SKIP_${MLPREFIX}python3-tevent = "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb new file mode 100644 index 0000000000..21f83ad35e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb @@ -0,0 +1,57 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "http://tevent.samba.org" +SECTION = "libs" +LICENSE = "LGPLv3+" + +DEPENDS += "libtalloc libtirpc" +RDEPENDS_python3-tevent = "python3" + +SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ + file://options-0.10.0.patch \ + file://0001-libtevent-fix-musl-libc-compile-error.patch \ +" +LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" + +SRC_URI[md5sum] = "105c7a4dbb96f1751eb27dfd05e7fa84" +SRC_URI[sha256sum] = "f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696" + +inherit waf-samba + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" + +S = "${WORKDIR}/tevent-${PV}" + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +EXTRA_OECONF += "--disable-rpath \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + --without-gettext \ + " +do_install_append() { + # add this link for cross check python module existence. eg: on x86-64 host, check python module + # under recipe-sysroot which is mips64. + cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s _tevent.*.so _tevent.so +} + +PACKAGES += "python3-tevent" + +RPROVIDES_${PN}-dbg += "python3-tevent-dbg" + +FILES_python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" + +INSANE_SKIP_${MLPREFIX}python3-tevent = "dev-so" 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 deleted file mode 100644 index 6918485870..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.29.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] = "46b452e95d69c92e4172b3673ed88d52" -SRC_URI[sha256sum] = "2244124579afb14e569f34393e9ac61e658a28b6ffa8e5c0d2c1c12a8ce695cd" - -inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base python3targetconfig - -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.30.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.30.bb new file mode 100644 index 0000000000..4929c4f05b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.30.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] = "8d35f68058ca5359973b4121e1544d31" +SRC_URI[sha256sum] = "237a9be2a30bde85a88c4ec2759b54eb5b21fede554ffabf8fef1ffac2b42ade" + +inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base python3targetconfig + +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/rdma-core/rdma-core_32.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_32.0.bb deleted file mode 100644 index 7772120ee6..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_32.0.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Userspace support for InfiniBand/RDMA verbs" -DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." -SECTION = "libs" - -DEPENDS = "libnl" -RDEPENDS_${PN} = "bash perl" - -BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ - " -SRCREV = "7a4f9ad9a1d906c5f2bbb18b588309c3d12460ac" -S = "${WORKDIR}/git" - -#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md -LICENSE = "BSD-2-Clause | GPLv2" -LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ - file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -EXTRA_OECMAKE = " \ - -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ - -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ - -DNO_MAN_PAGES=1 \ -" - -LTO = "" - -FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/*" -INSANE_SKIP_${PN} += "dev-so" - -inherit cmake cpan-base systemd - -SYSTEMD_SERVICE_${PN} = " \ - srp_daemon.service \ - iwpmd.service \ - ibacm.socket \ - rdma-load-modules@.service \ - srp_daemon_port@.service \ - rdma-hw.target \ - ibacm.service \ -" -SYSTEMD_AUTO_ENABLE = "disable" - -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_33.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_33.0.bb new file mode 100644 index 0000000000..1c1569cfb0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_33.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Userspace support for InfiniBand/RDMA verbs" +DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." +SECTION = "libs" + +DEPENDS = "libnl" +RDEPENDS_${PN} = "bash perl" + +SRC_URI = "git://github.com/linux-rdma/rdma-core.git" +SRCREV = "e66ca0832e58dafac7af7ad9e6799eaef438061a" +S = "${WORKDIR}/git" + +#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md +LICENSE = "BSD-2-Clause | GPLv2" +LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ + file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ + -DNO_MAN_PAGES=1 \ +" + +LTO = "" + +FILES_SOLIBSDEV = "" +FILES_${PN} += "${libdir}/*" +INSANE_SKIP_${PN} += "dev-so" + +inherit cmake cpan-base systemd + +SYSTEMD_SERVICE_${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + rdma-load-modules@.service \ + srp_daemon_port@.service \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb index 8f7bd59f18..afcb4d508e 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb @@ -23,6 +23,8 @@ SRC_URI = " \ SRC_URI[md5sum] = "a4ead41d371f91aa0a2287f589958bae" SRC_URI[sha256sum] = "2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410" +UPSTREAM_CHECK_REGEX = "tcpdump-(?P\d+(\.(?!99)\d+)+)\.tar" + inherit autotools-brokensep ptest PACKAGECONFIG ?= "openssl" diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb index 9937944924..c673ed0094 100644 --- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb @@ -40,6 +40,6 @@ do_install() { } -ALTERNATIVE_PRIORITY = "60" +ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "traceroute" ALTERNATIVE_LINK_NAME[traceroute] = "${bindir}/traceroute" diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 9b3f287006..1f60861649 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -28,6 +28,7 @@ BBFILE_PRIORITY_openembedded-layer = "6" BBFILES_DYNAMIC += " \ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/recipes-*/*/*.bb \ +gnome-layer:${LAYERDIR}/dynamic-layers/gnome-layer/recipes-*/*/*.bb \ perl-layer:${LAYERDIR}/dynamic-layers/perl-layer/recipes-*/*/*.bb \ " @@ -42,6 +43,7 @@ LAYERSERIES_COMPAT_openembedded-layer = "gatesgarth hardknott" LICENSE_PATH += "${LAYERDIR}/licenses" PREFERRED_RPROVIDER_libdevmapper = "lvm2" +PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" SIGGEN_EXCLUDERECIPES_ABISAFE += " \ fbset-modes \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend new file mode 100644 index 0000000000..dcd88841f9 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -0,0 +1,3 @@ +RDEPENDS_packagegroup-meta-oe-graphics +="\ + openbox-xdgmenu \ +" diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff new file mode 100644 index 0000000000..8ab5386dc1 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff @@ -0,0 +1,13 @@ +=== modified file 'openbox-xdgmenu.c' +--- openbox-xdgmenu.c 2011-09-03 20:13:39 +0000 ++++ openbox-xdgmenu.c 2013-12-28 17:41:04 +0000 +@@ -235,7 +235,7 @@ + } + + g_printf("\n", g_strjoinv("&", g_strsplit(name,"&",0))), +- g_printf("%s\n", exec), ++ g_printf("%s\n", exec), + g_printf("\n"); + + g_free(name); + diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch new file mode 100644 index 0000000000..03b357263f --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch @@ -0,0 +1,27 @@ +Index: openbox-xdgmenu-0.3/openbox-xdgmenu.c +=================================================================== +--- openbox-xdgmenu-0.3.orig/openbox-xdgmenu.c ++++ openbox-xdgmenu-0.3/openbox-xdgmenu.c +@@ -197,7 +197,7 @@ void process_entry(GMenuTreeEntry *entry + { + GDesktopAppInfo *appinfo = gmenu_tree_entry_get_app_info (entry); + char *name = g_strdup (g_app_info_get_name(G_APP_INFO(appinfo))); +- char *exec = g_strdup (g_app_info_get_executable(G_APP_INFO(appinfo))); ++ char *exec = g_strdup (g_app_info_get_commandline(G_APP_INFO(appinfo))); + int i; + + for (i = 0; i < strlen(exec) - 1; i++) { +@@ -217,8 +217,11 @@ void process_entry(GMenuTreeEntry *entry + } + } + +- g_printf("\n", g_strjoinv("&", g_strsplit(name,"&",0))), +- g_printf("%s\n", exec), ++ g_printf("\n", g_strjoinv("&", g_strsplit(name,"&",0))); ++ g_printf("%s%s\n", ++ g_desktop_app_info_get_boolean(appinfo, G_KEY_FILE_DESKTOP_KEY_TERMINAL) ? ++ "x-terminal-emulator -e " : "", ++ exec); + g_printf("\n"); + + g_free(name); diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch new file mode 100644 index 0000000000..3fcc319164 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch @@ -0,0 +1,184 @@ +Index: openbox-xdgmenu-0.3/openbox-xdgmenu.c +=================================================================== +--- openbox-xdgmenu-0.3.orig/openbox-xdgmenu.c ++++ openbox-xdgmenu-0.3/openbox-xdgmenu.c +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + + /*============================================================================= + * Declarations +@@ -42,7 +42,6 @@ static void process_directory(GMenuTreeD + static void process_entry(GMenuTreeEntry *entry); + static void process_separator(GMenuTreeSeparator *entry); + +-gboolean option_show_amount_of_entries = 0; + gboolean option_do_not_use_categories = 0; + + /*============================================================================= +@@ -61,11 +60,6 @@ int main (int argc, char **argv) + g_free (xdgfile); + return 0; + } +- else if ((strcmp (argv[i], "--show-amount") == 0) || +- (strcmp (argv[i], "-a") == 0)) +- { +- option_show_amount_of_entries = 1; +- } + else if ((strcmp (argv[i], "--plain") == 0) || + (strcmp (argv[i], "-p") == 0)) + { +@@ -93,16 +87,15 @@ int main (int argc, char **argv) + return 1; + } + +- FILE * file; +- if (!(file = fopen(xdgfile, "r"))) ++ GMenuTree *menuTree = gmenu_tree_new (xdgfile, GMENU_TREE_FLAGS_NONE ); ++ ++ GError *error = NULL; ++ if (!gmenu_tree_load_sync(menuTree, &error)) + { +- g_printf ("Could not read file \"%s\".\n", xdgfile); +- g_free (xdgfile); +- return 2; ++ g_printerr ("Failed to load tree: %s\n", error->message); ++ g_clear_error (&error); ++ return 3; + } +- fclose(file); +- +- GMenuTree *menuTree = gmenu_tree_lookup (xdgfile, GMENU_TREE_FLAGS_NONE ); + + GMenuTreeDirectory *rootDirectory = gmenu_tree_get_root_directory(menuTree); + +@@ -129,11 +122,10 @@ void show_help() + g_printf (" openbox-xdgmenu [options] \n"); + g_printf ("\n"); + g_printf ("Options:\n"); +- g_printf (" -a: Show the amount of items in each category next to its name.\n"); + g_printf (" -p: Do not use categories.\n"); + g_printf ("\n"); + g_printf ("For example:\n"); +- g_printf (" openbox-xdgmenu \"/etc/xdg/menus/applications.menu\"\n\n"); ++ g_printf (" openbox-xdgmenu \"gnome-applications.menu\"\n\n"); + } + + /*============================================================================= +@@ -141,72 +133,61 @@ void show_help() + */ + void process_directory(GMenuTreeDirectory *directory, gboolean isRoot) + { +- int hasSeparator = 0; ++ GMenuTreeSeparator *separator = NULL; + int hasMenu = 0; + GMenuTreeItemType entryType; +- GSList *entryList = gmenu_tree_directory_get_contents (directory); +- GSList *l; +- +- if (option_do_not_use_categories == 00 && isRoot == 0 && +- g_slist_length(entryList) > 0) ++ GMenuTreeIter *iter = gmenu_tree_directory_iter (directory); ++ GMenuTreeItemType next_type; ++ ++ while ((next_type = gmenu_tree_iter_next (iter)) != GMENU_TREE_ITEM_INVALID) + { +- hasMenu = 1; +- +- if (option_show_amount_of_entries == 1) ++ if (option_do_not_use_categories == 00 && isRoot == 0 && hasMenu == 0) + { ++ hasMenu = 1; ++ + g_printf( +- "\n", +- g_strjoinv("&", g_strsplit(gmenu_tree_directory_get_name(directory),"&",0)), +- g_strjoinv("&", g_strsplit(gmenu_tree_directory_get_name(directory),"&",0)), +- g_slist_length(entryList)); ++ "\n", ++ g_strjoinv("&", g_strsplit(gmenu_tree_directory_get_name(directory),"&",0)), ++ g_strjoinv("&", g_strsplit(gmenu_tree_directory_get_name(directory),"&",0))); + } +- else +- { +- g_printf( +- "\n", +- g_strjoinv("&", g_strsplit(gmenu_tree_directory_get_name(directory),"&",0)), +- g_strjoinv("&", g_strsplit(gmenu_tree_directory_get_name(directory),"&",0))); +- } +- } + +- for (l = entryList; l; l = l->next) +- { +- GMenuTreeItem *item = l->data; +- +- entryType = gmenu_tree_item_get_type (GMENU_TREE_ITEM(item)); +- +- switch (entryType) ++ switch (next_type) + { ++ case GMENU_TREE_ITEM_INVALID: ++ break; + case GMENU_TREE_ITEM_DIRECTORY: +- if (hasSeparator) ++ if (separator != NULL) + { +- process_separator(GMENU_TREE_SEPARATOR(item)); +- hasSeparator = 0; ++ process_separator(separator); ++ gmenu_tree_item_unref (separator); ++ separator = NULL; + } +- process_directory(GMENU_TREE_DIRECTORY(item), 0); ++ process_directory(gmenu_tree_iter_get_directory(iter), 0); + break; + case GMENU_TREE_ITEM_ENTRY: +- if (hasSeparator) ++ if (separator != NULL) + { +- process_separator(GMENU_TREE_SEPARATOR(item)); +- hasSeparator = 0; ++ process_separator(separator); ++ gmenu_tree_item_unref (separator); ++ separator = NULL; + } +- process_entry(GMENU_TREE_ENTRY(item)); ++ process_entry(gmenu_tree_iter_get_entry(iter)); + break; + case GMENU_TREE_ITEM_SEPARATOR: +- hasSeparator = 1; ++ separator = gmenu_tree_iter_get_separator(iter); + break; + } +- +- gmenu_tree_item_unref (item); + } + + if (hasMenu == 1) + { + g_printf("\n"); + } ++ ++ if (separator != NULL) ++ gmenu_tree_item_unref (separator); + +- g_slist_free (entryList); ++ gmenu_tree_iter_unref (iter); + } + + /*============================================================================= +@@ -214,8 +195,9 @@ void process_directory(GMenuTreeDirector + */ + void process_entry(GMenuTreeEntry *entry) + { +- char *name = g_strdup (gmenu_tree_entry_get_name(entry)); +- char *exec = g_strdup (gmenu_tree_entry_get_exec(entry)); ++ GDesktopAppInfo *appinfo = gmenu_tree_entry_get_app_info (entry); ++ char *name = g_strdup (g_app_info_get_name(G_APP_INFO(appinfo))); ++ char *exec = g_strdup (g_app_info_get_executable(G_APP_INFO(appinfo))); + int i; + + for (i = 0; i < strlen(exec) - 1; i++) { diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb new file mode 100644 index 0000000000..237154e295 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb @@ -0,0 +1,36 @@ +SUMMARY = "Openbox configuration tool" +AUTHOR = "Siegfried Gevatter" +HOMEPAGE = "https://launchpad.net/openbox-xdgmenu/" +SECTION = "x11/wm" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" +DEPENDS = " \ + gnome-menus3 \ + glib-2.0 \ +" +PV = "0.3" + +SRC_URI = " \ + http://launchpad.net/openbox-xdgmenu/trunk/0.3/+download/openbox-xdgmenu-0.3.tar.gz \ + file://7_6.diff;striplevel=0 \ + file://port-gnome-menus3.patch \ + file://fix-menu-generation.patch \ +" +SRC_URI[sha256sum] = "824e099928aab2fb628f0fa4870ef7bba10b95581e47c2d8fa216709a0f399b3" + +inherit pkgconfig features_check +# depends on openbox, which is X11-only +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OEMAKE = " \ + CC='${CC}' \ + CFLAGS='${CPPFLAGS} ${CFLAGS} `pkg-config --cflags glib-2.0 libgnome-menu-3.0` -DGMENU_I_KNOW_THIS_IS_UNSTABLE' \ + LDFLAGS='${LDFLAGS} `pkg-config --libs glib-2.0 libgnome-menu-3.0`' \ +" + +do_install() { + install -d ${D}${bindir} + install -m 0755 openbox-xdgmenu ${D}${bindir} +} + +RDEPENDS_${PN} += "virtual/x-terminal-emulator" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.24.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.24.bb deleted file mode 100644 index 1a42fd45c2..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.24.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Filesystem and hardware benchmark and stress tool" -DESCRIPTION = "fio is an I/O tool meant to be used both for benchmark and \ -stress/hardware verification. It has support for a number of I/O engines, \ -I/O priorities (for newer Linux kernels), rate I/O, forked or threaded jobs, \ -and much more. It can work on block devices as well as files. fio accepts \ -job descriptions in a simple-to-understand text format. Several example job \ -files are included. fio displays all sorts of I/O performance information." -HOMEPAGE = "http://freecode.com/projects/fio" -SECTION = "console/tests" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "libaio zlib coreutils-native" -DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'pmem', 'pmdk', '', d)}" -RDEPENDS_${PN} = "python3-core bash" - -PACKAGECONFIG_NUMA = "numa" -# ARM does not currently support NUMA -PACKAGECONFIG_NUMA_arm = "" -PACKAGECONFIG_NUMA_armeb = "" - -PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" -PACKAGECONFIG[numa] = ",--disable-numa,numactl" - -SRCREV = "45d3aa1f57be23db180f8db3d133e8094370f35c" -SRC_URI = "git://git.kernel.dk/fio.git \ -" - -S = "${WORKDIR}/git" - -# avoids build breaks when using no-static-libs.inc -DISABLE_STATIC = "" - -EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" -EXTRA_OECONF = "${@bb.utils.contains('MACHINE_FEATURES', 'x86', '--disable-optimizations', '', d)}" - -do_configure() { - ./configure ${EXTRA_OECONF} -} - -do_install() { - oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir} - install -d ${D}/${docdir}/${PN} - cp -R --no-dereference --preserve=mode,links -v ${S}/examples ${D}/${docdir}/${PN}/ -} diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.25.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.25.bb new file mode 100644 index 0000000000..6ab7ab79dd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.25.bb @@ -0,0 +1,45 @@ +SUMMARY = "Filesystem and hardware benchmark and stress tool" +DESCRIPTION = "fio is an I/O tool meant to be used both for benchmark and \ +stress/hardware verification. It has support for a number of I/O engines, \ +I/O priorities (for newer Linux kernels), rate I/O, forked or threaded jobs, \ +and much more. It can work on block devices as well as files. fio accepts \ +job descriptions in a simple-to-understand text format. Several example job \ +files are included. fio displays all sorts of I/O performance information." +HOMEPAGE = "http://freecode.com/projects/fio" +SECTION = "console/tests" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libaio zlib coreutils-native" +DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'pmem', 'pmdk', '', d)}" +RDEPENDS_${PN} = "python3-core bash" + +PACKAGECONFIG_NUMA = "numa" +# ARM does not currently support NUMA +PACKAGECONFIG_NUMA_arm = "" +PACKAGECONFIG_NUMA_armeb = "" + +PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" +PACKAGECONFIG[numa] = ",--disable-numa,numactl" + +SRCREV = "fd80924b22fef6ce0d5580724d91490347445f90" +SRC_URI = "git://git.kernel.dk/fio.git \ +" + +S = "${WORKDIR}/git" + +# avoids build breaks when using no-static-libs.inc +DISABLE_STATIC = "" + +EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" +EXTRA_OECONF = "${@bb.utils.contains('MACHINE_FEATURES', 'x86', '--disable-optimizations', '', d)}" + +do_configure() { + ./configure ${EXTRA_OECONF} +} + +do_install() { + oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir} + install -d ${D}/${docdir}/${PN} + cp -R --no-dereference --preserve=mode,links -v ${S}/examples ${D}/${docdir}/${PN}/ +} diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch new file mode 100644 index 0000000000..af88f6cd23 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch @@ -0,0 +1,138 @@ +From 90e837ffd1ff5c9add1074d69de23e58a3a4810e Mon Sep 17 00:00:00 2001 +From: Alyssa Rosenzweig +Date: Wed, 11 Nov 2020 09:26:03 -0500 +Subject: [PATCH 1/3] terrain: Fix precision bug in light rendering + +Resulting in overly bright rendering when mediump is implemented as +fp16. + +Signed-off-by: Alyssa Rosenzweig +--- + data/shaders/terrain.frag | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/data/shaders/terrain.frag b/data/shaders/terrain.frag +index 84d085c..58f17ea 100644 +--- a/data/shaders/terrain.frag ++++ b/data/shaders/terrain.frag +@@ -67,7 +67,12 @@ void main() { + vec3 pointSpecular = vec3( 0.0 ); + for ( int i = 0; i < MAX_POINT_LIGHTS; i ++ ) { + vec4 lPosition = viewMatrix * vec4( pointLightPosition[ i ], 1.0 ); ++#ifdef GL_FRAGMENT_PRECISION_HIGH ++ // should be highp for correct behaviour if mediump is implemented as fp16 ++ highp vec3 lVector = lPosition.xyz + vViewPosition.xyz; ++#else + vec3 lVector = lPosition.xyz + vViewPosition.xyz; ++#endif + float lDistance = 1.0; + if ( pointLightDistance[ i ] > 0.0 ) + lDistance = 1.0 - min( ( length( lVector ) / pointLightDistance[ i ] ), 1.0 ); + +From 1edd76fda77edabd49d713912aee49b8360c86c3 Mon Sep 17 00:00:00 2001 +From: Alyssa Rosenzweig +Date: Wed, 11 Nov 2020 09:49:52 -0500 +Subject: [PATCH 2/3] terrain: Fix precision handling in noise shader + +Another overflow resulting in infinity in mediump. Note this bug is +masked if the driver clamps infinity to MAX_FLOAT, but it's still our +bug. + +Signed-off-by: Alyssa Rosenzweig +--- + data/shaders/terrain-noise.frag | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/data/shaders/terrain-noise.frag b/data/shaders/terrain-noise.frag +index 7fea5c0..9535e58 100644 +--- a/data/shaders/terrain-noise.frag ++++ b/data/shaders/terrain-noise.frag +@@ -17,7 +17,13 @@ uniform float time; + uniform MEDIUMP vec2 uvScale; + varying vec2 vUv; + ++#ifdef GL_FRAGMENT_PRECISION_HIGH ++// x should be passed as highp since the intermediate multiplications can ++// overflow with mediump ++vec4 permute(highp vec4 x) ++#else + vec4 permute(vec4 x) ++#endif + { + return mod(((x * 34.0) + 1.0) * x, 289.0); + } + +From e866cc633ffc450e5358b2742f32ca360e4f3f12 Mon Sep 17 00:00:00 2001 +From: Alyssa Rosenzweig +Date: Wed, 11 Nov 2020 09:35:21 -0500 +Subject: [PATCH 3/3] loop,function,conditionals: Fix mediump overflow + +The multiplication can produce infinity. + +Signed-off-by: Alyssa Rosenzweig +--- + data/shaders/conditionals.frag | 9 ++++++++- + data/shaders/function.frag | 9 ++++++++- + data/shaders/loop.frag | 9 ++++++++- + 3 files changed, 24 insertions(+), 3 deletions(-) + +diff --git a/data/shaders/conditionals.frag b/data/shaders/conditionals.frag +index 3bd2507..e902263 100644 +--- a/data/shaders/conditionals.frag ++++ b/data/shaders/conditionals.frag +@@ -2,7 +2,14 @@ varying vec4 dummy; + + void main(void) + { +- float d = fract(gl_FragCoord.x * gl_FragCoord.y * 0.0001); ++#ifdef GL_FRAGMENT_PRECISION_HIGH ++ // should be declared highp since the multiplication can overflow in ++ // mediump, particularly if mediump is implemented as fp16 ++ highp vec2 FragCoord = gl_FragCoord.xy; ++#else ++ vec2 FragCoord = gl_FragCoord.xy; ++#endif ++ float d = fract(FragCoord.x * FragCoord.y * 0.0001); + + $MAIN$ + +diff --git a/data/shaders/function.frag b/data/shaders/function.frag +index 3e3c74f..9d0230e 100644 +--- a/data/shaders/function.frag ++++ b/data/shaders/function.frag +@@ -8,7 +8,14 @@ $PROCESS$ + + void main(void) + { +- float d = fract(gl_FragCoord.x * gl_FragCoord.y * 0.0001); ++#ifdef GL_FRAGMENT_PRECISION_HIGH ++ // should be declared highp since the multiplication can overflow in ++ // mediump, particularly if mediump is implemented as fp16 ++ highp vec2 FragCoord = gl_FragCoord.xy; ++#else ++ vec2 FragCoord = gl_FragCoord.xy; ++#endif ++ float d = fract(FragCoord.x * FragCoord.y * 0.0001); + + $MAIN$ + +diff --git a/data/shaders/loop.frag b/data/shaders/loop.frag +index 31ae23e..9a6afd2 100644 +--- a/data/shaders/loop.frag ++++ b/data/shaders/loop.frag +@@ -3,7 +3,14 @@ uniform int FragmentLoops; + + void main(void) + { +- float d = fract(gl_FragCoord.x * gl_FragCoord.y * 0.0001); ++#ifdef GL_FRAGMENT_PRECISION_HIGH ++ // should be declared highp since the multiplication can overflow in ++ // mediump, particularly if mediump is implemented as fp16 ++ highp vec2 FragCoord = gl_FragCoord.xy; ++#else ++ vec2 FragCoord = gl_FragCoord.xy; ++#endif ++ float d = fract(FragCoord.x * FragCoord.y * 0.0001); + + $MAIN$ + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 44bce9fb5f..a5872f4354 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -17,6 +17,7 @@ SRC_URI = " \ git://github.com/glmark2/glmark2.git;protocol=https \ file://0001-fix-dispmanx-build.patch \ file://0002-run-dispmanx-fullscreen.patch \ + file://0003-fix-precision-handling-bugs.patch \ " SRCREV = "784aca755a469b144acf3cae180b6e613b7b057a" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch index 353d80b3b7..1d5d9c12ab 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch @@ -22,7 +22,7 @@ index 34a1371..3786741 100755 trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BASE}$$.o ${BASE}$$; exit 1' 1 2 15 -LDLIBS=-lm -+LDLIBS+=-lm ++LDLIBS="$LDLIBS -lm" # check for HP-UX's ANSI compiler echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb deleted file mode 100644 index 80ae363dc5..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "C++ framework for implementing distributed and networked applications" -DESCRIPTION = "C++ network programming framework that implements many core \ -patterns for concurrent communication software" -LICENSE = "ACE-TAO-CIAO" -HOMEPAGE = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html" -LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77" - -DEPENDS += "openssl gperf-native" - -SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_10/ACE-${PV}.tar.bz2 \ - file://ace_config.patch \ - file://no_sysctl.patch \ - " - -SRC_URI[sha256sum] = "90de437926928e98e9fd9132c7c3e886ca79f25567adeccbc24a5996f230d8e2" - -COMPATIBLE_HOST_libc-musl = "null" - -S = "${WORKDIR}/ACE_wrappers" -B = "${WORKDIR}/ACE_wrappers/ace" -export ACE_ROOT="${WORKDIR}/ACE_wrappers" - -inherit pkgconfig - -CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations" -CXX_append = " -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " -EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" - -do_install() { - export D="${D}" - oe_runmake install - - for i in $(find ${D} -name "*.pc") ; do - sed -i -e s:${D}::g \ - -e s:/${TARGET_SYS}::g \ - $i - done - - rm -r ${D}/usr/share -} - -UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb new file mode 100644 index 0000000000..086fc9d06e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb @@ -0,0 +1,42 @@ +SUMMARY = "C++ framework for implementing distributed and networked applications" +DESCRIPTION = "C++ network programming framework that implements many core \ +patterns for concurrent communication software" +LICENSE = "ACE-TAO-CIAO" +HOMEPAGE = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html" +LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77" + +DEPENDS += "openssl gperf-native" + +SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-${PV}.tar.bz2 \ + file://ace_config.patch \ + file://no_sysctl.patch \ + " + +SRC_URI[sha256sum] = "ccd94fa45df1e8bb1c901d02c0a64c1626497e5eeda2f057fcf0a1578dae2148" + +COMPATIBLE_HOST_libc-musl = "null" + +S = "${WORKDIR}/ACE_wrappers" +B = "${WORKDIR}/ACE_wrappers/ace" +export ACE_ROOT="${WORKDIR}/ACE_wrappers" + +inherit pkgconfig + +CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations" +CXX_append = " -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " +EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" + +do_install() { + export D="${D}" + oe_runmake install + + for i in $(find ${D} -name "*.pc") ; do + sed -i -e s:${D}::g \ + -e s:/${TARGET_SYS}::g \ + $i + done + + rm -r ${D}/usr/share +} + +UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.10.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.10.bb new file mode 100644 index 0000000000..b2495348ff --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.10.bb @@ -0,0 +1,54 @@ +SUMMARY = "Wireless daemon for Linux" +HOMEPAGE = "https://iwd.wiki.kernel.org/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +DEPENDS = "ell" + +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" +SRCREV = "d8dc5a9bd19c5b98d8692801d3cf4e8af495930a" +S = "${WORKDIR}/git" + +inherit autotools manpages pkgconfig python3native systemd + +PACKAGECONFIG ??= " \ + client \ + monitor \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" +PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" +PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" +PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" +PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" +PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" + +EXTRA_OECONF = "--enable-external-ell" + +SYSTEMD_SERVICE_${PN} = " \ + iwd.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ +" + +do_configure_prepend() { + install -d ${S}/build-aux +} + +do_install_append() { + # If client and monitor are disabled, bindir is empty, causing a QA error + rmdir --ignore-fail-on-non-empty ${D}/${bindir} +} + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${nonarch_libdir}/modules-load.d \ + ${systemd_unitdir}/network \ +" + +RDEPENDS_${PN} = "dbus" + +RRECOMMENDS_${PN} = "\ + kernel-module-pkcs7-message \ + kernel-module-pkcs8-key-parser \ + kernel-module-x509-key-parser \ +" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.9.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.9.bb deleted file mode 100644 index 25500e6501..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.9.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Wireless daemon for Linux" -HOMEPAGE = "https://iwd.wiki.kernel.org/" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -DEPENDS = "ell" - -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "aa3dc1b95348dea177e9d8c2c3063b29e20fe2e9" -S = "${WORKDIR}/git" - -inherit autotools manpages pkgconfig python3native systemd - -PACKAGECONFIG ??= " \ - client \ - monitor \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ -" -PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" -PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" -PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" -PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" -PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" - -EXTRA_OECONF = "--enable-external-ell" - -SYSTEMD_SERVICE_${PN} = " \ - iwd.service \ - ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ -" - -do_configure_prepend() { - install -d ${S}/build-aux -} - -do_install_append() { - # If client and monitor are disabled, bindir is empty, causing a QA error - rmdir --ignore-fail-on-non-empty ${D}/${bindir} -} - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${nonarch_libdir}/modules-load.d \ - ${systemd_unitdir}/network \ -" - -RDEPENDS_${PN} = "dbus" - -RRECOMMENDS_${PN} = "\ - kernel-module-pkcs7-message \ - kernel-module-pkcs8-key-parser \ - kernel-module-x509-key-parser \ -" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.7.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.7.bb deleted file mode 100644 index 151228bcbf..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.7.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Paho MQTT - C libraries for the MQTT and MQTT-SN protocols" -DESCRIPTION = "Client implementation of open and standard messaging protocols for Machine-to-Machine (M2M) and Internet of Things (IoT)." -HOMEPAGE = "http://www.eclipse.org/paho/" -SECTION = "console/network" -LICENSE = "EPL-2.0 | EDL-1.0" - -LIC_FILES_CHKSUM = " \ - file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ - file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ - file://notice.html;md5=943f861069889acecebf51dfa24478e2 \ - file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \ -" - -SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http" - -SRCREV = "e047e25d34d53b4b265649144a3cac3b01eee76c" - -DEPENDS = "openssl" - -S = "${WORKDIR}/git" - -inherit cmake - -do_configure_prepend() { - sed -i s:\ lib/cmake:\ ${baselib}/cmake:g ${S}/src/CMakeLists.txt -} - -do_install_append() { - # paho-mqtt installes some thing that we don't want. - rm -rf ${D}${prefix}/samples - find ${D}${prefix} -maxdepth 1 -type f -delete -} - -EXTRA_OECMAKE = "-DPAHO_WITH_SSL=ON" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb new file mode 100644 index 0000000000..f9b503a2cd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb @@ -0,0 +1,34 @@ +SUMMARY = "Paho MQTT - C libraries for the MQTT and MQTT-SN protocols" +DESCRIPTION = "Client implementation of open and standard messaging protocols for Machine-to-Machine (M2M) and Internet of Things (IoT)." +HOMEPAGE = "http://www.eclipse.org/paho/" +SECTION = "console/network" +LICENSE = "EPL-2.0 | EDL-1.0" + +LIC_FILES_CHKSUM = " \ + file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ + file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ + file://notice.html;md5=943f861069889acecebf51dfa24478e2 \ + file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \ +" + +SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http" + +SRCREV = "317fb008e1541838d1c29076d2bc5c3e4b6c4f53" + +DEPENDS = "openssl" + +S = "${WORKDIR}/git" + +inherit cmake + +do_configure_prepend() { + sed -i s:\ lib/cmake:\ ${baselib}/cmake:g ${S}/src/CMakeLists.txt +} + +do_install_append() { + # paho-mqtt installes some thing that we don't want. + rm -rf ${D}${prefix}/samples + find ${D}${prefix} -maxdepth 1 -type f -delete +} + +EXTRA_OECMAKE = "-DPAHO_WITH_SSL=ON" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/CVE-2020-15803.patch b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/CVE-2020-15803.patch new file mode 100644 index 0000000000..2eec4bf327 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/CVE-2020-15803.patch @@ -0,0 +1,36 @@ +From 4943334fd9bf7dffd49f9e86251ad40b3efe2135 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Fri, 11 Dec 2020 17:02:20 +0900 +Subject: [PATCH] Fix bug for CVE-2020-15803 + +Signed-off-by: Wang Mingyu +--- + frontends/php/include/classes/html/CIFrame.php | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/frontends/php/include/classes/html/CIFrame.php b/frontends/php/include/classes/html/CIFrame.php +index 32220cd..70f2ab5 100644 +--- a/frontends/php/include/classes/html/CIFrame.php ++++ b/frontends/php/include/classes/html/CIFrame.php +@@ -29,6 +29,7 @@ class CIFrame extends CTag { + $this->setHeight($height); + $this->setScrolling($scrolling); + $this->setId($id); ++ $this->setSandbox(); + } + + public function setSrc($value = null) { +@@ -69,4 +70,10 @@ class CIFrame extends CTag { + $this->setAttribute('scrolling', $value); + return $this; + } ++ ++ private function setSandbox() { ++ if (ZBX_IFRAME_SANDBOX !== false) { ++ $this->setAttribute('sandbox', ZBX_IFRAME_SANDBOX); ++ } ++ } + } +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb index 0e0ddd5779..98a31879c4 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb @@ -26,6 +26,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ file://0001-Fix-configure.ac.patch \ file://zabbix-agent.service \ + file://CVE-2020-15803.patch \ " SRC_URI[md5sum] = "e666539220be93b1af38e40f5fbb1f79" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb index 9f68eb48a3..44e1e9164c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb @@ -4,10 +4,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94" DEPENDS = "zeromq" -SRCREV = "fef905d5982aaeb4f4bac5cccbdf8bea72728a10" -PV = "4.7.0" +SRCREV = "76bf169fd67b8e99c1b0e6490029d9cd5ef97666" +PV = "4.7.1" -SRC_URI = "git://github.com/zeromq/cppzmq.git" +SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=bugfix-4-7-1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb new file mode 100644 index 0000000000..db4e591cb9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb @@ -0,0 +1,26 @@ +SUMMARY = "D-Bus wrapper in C++ for dbus" +HOMEPAGE = "https://dbus-cxx.github.io/" +SECTION = "base" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" + +FILEEXTRAPATHS_prepend = "${THISDIR}/files" +SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master" +SRC_URI += "file://fix_build_musl.patch" +SRCREV = "ea7f8e361d11dc7d41d9ae2c4128aed2cdadd84e" + +DEPENDS = "\ + dbus \ + libsigc++-2.0 \ +" + +RDEPENDS_${PN} = "\ + dbus \ + libsigc++-2.0 \ +" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch new file mode 100644 index 0000000000..3d912e0b01 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch @@ -0,0 +1,26 @@ +diff --git a/dbus-cxx/timeout.cpp b/dbus-cxx/timeout.cpp +index 16e9f7e..aa0b99f 100644 +--- a/dbus-cxx/timeout.cpp ++++ b/dbus-cxx/timeout.cpp +@@ -132,7 +132,7 @@ namespace DBus + return m_cobj; + } + +- void Timeout::timer_callback_proxy( sigval_t sv ) { ++ void Timeout::timer_callback_proxy( union sigval sv ) { + SIMPLELOGGER_DEBUG( "dbus.Timeout","Timeout::timer_callback_proxy" ); + Timeout* t; + t = ( Timeout* ) sv.sival_ptr; +diff --git a/dbus-cxx/timeout.h b/dbus-cxx/timeout.h +index 1e469b5..5b69fbb 100644 +--- a/dbus-cxx/timeout.h ++++ b/dbus-cxx/timeout.h +@@ -83,7 +83,7 @@ namespace DBus + + std::mutex m_arming_mutex; + +- static void timer_callback_proxy( sigval_t sv ); ++ static void timer_callback_proxy( union sigval sv ); + + }; + 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 index 36355dd92c..2e43939b91 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1238d5bccbb6bda30654e48dcc0a554b" SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https" -PV = "2.2.13+git${SRCPV}" -SRCREV = "3b7ded60ebb7e1afddcbae6f82ac8645b276e358" +PV = "2.2.14+git${SRCPV}" +SRCREV = "109694ef2686fe25538c05f3c856912f8ef571a9" S = "${WORKDIR}/git" 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 index 0e29324cfd..0148c0c2e0 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb @@ -6,8 +6,8 @@ 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.12+git${SRCPV}" -SRCREV = "524f5ca96c3b9775f9d1debbdbcc2666bcce5c07" +PV = "2.0.13+git${SRCPV}" +SRCREV = "b230a96b61e9e35b8da1565893d74380646e03c8" S = "${WORKDIR}/git" 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 index d262dd1479..4a165001d4 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "base" S = "${WORKDIR}/git" -# v2020.06.16 -SRCREV = "b04034a17e214322772c19e7ccd2adf0cd306920" +# v2020.12.18 +SRCREV = "c57ba81c460ee97b6b9d0b8d18faf5ba6883114b" SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git" do_configure[noexec] = "1" 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 index ed27b26164..b951dabce4 100644 --- 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 @@ -9,8 +9,8 @@ DEPENDS += "opencl-headers" inherit pkgconfig cmake S = "${WORKDIR}/git" -PV = "2020.06.16+git${SRCPV}" -SRCREV = "862eebe7ca733c398334a8db8481172a7d3a3c47" +PV = "2020.12.18+git${SRCPV}" +SRCREV = "1d5315c3ed30d026acb79a1aa53a276fc833ffa7" SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git" do_install () { diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 2c46d21b70..2a84d669a1 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -179,6 +179,7 @@ RDEPENDS_packagegroup-meta-oe-core = "\ sdbus-c++ \ toybox \ usleep \ + dbus-cxx \ " RDEPENDS_packagegroup-meta-oe-core_append_libc-glibc = " glfw" RDEPENDS_packagegroup-meta-oe-core_remove_riscv64 = "safec" @@ -307,6 +308,7 @@ RDEPENDS_packagegroup-meta-oe-devtools_remove_x86-64 = "${@bb.utils.contains("TU RDEPENDS_packagegroup-meta-oe-devtools_remove_x86 = "ply" RDEPENDS_packagegroup-meta-oe-extended ="\ + bitwise \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \ brotli \ byacc \ @@ -365,6 +367,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ canutils \ libsocketcan \ libconfig \ + linuxconsole \ uml-utilities \ libidn \ libqb \ @@ -446,11 +449,13 @@ RDEPENDS_packagegroup-meta-oe-graphics ="\ ${@bb.utils.contains("PACKAGE_CLASSES", "package_rpm", "dnfdragora", "", d)} \ fontforge \ fbida \ + feh \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "freeglut", "", d)} \ ftgl \ fvwm \ gtkperf \ gphoto2 \ + imlib2 \ libgphoto2 \ graphviz \ gtkwave \ @@ -458,6 +463,7 @@ RDEPENDS_packagegroup-meta-oe-graphics ="\ libforms \ lxdm \ numlockx \ + obconf \ openbox \ packagegroup-fonts-truetype \ qrencode \ @@ -884,6 +890,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ liburing \ zbar \ libmicrohttpd \ + yaml-cpp \ " RDEPENDS_packagegroup-meta-oe-support_append_armv7a = " ne10" RDEPENDS_packagegroup-meta-oe-support_append_armv7ve = " ne10" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch new file mode 100644 index 0000000000..d3d339d56d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch @@ -0,0 +1,25 @@ +From 1ebf1a1df17afd8b89f84b1928a89069035bf20b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 12 Dec 2020 16:15:57 -0800 +Subject: [PATCH] meson: Fix reallocarray check + +reallocarray() is defined in stdlib.h, so that would be right header to +check for its presense. + +Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/17951] +Signed-off-by: Khem Raj +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/meson.build ++++ b/meson.build +@@ -501,7 +501,7 @@ foreach ident : [ + #include + #include '''], + ['explicit_bzero' , '''#include '''], +- ['reallocarray', '''#include '''], ++ ['reallocarray', '''#include '''], + ['set_mempolicy', '''#include + #include '''], + ['get_mempolicy', '''#include diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb index c8e81a4123..4b93087f4f 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb @@ -41,6 +41,7 @@ SRC_URI_MUSL = "\ file://0002-src-login-brightness.c-include-sys-wait.h.patch \ file://0003-src-basic-copy.c-include-signal.h.patch \ file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ + file://0001-meson-Fix-reallocarray-check.patch \ " PACKAGECONFIG ??= "gshadow idn" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch index 32b7f42845..60b7910c5d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch @@ -1,6 +1,6 @@ -From 3c13315447fa175da6c9ebe59a039e611cdb5bd1 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Tue, 4 Jun 2019 13:45:30 +0800 +From 71fbee3888ee889a269eded5585ed7591bcbe9dd Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Mon, 28 Dec 2020 16:38:21 +0800 Subject: [PATCH] Improve reproducibility, Remove build patch from binaries which pg_config do @@ -15,19 +15,21 @@ not recorded Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia + +update patch for v13.1 +Signed-off-by: Changqing Li --- - src/common/Makefile | 4 ---- - 1 file changed, 4 deletions(-) + src/common/Makefile | 3 --- + 1 file changed, 3 deletions(-) diff --git a/src/common/Makefile b/src/common/Makefile -index 1fc2c66..5e6c457 100644 +index 16619e4..665eaa1 100644 --- a/src/common/Makefile +++ b/src/common/Makefile -@@ -27,10 +27,6 @@ include $(top_builddir)/src/Makefile.global +@@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.global # don't include subdirectory-path-dependent -I and -L switches STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS)) STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS)) --override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\"" -override CPPFLAGS += -DVAL_CC="\"$(CC)\"" -override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\"" -override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\"" @@ -35,5 +37,5 @@ index 1fc2c66..5e6c457 100644 override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc index a1665ab2b2..09c6a3ca9d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -56,7 +56,7 @@ pkg_postinst_${PN} () { enable_pam = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG ??= "${enable_pam} openssl python uuid libxml tcl nls libxml perl" PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl ac_cv_file__dev_urandom=yes,openssl," PACKAGECONFIG[python] = "--with-python,--without-python,python3,python3" PACKAGECONFIG[uuid] = "--with-uuid=e2fs,--without-uuid,util-linux," PACKAGECONFIG[tcl] = "--with-tcl --with-tclconfig=${STAGING_BINDIR_CROSS},--without-tcl,tcl tcl-native," diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.4.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.4.bb deleted file mode 100644 index 6ea9acc000..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc4ce21960f0c561460d750bc270d11f" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ -" - -SRC_URI[sha256sum] = "bee93fbe2c32f59419cb162bcc0145c58da9a8644ee154a30b9a5ce47de606cc" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb new file mode 100644 index 0000000000..aeeddc6479 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb @@ -0,0 +1,11 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc4ce21960f0c561460d750bc270d11f" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ +" + +SRC_URI[sha256sum] = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f" diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf new file mode 100644 index 0000000000..ddf155a907 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf @@ -0,0 +1,4 @@ +[Service] +ExecStartPre=/usr/bin/android-gadget-setup +ExecStartPost=/usr/bin/android-gadget-start +ExecStopPost=/usr/bin/android-gadget-cleanup diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup new file mode 100644 index 0000000000..517227d4a6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup @@ -0,0 +1,24 @@ +#!/bin/sh + +[ -d /sys/kernel/config/usb_gadget ] || exit 0 + +cd /sys/kernel/config/usb_gadget + +cd adb + +echo "" > UDC || true + +killall adbd || true + +umount /dev/usb-ffs/adb + +rm configs/c.1/ffs.usb0 + +rmdir configs/c.1/strings/0x409 +rmdir configs/c.1 + +rmdir functions/ffs.usb0 +rmdir strings/0x409 + +cd .. +rmdir adb diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup new file mode 100644 index 0000000000..e44d1bacbe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup @@ -0,0 +1,35 @@ +#!/bin/sh + +set -e + +manufacturer=RPB +model="Android device" +serial=0123456789ABCDEF + +if [ -r /etc/android-gadget-setup.machine ] ; then + . /etc/android-gadget-setup.machine +fi + +[ -d /sys/kernel/config/usb_gadget ] || modprobe libcomposite + +cd /sys/kernel/config/usb_gadget + +[ -d adb ] && /usr/bin/android-gadget-cleanup || true + +mkdir adb +cd adb + +mkdir configs/c.1 +mkdir functions/ffs.usb0 +mkdir strings/0x409 +mkdir configs/c.1/strings/0x409 +echo 0x18d1 > idVendor +echo 0xd002 > idProduct +echo "$serial" > strings/0x409/serialnumber +echo "$manufacturer" > strings/0x409/manufacturer +echo "$model" > strings/0x409/product +echo "Conf 1" > configs/c.1/strings/0x409/configuration +ln -s functions/ffs.usb0 configs/c.1 + +mkdir -p /dev/usb-ffs/adb +mount -t functionfs usb0 /dev/usb-ffs/adb diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start new file mode 100644 index 0000000000..ca6c3df275 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +sleep 3 + +ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb new file mode 100644 index 0000000000..01dc1bea98 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Different utilities from Android - corressponding configuration files for using ConfigFS" +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = " \ + file://android-gadget-setup \ + file://android-gadget-start \ + file://android-gadget-cleanup \ + file://10-adbd-configfs.conf \ +" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} + install -m 0755 ${WORKDIR}/android-gadget-start ${D}${bindir} + install -m 0755 ${WORKDIR}/android-gadget-cleanup ${D}${bindir} + + if [ -r ${WORKDIR}/android-gadget-setup.machine ] ; then + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/android-gadget-setup.machine ${D}${sysconfdir} + fi + + install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d + install -m 0644 ${WORKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d +} + +FILES_${PN} += " \ + ${systemd_unitdir}/system/ \ +" + +PROVIDES += "android-tools-conf" +RPROVIDES_${PN} = "android-tools-conf" diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb index af98f92f05..34b1a9bdd2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb @@ -11,3 +11,10 @@ do_install() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} } + +python () { + pn = d.getVar('PN') + profprov = d.getVar("PREFERRED_PROVIDER_" + pn) + if profprov and pn != profprov: + raise bb.parse.SkipRecipe("PREFERRED_PROVIDER_%s set to %s, not %s" % (pn, profprov, pn)) +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index fb6125e2a5..ae1463942a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -67,7 +67,8 @@ COMPATIBLE_HOST_powerpc64le = "(null)" inherit systemd -SYSTEMD_SERVICE_${PN} = "android-tools-adbd.service" +SYSTEMD_PACKAGES = "${PN}-adbd" +SYSTEMD_SERVICE_${PN}-adbd = "android-tools-adbd.service" # Find libbsd headers during native builds CC_append_class-native = " -I${STAGING_INCDIR}" @@ -157,9 +158,15 @@ do_install() { fi } -PACKAGES += "${PN}-fstools" +PACKAGES =+ "${PN}-fstools ${PN}-adbd" -RDEPENDS_${BPN} = "${BPN}-conf bash" +RDEPENDS_${BPN}-adbd = "${BPN}-conf" +RDEPENDS_${BPN}-fstools = "bash" + +FILES_${PN}-adbd = "\ + ${bindir}/adbd \ + ${systemd_unitdir}/system/android-tools-adbd.service \ +" FILES_${PN}-fstools = "\ ${bindir}/ext2simg \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb index 1abfc8819d..fb4be0f166 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb @@ -3,9 +3,12 @@ HOMEPAGE = "https://github.com/google/flatbuffers" SECTION = "console/tools" LICENSE = "Apache-2.0" -PACKAGE_BEFORE_PN = "${PN}-compiler" +inherit python3-dir + +PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-${PYTHON_PN}" RDEPENDS_${PN}-compiler = "${PN}" +RDEPENDS_${PN}-${PYTHON_PN} = "${PN}" RDEPENDS_${PN}-dev += "${PN}-compiler" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" @@ -28,6 +31,13 @@ inherit cmake S = "${WORKDIR}/git" +do_install_append() { + install -d ${D}${PYTHON_SITEPACKAGES_DIR} + cp -rf ${S}/python/flatbuffers ${D}${PYTHON_SITEPACKAGES_DIR} +} + FILES_${PN}-compiler = "${bindir}" +FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch b/meta-openembedded/meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch new file mode 100644 index 0000000000..a0c6584ecb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/mcpp/files/CVE-2019-14274.patch @@ -0,0 +1,34 @@ +From ea453aca2742be6ac43ba4ce0da6f938a7e5a5d8 Mon Sep 17 00:00:00 2001 +From: He Liu +Date: Tue, 4 Feb 2014 11:00:40 -0800 +Subject: [PATCH] line comment bug + +--- + src/support.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/support.c b/src/support.c +index c57eaef..e3357e4 100644 +--- a/src/support.c ++++ b/src/support.c +@@ -188,7 +188,7 @@ static char * append_to_buffer( + size_t length + ) + { +- if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */ ++ if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */ + size_t size = MAX( BUF_INCR_SIZE, length); + + if (mem_buf_p->buffer == NULL) { /* 1st append */ +@@ -1722,6 +1722,8 @@ com_start: + sp -= 2; + while (*sp != '\n') /* Until end of line */ + mcpp_fputc( *sp++, OUT); ++ mcpp_fputc('\n', OUT); ++ wrong_line = TRUE; + } + goto end_line; + default: /* Not a comment */ +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch b/meta-openembedded/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch index 8103cf0920..1df3ae55bc 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch @@ -114,37 +114,6 @@ diff -r -c -N ../mcpp-2.7.2-old/src/main.c ./src/main.c } int mcpp_lib_main -diff -r -c -N ../mcpp-2.7.2-old/src/support.c ./src/support.c -*** ../mcpp-2.7.2-old/src/support.c Tue Jun 10 06:02:33 2008 ---- ./src/support.c Fri May 14 12:40:56 2010 -*************** -*** 188,194 **** - size_t length - ) - { -! if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */ - size_t size = MAX( BUF_INCR_SIZE, length); - - if (mem_buf_p->buffer == NULL) { /* 1st append */ ---- 188,194 ---- - size_t length - ) - { -! if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */ - size_t size = MAX( BUF_INCR_SIZE, length); - - if (mem_buf_p->buffer == NULL) { /* 1st append */ -*************** -*** 1722,1727 **** ---- 1722,1729 ---- - sp -= 2; - while (*sp != '\n') /* Until end of line */ - mcpp_fputc( *sp++, OUT); -+ mcpp_fputc( '\n', OUT); -+ wrong_line = TRUE; - } - goto end_line; - default: /* Not a comment */ diff -r -c -N ../mcpp-2.7.2-old/src/system.c ./src/system.c *** ../mcpp-2.7.2-old/src/system.c 2008-11-26 10:53:51.000000000 +0100 --- ./src/system.c 2011-02-21 16:18:05.678058106 +0100 diff --git a/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb index b5ca495663..f8125f72d9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb @@ -4,7 +4,8 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5ca370b75ec890321888a00cea9bc1d5" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://ice-mcpp.patch " + file://ice-mcpp.patch \ + file://CVE-2019-14274.patch" SRC_URI[md5sum] = "512de48c87ab023a69250edc7a0c7b05" SRC_URI[sha256sum] = "3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb deleted file mode 100644 index 9d15586238..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb +++ /dev/null @@ -1,161 +0,0 @@ -DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" -HOMEPAGE = "http://nodejs.org" -LICENSE = "MIT & BSD & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=30e27bd6830002d9415e4a5da7901f03" - -DEPENDS = "openssl" -DEPENDS_append_class-target = " nodejs-native" - -inherit pkgconfig python3native - -COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" -COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" -COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" - -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" - -SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ - file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ - file://0003-Install-both-binaries-and-use-libdir.patch \ - file://0004-v8-don-t-override-ARM-CFLAGS.patch \ - file://big-endian.patch \ - file://mips-warnings.patch \ - file://0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch \ - " -SRC_URI_append_class-target = " \ - file://0002-Using-native-binaries.patch \ - " -SRC_URI[sha256sum] = "3b671c45c493f96d7e018c15110cdbafa4478e5e5cfc9e6eec83cea9e6b551e1" - -S = "${WORKDIR}/node-v${PV}" - -# v8 errors out if you have set CCACHE -CCACHE = "" - -def map_nodejs_arch(a, d): - import re - - if re.match('i.86$', a): return 'ia32' - elif re.match('x86_64$', a): return 'x64' - elif re.match('aarch64$', a): return 'arm64' - elif re.match('(powerpc64|ppc64le)$', a): return 'ppc64' - elif re.match('powerpc$', a): return 'ppc' - return a - -ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ - ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ - bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ - bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ - '--with-arm-fpu=vfp', d), d), d)}" -GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " -ARCHFLAGS ?= "" - -PACKAGECONFIG ??= "ares brotli icu zlib" - -PACKAGECONFIG[ares] = "--shared-cares,,c-ares" -PACKAGECONFIG[brotli] = "--shared-brotli,,brotli" -PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" -PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" -PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" -PACKAGECONFIG[shared] = "--shared" -PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" - -# We don't want to cross-compile during target compile, -# and we need to use the right flags during host compile, -# too. -EXTRA_OEMAKE = "\ - CC.host='${CC}' \ - CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ - CXX.host='${CXX}' \ - CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ - LDFLAGS.host='${LDFLAGS}' \ - AR.host='${AR}' \ - \ - builddir_name=./ \ -" - -python do_unpack() { - import shutil - - bb.build.exec_func('base_do_unpack', d) - - shutil.rmtree(d.getVar('S') + '/deps/openssl', True) - if 'ares' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/cares', True) - if 'brotli' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/brotli', True) - if 'libuv' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/uv', True) - if 'nghttp2' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True) - if 'zlib' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/zlib', True) -} - -# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi -do_configure () { - export LD="${CXX}" - GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES - # $TARGET_ARCH settings don't match --dest-cpu settings - python3 configure.py --prefix=${prefix} --cross-compiling --without-snapshot --shared-openssl \ - --without-dtrace \ - --without-etw \ - --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ - --dest-os=linux \ - --libdir=${D}${libdir} \ - ${ARCHFLAGS} \ - ${PACKAGECONFIG_CONFARGS} -} - -do_compile () { - export LD="${CXX}" - oe_runmake BUILDTYPE=Release -} - -do_install () { - oe_runmake install DESTDIR=${D} - - # wasn't updated since 2009 and is the only thing requiring python2 in runtime - # ERROR: nodejs-12.14.1-r0 do_package_qa: QA Issue: /usr/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples contained in package nodejs-npm requires /usr/bin/python, but no providers found in RDEPENDS_nodejs-npm? [file-rdeps] - rm -f ${D}${exec_prefix}/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples -} - -do_install_append_class-native() { - # use node from PATH instead of absolute path to sysroot - # node-v0.10.25/tools/install.py is using: - # shebang = os.path.join(node_prefix, 'bin/node') - # update_shebang(link_path, shebang) - # and node_prefix can be very long path to bindir in native sysroot and - # when it exceeds 128 character shebang limit it's stripped to incorrect path - # and npm fails to execute like in this case with 133 characters show in log.do_install: - # updating shebang of /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/work/x86_64-linux/nodejs-native/0.10.15-r0/image/home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/npm to /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/node - # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js - # use sed on npm-cli.js because otherwise symlink is replaced with normal file and - # npm-cli.js continues to use old shebang - sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js - - # Install the native binaries to provide it within sysroot for the target compilation - install -d ${D}${bindir} - install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque - install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator - if ${@bb.utils.contains('PACKAGECONFIG','icu','true','false',d)}; then - install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case - fi - install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache - install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot -} - -do_install_append_class-target() { - sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js -} - -PACKAGES =+ "${PN}-npm" -FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" -RDEPENDS_${PN}-npm = "bash python3-core python3-shell python3-datetime \ - python3-misc python3-multiprocessing" - -PACKAGES =+ "${PN}-systemtap" -FILES_${PN}-systemtap = "${datadir}/systemtap" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.20.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.20.1.bb new file mode 100644 index 0000000000..0673a3202d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.20.1.bb @@ -0,0 +1,161 @@ +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" +HOMEPAGE = "http://nodejs.org" +LICENSE = "MIT & BSD & Artistic-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c66ff8861d9f96076a7cb61e3d75f54" + +DEPENDS = "openssl" +DEPENDS_append_class-target = " nodejs-native" + +inherit pkgconfig python3native + +COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" +COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" +COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" + +COMPATIBLE_HOST_riscv64 = "null" +COMPATIBLE_HOST_riscv32 = "null" + +SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ + file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ + file://0003-Install-both-binaries-and-use-libdir.patch \ + file://0004-v8-don-t-override-ARM-CFLAGS.patch \ + file://big-endian.patch \ + file://mips-warnings.patch \ + file://0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch \ + " +SRC_URI_append_class-target = " \ + file://0002-Using-native-binaries.patch \ + " +SRC_URI[sha256sum] = "e00eee325d705b2bfa9929b7d061eb2315402d7e8548945eac9870bf84321853" + +S = "${WORKDIR}/node-v${PV}" + +# v8 errors out if you have set CCACHE +CCACHE = "" + +def map_nodejs_arch(a, d): + import re + + if re.match('i.86$', a): return 'ia32' + elif re.match('x86_64$', a): return 'x64' + elif re.match('aarch64$', a): return 'arm64' + elif re.match('(powerpc64|ppc64le)$', a): return 'ppc64' + elif re.match('powerpc$', a): return 'ppc' + return a + +ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ + ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ + '--with-arm-fpu=vfp', d), d), d)}" +GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " +ARCHFLAGS ?= "" + +PACKAGECONFIG ??= "ares brotli icu zlib" + +PACKAGECONFIG[ares] = "--shared-cares,,c-ares" +PACKAGECONFIG[brotli] = "--shared-brotli,,brotli" +PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" +PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" +PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" +PACKAGECONFIG[shared] = "--shared" +PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" + +# We don't want to cross-compile during target compile, +# and we need to use the right flags during host compile, +# too. +EXTRA_OEMAKE = "\ + CC.host='${CC}' \ + CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ + CXX.host='${CXX}' \ + CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ + LDFLAGS.host='${LDFLAGS}' \ + AR.host='${AR}' \ + \ + builddir_name=./ \ +" + +python do_unpack() { + import shutil + + bb.build.exec_func('base_do_unpack', d) + + shutil.rmtree(d.getVar('S') + '/deps/openssl', True) + if 'ares' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/cares', True) + if 'brotli' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/brotli', True) + if 'libuv' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/uv', True) + if 'nghttp2' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True) + if 'zlib' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/zlib', True) +} + +# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi +do_configure () { + export LD="${CXX}" + GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES + # $TARGET_ARCH settings don't match --dest-cpu settings + python3 configure.py --prefix=${prefix} --cross-compiling --without-snapshot --shared-openssl \ + --without-dtrace \ + --without-etw \ + --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ + --dest-os=linux \ + --libdir=${D}${libdir} \ + ${ARCHFLAGS} \ + ${PACKAGECONFIG_CONFARGS} +} + +do_compile () { + export LD="${CXX}" + oe_runmake BUILDTYPE=Release +} + +do_install () { + oe_runmake install DESTDIR=${D} + + # wasn't updated since 2009 and is the only thing requiring python2 in runtime + # ERROR: nodejs-12.14.1-r0 do_package_qa: QA Issue: /usr/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples contained in package nodejs-npm requires /usr/bin/python, but no providers found in RDEPENDS_nodejs-npm? [file-rdeps] + rm -f ${D}${exec_prefix}/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples +} + +do_install_append_class-native() { + # use node from PATH instead of absolute path to sysroot + # node-v0.10.25/tools/install.py is using: + # shebang = os.path.join(node_prefix, 'bin/node') + # update_shebang(link_path, shebang) + # and node_prefix can be very long path to bindir in native sysroot and + # when it exceeds 128 character shebang limit it's stripped to incorrect path + # and npm fails to execute like in this case with 133 characters show in log.do_install: + # updating shebang of /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/work/x86_64-linux/nodejs-native/0.10.15-r0/image/home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/npm to /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/node + # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js + # use sed on npm-cli.js because otherwise symlink is replaced with normal file and + # npm-cli.js continues to use old shebang + sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js + + # Install the native binaries to provide it within sysroot for the target compilation + install -d ${D}${bindir} + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque + install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator + if ${@bb.utils.contains('PACKAGECONFIG','icu','true','false',d)}; then + install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case + fi + install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache + install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot +} + +do_install_append_class-target() { + sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js +} + +PACKAGES =+ "${PN}-npm" +FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" +RDEPENDS_${PN}-npm = "bash python3-core python3-shell python3-datetime \ + python3-misc python3-multiprocessing" + +PACKAGES =+ "${PN}-systemtap" +FILES_${PN}-systemtap = "${datadir}/systemtap" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7069.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7069.patch new file mode 100644 index 0000000000..0cf4d5ed60 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7069.patch @@ -0,0 +1,158 @@ +Subject: Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption + for a 12 bytes IV) + +--- + ext/openssl/openssl.c | 10 ++++----- + ext/openssl/tests/cipher_tests.inc | 21 +++++++++++++++++ + ext/openssl/tests/openssl_decrypt_ccm.phpt | 22 +++++++++++------- + ext/openssl/tests/openssl_encrypt_ccm.phpt | 26 ++++++++++++++-------- + 4 files changed, 57 insertions(+), 22 deletions(-) + +diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c +index 04cb9b0f..fdad2c3b 100644 +--- a/ext/openssl/openssl.c ++++ b/ext/openssl/openssl.c +@@ -6521,11 +6521,6 @@ static int php_openssl_validate_iv(char **piv, size_t *piv_len, size_t iv_requir + { + char *iv_new; + +- /* Best case scenario, user behaved */ +- if (*piv_len == iv_required_len) { +- return SUCCESS; +- } +- + if (mode->is_aead) { + if (EVP_CIPHER_CTX_ctrl(cipher_ctx, mode->aead_ivlen_flag, *piv_len, NULL) != 1) { + php_error_docref(NULL, E_WARNING, "Setting of IV length for AEAD mode failed"); +@@ -6534,6 +6529,11 @@ static int php_openssl_validate_iv(char **piv, size_t *piv_len, size_t iv_requir + return SUCCESS; + } + ++ /* Best case scenario, user behaved */ ++ if (*piv_len == iv_required_len) { ++ return SUCCESS; ++ } ++ + iv_new = ecalloc(1, iv_required_len + 1); + + if (*piv_len == 0) { +diff --git a/ext/openssl/tests/cipher_tests.inc b/ext/openssl/tests/cipher_tests.inc +index b1e46b41..779bfa85 100644 +--- a/ext/openssl/tests/cipher_tests.inc ++++ b/ext/openssl/tests/cipher_tests.inc +@@ -1,5 +1,26 @@ + array( ++ array( ++ 'key' => '404142434445464748494a4b4c4d4e4f', ++ 'iv' => '1011121314151617', ++ 'aad' => '000102030405060708090a0b0c0d0e0f', ++ 'tag' => '1fc64fbfaccd', ++ 'pt' => '202122232425262728292a2b2c2d2e2f', ++ 'ct' => 'd2a1f0e051ea5f62081a7792073d593d', ++ ), ++ array( ++ 'key' => '404142434445464748494a4b4c4d4e4f', ++ 'iv' => '101112131415161718191a1b', ++ 'aad' => '000102030405060708090a0b0c0d0e0f' . ++ '10111213', ++ 'tag' => '484392fbc1b09951', ++ 'pt' => '202122232425262728292a2b2c2d2e2f' . ++ '3031323334353637', ++ 'ct' => 'e3b201a9f5b71a7a9b1ceaeccd97e70b' . ++ '6176aad9a4428aa5', ++ ), ++ ), + 'aes-256-ccm' => array( + array( + 'key' => '1bde3251d41a8b5ea013c195ae128b21' . +diff --git a/ext/openssl/tests/openssl_decrypt_ccm.phpt b/ext/openssl/tests/openssl_decrypt_ccm.phpt +index a5f01b87..08ef5bb7 100644 +--- a/ext/openssl/tests/openssl_decrypt_ccm.phpt ++++ b/ext/openssl/tests/openssl_decrypt_ccm.phpt +@@ -10,14 +10,16 @@ if (!in_array('aes-256-ccm', openssl_get_cipher_methods())) + --FILE-- + $test) { +- echo "TEST $idx\n"; +- $pt = openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA, +- $test['iv'], $test['tag'], $test['aad']); +- var_dump($test['pt'] === $pt); ++foreach ($methods as $method) { ++ $tests = openssl_get_cipher_tests($method); ++ foreach ($tests as $idx => $test) { ++ echo "$method - TEST $idx\n"; ++ $pt = openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA, ++ $test['iv'], $test['tag'], $test['aad']); ++ var_dump($test['pt'] === $pt); ++ } + } + + // no IV +@@ -32,7 +34,11 @@ var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA, + + ?> + --EXPECTF-- +-TEST 0 ++aes-128-ccm - TEST 0 ++bool(true) ++aes-128-ccm - TEST 1 ++bool(true) ++aes-256-ccm - TEST 0 + bool(true) + + Warning: openssl_decrypt(): Setting of IV length for AEAD mode failed in %s on line %d +diff --git a/ext/openssl/tests/openssl_encrypt_ccm.phpt b/ext/openssl/tests/openssl_encrypt_ccm.phpt +index fb5dbbc8..8c4c41f8 100644 +--- a/ext/openssl/tests/openssl_encrypt_ccm.phpt ++++ b/ext/openssl/tests/openssl_encrypt_ccm.phpt +@@ -10,15 +10,17 @@ if (!in_array('aes-256-ccm', openssl_get_cipher_methods())) + --FILE-- + $test) { +- echo "TEST $idx\n"; +- $ct = openssl_encrypt($test['pt'], $method, $test['key'], OPENSSL_RAW_DATA, +- $test['iv'], $tag, $test['aad'], strlen($test['tag'])); +- var_dump($test['ct'] === $ct); +- var_dump($test['tag'] === $tag); ++foreach ($methods as $method) { ++ $tests = openssl_get_cipher_tests($method); ++ foreach ($tests as $idx => $test) { ++ echo "$method - TEST $idx\n"; ++ $ct = openssl_encrypt($test['pt'], $method, $test['key'], OPENSSL_RAW_DATA, ++ $test['iv'], $tag, $test['aad'], strlen($test['tag'])); ++ var_dump($test['ct'] === $ct); ++ var_dump($test['tag'] === $tag); ++ } + } + + // Empty IV error +@@ -32,7 +34,13 @@ var_dump(strlen($tag)); + var_dump(openssl_encrypt('data', $method, 'password', 0, str_repeat('x', 16), $tag, '', 1024)); + ?> + --EXPECTF-- +-TEST 0 ++aes-128-ccm - TEST 0 ++bool(true) ++bool(true) ++aes-128-ccm - TEST 1 ++bool(true) ++bool(true) ++aes-256-ccm - TEST 0 + bool(true) + bool(true) + +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7070.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7070.patch new file mode 100644 index 0000000000..e5b527f989 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/CVE-2020-7070.patch @@ -0,0 +1,24 @@ +Subject: Patch fix-urldecode for HTTP related Bug #79699 + +--- + main/php_variables.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/main/php_variables.c b/main/php_variables.c +index 1a40c2a1..cbdc7cf1 100644 +--- a/main/php_variables.c ++++ b/main/php_variables.c +@@ -514,7 +514,9 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) + } + + val = estrndup(val, val_len); +- php_url_decode(var, strlen(var)); ++ if (arg != PARSE_COOKIE) { ++ php_url_decode(var, strlen(var)); ++ } + if (sapi_module.input_filter(arg, var, &val, val_len, &new_val_len)) { + php_register_variable_safe(var, val, new_val_len, &array); + } +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb index 1da5607835..25b8137924 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb @@ -30,6 +30,8 @@ SRC_URI_append_class-target = " \ file://phar-makefile.patch \ file://0001-opcache-config.m4-enable-opcache.patch \ file://xfail_two_bug_tests.patch \ + file://CVE-2020-7070.patch \ + file://CVE-2020-7069.patch \ " S = "${WORKDIR}/php-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.2.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.2.bb new file mode 100644 index 0000000000..09abbd9c37 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.2.bb @@ -0,0 +1,25 @@ +SUMMARY = "Light-weight C++ XML Processing Library" +DESCRIPTION = "pugixml is a C++ XML processing library, which consists of a \ +DOM-like interface with rich traversal/modification capabilities, \ +an extremely fast XML parser which constructs the DOM tree from \ +n XML file/buffer, and an XPath 1.0 implementation for complex \ +data-driven tree queries." +HOMEPAGE = "https://pugixml.org/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=d5ee91fb74cbb64223b3693fd64eb169" + +SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[md5sum] = "2d0be30b843eb9d1893c1ba9ad334946" +SRC_URI[sha256sum] = "599eabdf8976aad86ac092a198920d8c127623d1376842bc6d683b12a37fb74f" + +UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" + +inherit cmake + +EXTRA_OECMAKE += "-DBUILD_PKGCONFIG=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.bb deleted file mode 100644 index b5e63cd356..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Light-weight C++ XML Processing Library" -DESCRIPTION = "pugixml is a C++ XML processing library, which consists of a \ -DOM-like interface with rich traversal/modification capabilities, \ -an extremely fast XML parser which constructs the DOM tree from \ -n XML file/buffer, and an XPath 1.0 implementation for complex \ -data-driven tree queries." -HOMEPAGE = "https://pugixml.org/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=d5ee91fb74cbb64223b3693fd64eb169" - -SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "93540f4644fd4e4b02049554ef37fb90" -SRC_URI[sha256sum] = "26913d3e63b9c07431401cf826df17ed832a20d19333d043991e611d23beaa2c" - -UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" - -inherit cmake - -EXTRA_OECMAKE += "-DBUILD_PKGCONFIG=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release \ - " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb index 46a9408031..bba8d5c215 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://tclap.sourceforge.net/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=0ca8b9c5c5445cfa7af7e78fd27e60ed" -SRCREV = "75f440bcac1276c847f5351e14216f6e91def44d" -SRC_URI = "git://git.code.sf.net/p/tclap/code \ +SRCREV = "ec3ddcfe41b0544a4551a57439b6b3682fe31479" +SRC_URI = "git://git.code.sf.net/p/tclap/code;branch=1.2 \ file://Makefile.am-disable-docs.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.2.2.bb b/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.2.2.bb deleted file mode 100644 index cafc869645..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.2.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "beep is a command line tool for linux that beeps the PC speaker" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -SRC_URI = "\ - http://johnath.com/beep/beep-${PV}.tar.gz \ - file://linux-input.patch \ -" - -SRC_URI[sha256sum] = "5c0445dac43950b7c7c3f235c6fb21f620ab3fd2f3aafaf09896e5730fcf49a1" - -S = "${WORKDIR}/${BPN}-${PV}" - -EXTRA_OEMAKE += 'CC="${CC}"' -EXTRA_OEMAKE += 'FLAGS="${CFLAGS} ${LDFLAGS}"' - -do_configure[noexec] = "1" - -do_compile() { - oe_runmake -} - -do_install() { - install -Dm 0755 ${B}/${PN} ${D}${bindir}/${PN} -} diff --git a/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb b/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb new file mode 100644 index 0000000000..8d332b2faf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.9.bb @@ -0,0 +1,32 @@ +SUMMARY = "beep allows you to have the PC speaker issue beeps and beep patterns" +DESCRIPTION = "beep allows you to have the PC speaker issue beeps and beep \ +patterns with given frequencies, durations, and spacing." +HOMEPAGE = "https://github.com/spkr-beep/beep" +BUGTRACKER = "https://github.com/spkr-beep/beep/issues" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https \ + file://0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch \ +" +SRCREV = "8b85ddd09f73b9fd7caa5679298781a57af194ac" +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = " \ + COMPILER_gcc='${CC}' \ + LINKER_gcc='${CC}' \ + COMPILER_clang=no \ + LINKER_clang=no \ +" + +EXTRA_OEMAKE_toolchain-clang = " \ + COMPILER_clang='${CC}' \ + LINKER_clang='${CC}' \ + COMPILER_gcc=no \ + LINKER_gcc=no \ +" + +do_install() { + oe_runmake install DESTDIR='${D}' +} diff --git a/meta-openembedded/meta-oe/recipes-extended/beep/files/0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch b/meta-openembedded/meta-oe/recipes-extended/beep/files/0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch new file mode 100644 index 0000000000..ba7681b983 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/beep/files/0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch @@ -0,0 +1,63 @@ +From 6b33adfa438e35b6a37cfb0364274370ef4f9fc1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 23 Dec 2020 18:00:59 +0000 +Subject: [PATCH] Do not use -Werror as it fails with newer clang 11+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + GNUmakefile | 1 - + 1 file changed, 1 deletion(-) + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -91,12 +91,13 @@ comma := , + # If supported by COMPILER_gcc, add given flags to CFLAGS_gcc. + # Example usage: + # $(eval $(call CHECK_CFLAGS_gcc,-fasynchronous-unwind-tables)) +-define CHECK_CFLAGS_gcc +-CFLAGS_gcc += $$(if $$(shell if $$(COMPILER_gcc) $(1) -x c -o compile-check.gcc-o -c - < /dev/null > /dev/null 2>&1; then echo yes; else :; fi; rm -f compile-check.gcc-o > /dev/null 2>&1),$(1)) +-endef + + COMPILER_gcc = gcc + LINKER_gcc = gcc ++ifneq ($(COMPILER_gcc),no) ++define CHECK_CFLAGS_gcc ++CFLAGS_gcc += $$(if $$(shell if $$(COMPILER_gcc) $(1) -x c -o compile-check.gcc-o -c - < /dev/null > /dev/null 2>&1; then echo yes; else :; fi; rm -f compile-check.gcc-o > /dev/null 2>&1),$(1)) ++endef + CPPFLAGS_gcc = + CFLAGS_gcc = + CFLAGS_gcc += -std=gnu99 -pedantic +@@ -113,30 +114,24 @@ CFLAGS_gcc += -save-temps=obj + LDFLAGS_gcc = + LIBS_gcc = + +-ifneq ($(call pathsearch,$(COMPILER_gcc)),) +-ifneq ($(COMPILER_gcc)),no) + COMPILERS += gcc + endif +-endif + + COMPILER_clang = clang + LINKER_clang = clang ++ ++ifneq ($(COMPILER_clang),no) + CPPFLAGS_clang = + CFLAGS_clang += -Wall -Wextra + CFLAGS_clang += -Weverything + CFLAGS_clang += -Wno-padded + CFLAGS_clang += -std=gnu99 -pedantic +-CFLAGS_clang += -Werror +-CFLAGS_clang += -fsanitize=undefined + CFLAGS_clang += -O -g + LDFLAGS_clang = + LIBS_clang = + +-ifneq ($(call pathsearch,$(COMPILER_clang)),) +-ifneq ($(COMPILER_clang),no) + COMPILERS += clang + endif +-endif + + + ######################################################################## diff --git a/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.41.bb b/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.41.bb new file mode 100644 index 0000000000..0378227817 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.41.bb @@ -0,0 +1,24 @@ +SUMMARY = "Bitwise terminal calculator" +DESCRIPTION = "Bitwise is multi base interactive calculator \ +supporting dynamic base conversion and bit manipulation.\ +It's a handy tool for low level hackers, \ +kernel developers and device drivers developers." + +HOMEPAGE = "https://github.com/mellowcandle/bitwise" +SECTION = "console/utils" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +SRC_URI = "https://github.com/mellowcandle/bitwise/releases/download/v${PV}/bitwise-v${PV}.tar.gz \ + file://0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch \ + " +SRC_URI[sha256sum] = "33ce934fb99dadf7652224152cc135a0abf6a211adde53d96e9be7067567749c" + +UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases" + +S = "${WORKDIR}/${BPN}-v${PV}" + +DEPENDS = "ncurses readline" + +inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-extended/bitwise/files/0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch b/meta-openembedded/meta-oe/recipes-extended/bitwise/files/0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch new file mode 100644 index 0000000000..ad3f0bb1fd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/bitwise/files/0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch @@ -0,0 +1,29 @@ +From 2089b514045d2de64a5d9c54e241731e85d77df2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 14 Dec 2020 22:11:59 -0800 +Subject: [PATCH] makefile.am: Fix build when build dir is not same as + sourcedir + +This ensures right include paths are added to compiler + +Signed-off-by: Khem Raj +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index eba85a1..da998ff 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -19,7 +19,7 @@ if COND_DEBUG + MAYBE_DEBUG=-g -O0 + endif + +-AM_CFLAGS = $(MAYBE_COVERAGE) $(MAYBE_DEBUG) $(MAYBE_TRACE) ++AM_CFLAGS = $(MAYBE_COVERAGE) $(MAYBE_DEBUG) $(MAYBE_TRACE) -I$(srcdir)/inc + + check_PROGRAMS = tests/test-shunting-yard + tests_test_shunting_yard_SOURCES = src/shunting-yard.c inc/shunting-yard.h \ +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.2.bb b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.2.bb deleted file mode 100644 index 09eab9dcd0..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Simple wrapper script which proxies signals to a child" -HOMEPAGE = "https://github.com/Yelp/dumb-init/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c" - -SRCREV = "b1e978e486114797347deefcc03ab12629a13cc3" -SRC_URI = "git://github.com/Yelp/dumb-init" -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'" - -do_install() { - install -d ${D}${base_sbindir} - install ${S}/dumb-init ${D}${base_sbindir}/ -} diff --git a/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb new file mode 100644 index 0000000000..d88775f9d9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb @@ -0,0 +1,15 @@ +SUMMARY = "Simple wrapper script which proxies signals to a child" +HOMEPAGE = "https://github.com/Yelp/dumb-init/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c" + +SRCREV = "89c1502b9d40b5cb4a844498b14d74ba1dd559bf" +SRC_URI = "git://github.com/Yelp/dumb-init" +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'" + +do_install() { + install -d ${D}${base_sbindir} + install ${S}/dumb-init ${D}${base_sbindir}/ +} diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb deleted file mode 100644 index 50326ea2f4..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "haveged - A simple entropy daemon" -DESCRIPTION = "The haveged project is an attempt to provide an easy-to-use, unpredictable random number generator based upon an adaptation of the HAVEGE algorithm. Haveged was created to remedy low-entropy conditions in the Linux random device that can occur under some workloads, especially on headless servers." -AUTHOR = "Gary Wuertz" -HOMEPAGE = "http://www.issihosts.com/haveged/index.html" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -# v1.9.9 -SRCREV = "1283a65c541c4a83e152024a63faf7b267b9b1cd" -SRC_URI = "git://github.com/jirka-h/haveged.git \ -" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "https://github.com/jirka-h/haveged/releases" - -inherit autotools update-rc.d systemd - -EXTRA_OECONF = "\ - --enable-nistest=yes \ - --enable-olt=yes \ - --enable-threads=no \ -" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--enable-init=service.fedora --enable-initdir=${systemd_system_unitdir}, --enable-init=sysv.redhat, systemd" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME = "haveged" -INITSCRIPT_PARAMS_${PN} = "defaults 9" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "haveged.service" - -do_install_append() { - # The exit status is 143 when the service is stopped - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - sed -i '/ExecStart/a SuccessExitStatus=143' ${D}${systemd_system_unitdir}/haveged.service - # Hybrid systemd-sysvinit distros must install the initscript manually - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${INIT_D_DIR} - sed -e "s,@SBINDIR@,${sbindir},g" <${S}/init.d/sysv.redhat >${D}${INIT_D_DIR}/haveged - chmod 755 ${D}${INIT_D_DIR}/haveged - fi - fi -} - -MIPS_INSTRUCTION_SET = "mips" diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb new file mode 100644 index 0000000000..b56b2271b1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb @@ -0,0 +1,47 @@ +SUMMARY = "haveged - A simple entropy daemon" +DESCRIPTION = "The haveged project is an attempt to provide an easy-to-use, unpredictable random number generator based upon an adaptation of the HAVEGE algorithm. Haveged was created to remedy low-entropy conditions in the Linux random device that can occur under some workloads, especially on headless servers." +AUTHOR = "Gary Wuertz" +HOMEPAGE = "http://www.issihosts.com/haveged/index.html" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +# v1.9.14 +SRCREV = "4da3080ad4587860e5da73072d6ed54d0052938c" +SRC_URI = "git://github.com/jirka-h/haveged.git \ +" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/jirka-h/haveged/releases" + +inherit autotools update-rc.d systemd + +EXTRA_OECONF = "\ + --enable-nistest=yes \ + --enable-olt=yes \ + --enable-threads=no \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--enable-init=service.fedora --enable-initdir=${systemd_system_unitdir}, --enable-init=sysv.redhat, systemd" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME = "haveged" +INITSCRIPT_PARAMS_${PN} = "defaults 9" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "haveged.service" + +do_install_append() { + # The exit status is 143 when the service is stopped + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + sed -i '/ExecStart/a SuccessExitStatus=143' ${D}${systemd_system_unitdir}/haveged.service + # Hybrid systemd-sysvinit distros must install the initscript manually + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${INIT_D_DIR} + sed -e "s,@SBINDIR@,${sbindir},g" <${S}/init.d/sysv.redhat >${D}${INIT_D_DIR}/haveged + chmod 755 ${D}${INIT_D_DIR}/haveged + fi + fi +} + +MIPS_INSTRUCTION_SET = "mips" diff --git a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb index c4cd1d609b..fb161b6583 100644 --- a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb @@ -8,8 +8,7 @@ HOMEPAGE = "https://sourceforge.net/projects/linuxconsole" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libsdl2" -DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +DEPENDS = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \ @@ -32,21 +31,32 @@ SYSTEMD_PACKAGES += "inputattach" SYSTEMD_SERVICE_inputattach = "inputattach.service" SYSTEMD_AUTO_ENABLE_inputattach = "enable" +PROVIDES += "joystick" + +PACKAGECONFIG ??= "sdl" +PACKAGECONFIG[sdl] = ",,libsdl2" + do_compile() { + if ! ${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'true', 'false', d)}; then + # drop ffmvforce so that we don't need libsdl2 + sed '/^PROGRAMS/s/ffmvforce *//g' -i ${S}/utils/Makefile + fi + # respect nonarch_base_libdir path to keep QA check happy + sed 's#DESTDIR)/lib/udev#DESTDIR)/${nonarch_base_libdir}/udev#g' -i ${S}/utils/Makefile oe_runmake } do_install() { oe_runmake install - install -Dm 0644 ${WORKDIR}/51-these-are-not-joysticks-rm.rules ${D}${base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules - install -Dm 0644 ${WORKDIR}/60-joystick.rules ${D}${base_libdir}/udev/rules.d/60-joystick.rules + install -Dm 0644 ${WORKDIR}/51-these-are-not-joysticks-rm.rules ${D}${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules + install -Dm 0644 ${WORKDIR}/60-joystick.rules ${D}${nonarch_base_libdir}/udev/rules.d/60-joystick.rules install -Dm 0644 ${WORKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service install -Dm 0755 ${WORKDIR}/inputattachctl ${D}${bindir}/inputattachctl } -PACKAGES += "inputattach joystick" +PACKAGES += "inputattach joystick-jscal joystick" # We won't package any file here as we are following the same packaging schema # Debian does and we are splitting it in 'inputattach' and 'joystick' packages. @@ -64,20 +74,23 @@ FILES_joystick += "\ ${bindir}/ffmvforce \ ${bindir}/ffset \ ${bindir}/fftest \ + ${bindir}/jstest \ + ${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules \ + ${nonarch_base_libdir}/udev/js-set-enum-leds \ + ${nonarch_base_libdir}/udev/rules.d/60-joystick.rules \ + ${nonarch_base_libdir}/udev/rules.d/80-stelladaptor-joystick.rules \ +" + +FILES_joystick-jscal = " \ + ${datadir}/joystick \ ${bindir}/jscal \ ${bindir}/jscal-restore \ ${bindir}/jscal-store \ - ${bindir}/jstest \ - ${datadir}/joystick \ - ${base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules \ - ${base_libdir}/udev/js-set-enum-leds \ - ${base_libdir}/udev/rules.d/60-joystick.rules \ - ${base_libdir}/udev/rules.d/80-stelladaptor-joystick.rules \ " RDEPENDS_inputattach += "inputattach-config" -RDEPENDS_joystick += "\ +RDEPENDS_joystick-jscal += "\ bash \ gawk \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb deleted file mode 100644 index 14091b565c..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "Redis key-value store" -DESCRIPTION = "Redis is an open source, advanced key-value store." -HOMEPAGE = "http://redis.io" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" -DEPENDS = "readline lua ncurses" - -SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ - file://redis.conf \ - file://init-redis-server \ - file://redis.service \ - file://hiredis-use-default-CC-if-it-is-set.patch \ - file://lua-update-Makefile-to-use-environment-build-setting.patch \ - file://oe-use-libc-malloc.patch \ - file://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://GNU_SOURCE.patch \ - file://riscv32.patch \ - file://ilp32.patch \ - " - -SRC_URI[md5sum] = "70113b4b8ea7ee4c7e148be62b5d1e0b" -SRC_URI[sha256sum] = "04fa1fddc39bd1aecb6739dd5dd73858a3515b427acd1e2947a66dadce868d68" - -inherit autotools-brokensep update-rc.d systemd useradd - -FINAL_LIBS_x86_toolchain-clang = "-latomic" -FINAL_LIBS_riscv32_toolchain-clang = "-latomic" -FINAL_LIBS_mips = "-latomic" -FINAL_LIBS_arm = "-latomic" -FINAL_LIBS_powerpc = "-latomic" - -export FINAL_LIBS - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" -GROUPADD_PARAM_${PN} = "--system redis" - -REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" - -do_compile_prepend() { - (cd deps && oe_runmake hiredis lua linenoise) -} - -do_install() { - export PREFIX=${D}/${prefix} - oe_runmake install - install -d ${D}/${sysconfdir}/redis - install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server - install -d ${D}/var/lib/redis/ - chown redis.redis ${D}/var/lib/redis/ - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service - - if [ "${REDIS_ON_SYSTEMD}" = true ]; then - sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf - fi -} - -CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" - -INITSCRIPT_NAME = "redis-server" -INITSCRIPT_PARAMS = "defaults 87" - -SYSTEMD_SERVICE_${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.9.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.9.bb new file mode 100644 index 0000000000..50571ed550 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.9.bb @@ -0,0 +1,67 @@ +SUMMARY = "Redis key-value store" +DESCRIPTION = "Redis is an open source, advanced key-value store." +HOMEPAGE = "http://redis.io" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" +DEPENDS = "readline lua ncurses" + +SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ + file://redis.conf \ + file://init-redis-server \ + file://redis.service \ + file://hiredis-use-default-CC-if-it-is-set.patch \ + file://lua-update-Makefile-to-use-environment-build-setting.patch \ + file://oe-use-libc-malloc.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ + file://GNU_SOURCE.patch \ + file://riscv32.patch \ + file://ilp32.patch \ + " +SRC_URI[sha256sum] = "dc2bdcf81c620e9f09cfd12e85d3bc631c897b2db7a55218fd8a65eaa37f86dd" + +inherit autotools-brokensep update-rc.d systemd useradd + +FINAL_LIBS_x86_toolchain-clang = "-latomic" +FINAL_LIBS_riscv32_toolchain-clang = "-latomic" +FINAL_LIBS_mips = "-latomic" +FINAL_LIBS_arm = "-latomic" +FINAL_LIBS_powerpc = "-latomic" + +export FINAL_LIBS + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" +GROUPADD_PARAM_${PN} = "--system redis" + +REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" + +do_compile_prepend() { + (cd deps && oe_runmake hiredis lua linenoise) +} + +do_install() { + export PREFIX=${D}/${prefix} + oe_runmake install + install -d ${D}/${sysconfdir}/redis + install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server + install -d ${D}/var/lib/redis/ + chown redis.redis ${D}/var/lib/redis/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service + + if [ "${REDIS_ON_SYSTEMD}" = true ]; then + sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf + fi +} + +CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" + +INITSCRIPT_NAME = "redis-server" +INITSCRIPT_PARAMS = "defaults 87" + +SYSTEMD_SERVICE_${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.1.bb b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.1.bb deleted file mode 100644 index b401272d24..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.1.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Control and monitor storage systems using S.M.A.R.T" -DESCRIPTION = "\ -The smartmontools package contains two utility programs (smartctl \ -and smartd) to control and monitor storage systems using the Self-\ -Monitoring, Analysis and Reporting Technology System (SMART) built \ -into most modern ATA and SCSI hard disks. In many cases, these \ -utilities will provide advanced warning of disk degradation and failure." - -HOMEPAGE = "http://smartmontools.sourceforge.net/" -SECTION = "console/utils" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ - file://initd.smartd \ - file://smartmontools.default \ - file://smartd.service \ - " - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d)}" -PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" -PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" - -SRC_URI[md5sum] = "430cd5f64caa4524018b536e5ecd9c29" -SRC_URI[sha256sum] = "3f734d2c99deb1e4af62b25d944c6252de70ca64d766c4c7294545a2e659b846" - -inherit autotools update-rc.d systemd - -SYSTEMD_SERVICE_${PN} = "smartd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -do_install_append () { - #install the init.d/smartd - install -d ${D}${sysconfdir}/init.d - install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd - install -d ${D}${sysconfdir}/default - install -p -m 0644 ${WORKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools - - #install systemd service file - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/smartd.service ${D}${systemd_unitdir}/system - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@SBINDIR@,${sbindir},g' \ - ${D}${systemd_unitdir}/system/smartd.service -} - -INITSCRIPT_NAME = "smartd" -INITSCRIPT_PARAMS = "start 60 2 3 4 5 . stop 60 0 1 6 ." - -RDEPENDS_${PN} += "mailx" diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb new file mode 100644 index 0000000000..3c01e589ca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb @@ -0,0 +1,52 @@ +SUMMARY = "Control and monitor storage systems using S.M.A.R.T" +DESCRIPTION = "\ +The smartmontools package contains two utility programs (smartctl \ +and smartd) to control and monitor storage systems using the Self-\ +Monitoring, Analysis and Reporting Technology System (SMART) built \ +into most modern ATA and SCSI hard disks. In many cases, these \ +utilities will provide advanced warning of disk degradation and failure." + +HOMEPAGE = "http://smartmontools.sourceforge.net/" +SECTION = "console/utils" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ + file://initd.smartd \ + file://smartmontools.default \ + file://smartd.service \ + " + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d)}" +PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" +PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" + +SRC_URI[md5sum] = "e8d134c69ae4959a05cb56b31172ffb1" +SRC_URI[sha256sum] = "5cd98a27e6393168bc6aaea070d9e1cd551b0f898c52f66b2ff2e5d274118cd6" + +inherit autotools update-rc.d systemd + +SYSTEMD_SERVICE_${PN} = "smartd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +do_install_append () { + #install the init.d/smartd + install -d ${D}${sysconfdir}/init.d + install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd + install -d ${D}${sysconfdir}/default + install -p -m 0644 ${WORKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools + + #install systemd service file + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/smartd.service ${D}${systemd_unitdir}/system + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${systemd_unitdir}/system/smartd.service +} + +INITSCRIPT_NAME = "smartd" +INITSCRIPT_PARAMS = "start 60 2 3 4 5 . stop 60 0 1 6 ." + +RDEPENDS_${PN} += "mailx" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index b44942303e..bc930ac9df 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -6,9 +6,9 @@ DEPENDS = "libsocketcan" SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git" -SRCREV = "856d0a662a02dd2dc0b83a7ad1de9fd120e82c4b" +SRCREV = "eb66451df280f95a9a12e78b151b8d867e1b78ed" -PV = "2020.11.0" +PV = "2020.12.0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb new file mode 100644 index 0000000000..1e49e68f89 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb @@ -0,0 +1,31 @@ +SUMMARY = "X11 image viewer aimed mostly at console users" +AUTHOR = "Tom Gilbert & Daniel Friesel" +HOMEPAGE = "https://feh.finalrewind.org/" +SECTION = "x11/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=f91bd06901085c94bdc50649d98c5059" +DEPENDS = "\ + imlib2 \ + virtual/libx11 libxt\ +" + +SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" +SRC_URI[sha256sum] = "9b1edec52cbae97b17530cb5db10666abfb9983f51a5d820c89added6f7b1ea8" + +inherit mime-xdg features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OEMAKE = "curl=0 xinerama=0 PREFIX=/usr" + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake install app=1 'DESTDIR=${D}' 'ICON_PREFIX=${D}${datadir}/icons' +} + +RDEPENDS_${PN} += "imlib2-loaders" + +FILES_${PN} += "${datadir}/icons" diff --git a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb new file mode 100644 index 0000000000..b44b03ce8e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb @@ -0,0 +1,39 @@ +SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation" + +HOMEPAGE = "https://sourceforge.net/projects/enlightenment/" +SECTION = "libs" +LICENSE = "MIT & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" + +DEPENDS = "freetype " +PROVIDES = "virtual/imlib2" +PV = "1.7.1" +SRCREV = "v1.7.1" + +inherit autotools pkgconfig lib_package + +AUTO_LIBNAME_PKGS = "" + +SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;protocol=https" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "jpeg png zlib ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +X11_DEPS = "virtual/libx11 libxext libice" +PACKAGECONFIG[x11] = "--with-x,--without-x,${X11_DEPS}" + +PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib" +PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg" +PACKAGECONFIG[png] = "--with-png,--without-png,libpng" +PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff" +PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" + +PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" + +PACKAGECONFIG[id3] = "--with-id3,--without-id3,libid3tag" + +PACKAGES =+ "${BPN}-loaders ${BPN}-filters ${BPN}-data" +FILES_${PN}-data = "${datadir}" +FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" +FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.23.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.23.bb deleted file mode 100644 index 2abd11a4cc..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.23.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Jpeg 2000 implementation" -HOMEPAGE = "https://jasper-software.github.io/jasper/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" - -SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https" -SRCREV = "cc02d63dde901e06d1f866984fd0e80601deaa13" - -S = "${WORKDIR}/git" - -inherit cmake - -PACKAGECONFIG ??= "" -PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=true, -DJAS_ENABLE_LIBJPEG=false, jpeg" -PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=true, -DJAS_ENABLE_OPENGL=false, freeglut" - -EXTRA_OECMAKE_append = " -DJAS_ENABLE_SHARED=true" - -do_install_append() { - chrpath -d ${D}${bindir}/jasper - chrpath -d ${D}${bindir}/imginfo - chrpath -d ${D}${bindir}/imgcmp - chrpath -d ${D}${libdir}/libjasper.so.* -} diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.24.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.24.bb new file mode 100644 index 0000000000..2071c1fbd8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.24.bb @@ -0,0 +1,24 @@ +SUMMARY = "Jpeg 2000 implementation" +HOMEPAGE = "https://jasper-software.github.io/jasper/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" + +SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https" +SRCREV = "9a2835a81ce9c41a48f36dadce79f110da8d6c75" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ??= "" +PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=true, -DJAS_ENABLE_LIBJPEG=false, jpeg" +PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=true, -DJAS_ENABLE_OPENGL=false, freeglut" + +EXTRA_OECMAKE_append = " -DJAS_ENABLE_SHARED=true" + +do_install_append() { + chrpath -d ${D}${bindir}/jasper + chrpath -d ${D}${bindir}/imginfo + chrpath -d ${D}${bindir}/imgcmp + chrpath -d ${D}${libdir}/libjasper.so.* +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb index aa246f9995..8f1960d8ad 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/SDL2_mixer-${PV}" inherit autotools-brokensep pkgconfig EXTRA_AUTORECONF += "--include=acinclude" -EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}" +EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --disable-music-ogg-shared LIBS=-L${STAGING_LIBDIR}" PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb new file mode 100644 index 0000000000..53c5898211 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb @@ -0,0 +1,33 @@ +SUMMARY = "Openbox configuration tool" +AUTHOR = "Dana Jansens & Tim Riley & Javeed Shaikh" +HOMEPAGE = "http://openbox.org/wiki/ObConf:About" +SECTION = "x11/wm" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = " \ + openbox \ + startup-notification \ + gtk+3 \ +" +PV = "2.0.4+git${SRCPV}" + +SRCREV = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39" +SRC_URI = " \ + git://git.openbox.org/dana/obconf \ +" + +S = "${WORKDIR}/git" + +inherit autotools gettext pkgconfig mime mime-xdg features_check +# depends on openbox, which is X11-only +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_AUTORECONF = "" + +FILES_${PN} += "\ + ${datadir}/mime \ +" + +do_install_append () { + rm -rf ${D}${datadir}/mimelnk +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch new file mode 100644 index 0000000000..663f499df6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch @@ -0,0 +1,36 @@ +From 3e4fe4c42d4d63c36df966baea87da6fbc032553 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Thu, 7 Jan 2021 16:05:28 +0900 +Subject: [PATCH] This patch fixed include dir to /usr/include/. Obviously, it + is not suitble for cross-compile. So, removed this patch temporarily. +https://github.com/uclouvain/openjpeg/issues/1174 + +Upsteam-Status: Pending +https://github.com/uclouvain/openjpeg/issues/1320 + +Signed-off-by: Lei Maohui +--- + cmake/OpenJPEGConfig.cmake.in | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in +index 8a726697..2925108a 100644 +--- a/cmake/OpenJPEGConfig.cmake.in ++++ b/cmake/OpenJPEGConfig.cmake.in +@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) + # This is an install tree + include(${SELF_DIR}/OpenJPEGTargets.cmake) + ++ # We find a relative path from the PKG directory to header files. ++ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@") + set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") +- get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE) ++ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") ++ ++ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) + + else() + if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-15389.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-15389.patch deleted file mode 100644 index f5ce11a27f..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-15389.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e8e258ab049240c2dd1f1051b4e773b21e2d3dc0 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sun, 28 Jun 2020 14:19:59 +0200 -Subject: [PATCH] opj_decompress: fix double-free on input directory with mix - of valid and invalid images (CVE-2020-15389) - -Fixes #1261 - -Credits to @Ruia-ruia for reporting and analysis. ---- - src/bin/jp2/opj_decompress.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- end of original header --- - -CVE: CVE-2020-15389 - -Upstream-Status: Backport [git://github.com/uclouvain/openjpeg.git] - -Signed-off-by: Joe Slater - ---- -diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c -index 7eeb0952..2634907f 100644 ---- a/src/bin/jp2/opj_decompress.c -+++ b/src/bin/jp2/opj_decompress.c -@@ -1316,10 +1316,6 @@ static opj_image_t* upsample_image_components(opj_image_t* original) - int main(int argc, char **argv) - { - opj_decompress_parameters parameters; /* decompression parameters */ -- opj_image_t* image = NULL; -- opj_stream_t *l_stream = NULL; /* Stream */ -- opj_codec_t* l_codec = NULL; /* Handle to a decompressor */ -- opj_codestream_index_t* cstr_index = NULL; - - OPJ_INT32 num_images, imageno; - img_fol_t img_fol; -@@ -1393,6 +1389,10 @@ int main(int argc, char **argv) - - /*Decoding image one by one*/ - for (imageno = 0; imageno < num_images ; imageno++) { -+ opj_image_t* image = NULL; -+ opj_stream_t *l_stream = NULL; /* Stream */ -+ opj_codec_t* l_codec = NULL; /* Handle to a decompressor */ -+ opj_codestream_index_t* cstr_index = NULL; - - if (!parameters.quiet) { - fprintf(stderr, "\n"); --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch deleted file mode 100644 index 1e14149c85..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sat, 11 Jan 2020 01:51:19 +0100 -Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose - coordinates are beyond INT_MAX (fixes #1228) - -CVE: CVE-2020-6851 - -Signed-off-by: Mingde (Matthew) Zeng - ---- - src/lib/openjp2/j2k.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c -index 14f6ff41..922550eb 100644 ---- a/src/lib/openjp2/j2k.c -+++ b/src/lib/openjp2/j2k.c -@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim - l_img_comp = p_image->comps; - for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) { - OPJ_INT32 l_h, l_w; -+ if (p_image->x0 > (OPJ_UINT32)INT_MAX || -+ p_image->y0 > (OPJ_UINT32)INT_MAX || -+ p_image->x1 > (OPJ_UINT32)INT_MAX || -+ p_image->y1 > (OPJ_UINT32)INT_MAX) { -+ opj_event_msg(p_manager, EVT_ERROR, -+ "Image coordinates above INT_MAX are not supported\n"); -+ return OPJ_FALSE; -+ } - - l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0, - (OPJ_INT32)l_img_comp->dx); --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch deleted file mode 100644 index 6158601af0..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Thu, 30 Jan 2020 00:59:57 +0100 -Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow - -That could lead to later assertion failures. - -Fixes #1231 / CVE-2020-8112 - -CVE: CVE-2020-8112 - -Signed-off-by: Mingde (Matthew) Zeng ---- - src/lib/openjp2/tcd.c | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c -index deecc4df..aa419030 100644 ---- a/src/lib/openjp2/tcd.c -+++ b/src/lib/openjp2/tcd.c -@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, - /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */ - l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx; - l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy; -- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx; -- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy; -+ { -+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1, -+ (OPJ_INT32)l_pdx)) << l_pdx; -+ if (tmp > (OPJ_UINT32)INT_MAX) { -+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); -+ return OPJ_FALSE; -+ } -+ l_br_prc_x_end = (OPJ_INT32)tmp; -+ } -+ { -+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1, -+ (OPJ_INT32)l_pdy)) << l_pdy; -+ if (tmp > (OPJ_UINT32)INT_MAX) { -+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); -+ return OPJ_FALSE; -+ } -+ l_br_prc_y_end = (OPJ_INT32)tmp; -+ } - /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/ - - l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)(( --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb deleted file mode 100644 index a0740a2740..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec" -HOMEPAGE = "http://www.openjpeg.org" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" - -DEPENDS = "libpng tiff lcms zlib" - -SRC_URI = " \ - git://github.com/uclouvain/openjpeg.git \ - file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ - file://CVE-2020-6851.patch \ - file://CVE-2020-8112.patch \ - file://CVE-2020-15389.patch \ -" -SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788" -S = "${WORKDIR}/git" - -inherit cmake - -# for multilib -EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}" - -FILES_${PN} += "${libdir}/openjpeg*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb new file mode 100644 index 0000000000..8e264bf71b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec" +HOMEPAGE = "http://www.openjpeg.org" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" + +DEPENDS = "libpng tiff lcms zlib" + +SRC_URI = " \ + git://github.com/uclouvain/openjpeg.git \ + file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ + file://0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch \ +" +SRCREV = "37ac30ceff6640bbab502388c5e0fa0bff23f505" +S = "${WORKDIR}/git" + +inherit cmake + +# for multilib +EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}" + +FILES_${PN} += "${libdir}/openjpeg*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb deleted file mode 100644 index dc263fda4b..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Terminus fonts packages (console and X11)" -DESCRIPTION = "Terminus Font is a clean, fixed width bitmap font, designed for \ - long (8 and more hours per day) work with computers." -HOMEPAGE = "http://terminus-font.sourceforge.net/" -AUTHOR = "Dimitar Zhekov" -SECTION = "fonts" - -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://OFL.TXT;md5=9b226721636fde0db38ea656c2aae4bf" - -DEPENDS = "hostperl-runtime-native gzip-native bdftopcf-native" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "a2cb88f6cf174f3d07de93b91e115a8d" -SRC_URI[sha256sum] = "34799c8dd5cec7db8016b4a615820dfb43b395575afbb24fc17ee19c869c94af" - -inherit allarch fontcache - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "" - -# Don't use font cache mecanism for console packages -FONT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '${PN}-pcf', '', d)}" - -# Hand made configure script. Don't need oe_runconf -do_configure() { - chmod +x ${S}/configure - ${S}/configure --prefix=${prefix} \ - --psfdir=${datadir}/consolefonts \ - --acmdir=${datadir}/consoletrans \ - --x11dir=${datadir}/fonts/terminus -} - -do_compile() { - oe_runmake DESTDIR=${D} psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pcf', '', d)} -} - -do_install() { - oe_runmake DESTDIR=${D} install-psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)} -} - -PACKAGES += "${PN}-consolefonts ${PN}-consoletrans ${PN}-pcf" -FILES_${PN}-consolefonts = "${datadir}/consolefonts" -FILES_${PN}-consoletrans = "${datadir}/consoletrans" -FILES_${PN}-pcf = "${datadir}/fonts/terminus" diff --git a/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb new file mode 100644 index 0000000000..789e7eb99d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb @@ -0,0 +1,45 @@ +SUMMARY = "Terminus fonts packages (console and X11)" +DESCRIPTION = "Terminus Font is a clean, fixed width bitmap font, designed for \ + long (8 and more hours per day) work with computers." +HOMEPAGE = "http://terminus-font.sourceforge.net/" +AUTHOR = "Dimitar Zhekov" +SECTION = "fonts" + +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://OFL.TXT;md5=f57e6cca943dbc6ef83dc14f1855bdcc" + +DEPENDS = "hostperl-runtime-native gzip-native bdftopcf-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "1b6acbd221957e33c8a792ebfaf3a659" +SRC_URI[sha256sum] = "d961c1b781627bf417f9b340693d64fc219e0113ad3a3af1a3424c7aa373ef79" + +inherit allarch fontcache + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "" + +# Don't use font cache mecanism for console packages +FONT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '${PN}-pcf', '', d)}" + +# Hand made configure script. Don't need oe_runconf +do_configure() { + chmod +x ${S}/configure + ${S}/configure --prefix=${prefix} \ + --psfdir=${datadir}/consolefonts \ + --acmdir=${datadir}/consoletrans \ + --x11dir=${datadir}/fonts/terminus +} + +do_compile() { + oe_runmake DESTDIR=${D} psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pcf', '', d)} +} + +do_install() { + oe_runmake DESTDIR=${D} install-psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)} +} + +PACKAGES += "${PN}-consolefonts ${PN}-consoletrans ${PN}-pcf" +FILES_${PN}-consolefonts = "${datadir}/consolefonts" +FILES_${PN}-consoletrans = "${datadir}/consoletrans" +FILES_${PN}-pcf = "${datadir}/fonts/terminus" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_353.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_353.bb deleted file mode 100644 index 6de704d0b7..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_353.bb +++ /dev/null @@ -1,36 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc -SUMMARY = "xterm is the standard terminal emulator for the X Window System" -DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses" - -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=996b1ce0584c0747b17b57654cc81e8e" - -SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ - file://0001-Add-configure-time-check-for-setsid.patch \ - " - -SRC_URI[md5sum] = "247c30ebfa44623f3a2d100e0cae5c7f" -SRC_URI[sha256sum] = "e521d3ee9def61f5d5c911afc74dd5c3a56ce147c7071c74023ea24cac9bb768" -PACKAGECONFIG ?= "" -PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" - -EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ - --disable-imake \ - --disable-rpath-hack \ - --disable-setuid \ - --with-app-defaults=${datadir}/X11/app-defaults \ - " - -B = "${S}" - -do_configure() { - gnu-configize --force - sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure - oe_runconf -} - -# busybox can supply resize too -inherit update-alternatives - -ALTERNATIVE_${PN} = "resize" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_362.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_362.bb new file mode 100644 index 0000000000..2bbcd9211c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_362.bb @@ -0,0 +1,48 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc +SUMMARY = "xterm is the standard terminal emulator for the X Window System" +DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" + +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=996b1ce0584c0747b17b57654cc81e8e" + +SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ + file://0001-Add-configure-time-check-for-setsid.patch \ + " + +SRC_URI[md5sum] = "ee6710bbbe18000236c6e6d7b55b54d5" +SRC_URI[sha256sum] = "1d4ffe226fa8f021859bbc3007788ff63a46a31242d9bd9a7bd7ebe24e81aca2" +PACKAGECONFIG ?= "" +PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" + +# Let xterm install .desktop files +inherit mime-xdg + +EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ + FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ + --disable-imake \ + --disable-rpath-hack \ + --disable-setuid \ + --with-app-defaults=${datadir}/X11/app-defaults \ + " + +B = "${S}" + +do_configure() { + gnu-configize --force + sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure + oe_runconf +} + +do_install_append() { + oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" +} + +RPROVIDES_${PN} = "virtual/x-terminal-emulator" + +# busybox can supply resize too +inherit update-alternatives + +ALTERNATIVE_${PN} = "resize x-terminal-emulator" +ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" +# rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. +ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20201105.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20201105.bb deleted file mode 100644 index 59375c8629..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20201105.bb +++ /dev/null @@ -1,62 +0,0 @@ -# live555 OE build file -# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "LIVE555 Streaming Media libraries" -HOMEPAGE = "http://live.com/" -LICENSE = "LGPLv3" -SECTION = "devel" - -DEPENDS = "openssl" - -URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}" -SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz \ - file://config.linux-cross" - -# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older -MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" - -SRC_URI[sha256sum] = "89bdfba7fd215e16be2c9d46a797bf85c5f7f7c46b53dc8af2d1171a658da5b7" - -S = "${WORKDIR}/live" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - " - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure() { - cp ${WORKDIR}/config.linux-cross . - echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross - ./genMakefiles linux-cross -} - -do_install() { - install -d ${D}${includedir}/BasicUsageEnvironment - install -d ${D}${includedir}/groupsock - install -d ${D}${includedir}/liveMedia - install -d ${D}${includedir}/UsageEnvironment - install -d ${D}${libdir} - cp -R --no-dereference --preserve=mode,links -v ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/ - cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/ - cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/ - cp -R --no-dereference --preserve=mode,links -v ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/ - cp -R --no-dereference --preserve=mode,links -v ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/ - # Find all the headers - for i in $(find . -name "*.hh") $(find . -name "*.h") ; do - install ${i} ${D}${includedir} - done - cp ${S}/*/*.a ${D}${libdir} - install -d ${D}${bindir} - for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do - install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/ - done - install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/ -} - -PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples" -FILES_live555-openrtsp = "${bindir}/openRTSP" -FILES_live555-playsip = "${bindir}/playSIP" -FILES_live555-mediaserver = "${bindir}/live555MediaServer" -FILES_live555-examples = "${bindir}/*" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210101.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210101.bb new file mode 100644 index 0000000000..817e52dca3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210101.bb @@ -0,0 +1,62 @@ +# live555 OE build file +# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "LIVE555 Streaming Media libraries" +HOMEPAGE = "http://live.com/" +LICENSE = "LGPLv3" +SECTION = "devel" + +DEPENDS = "openssl" + +URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}" +SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz \ + file://config.linux-cross" + +# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older +MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" + +SRC_URI[sha256sum] = "a26a2fb43c56719e5e94bbde7d2c492eb8306aa457a5a08034c6b942c4a3b0d4" + +S = "${WORKDIR}/live" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + " + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure() { + cp ${WORKDIR}/config.linux-cross . + echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross + ./genMakefiles linux-cross +} + +do_install() { + install -d ${D}${includedir}/BasicUsageEnvironment + install -d ${D}${includedir}/groupsock + install -d ${D}${includedir}/liveMedia + install -d ${D}${includedir}/UsageEnvironment + install -d ${D}${libdir} + cp -R --no-dereference --preserve=mode,links -v ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/ + cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/ + cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/ + cp -R --no-dereference --preserve=mode,links -v ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/ + cp -R --no-dereference --preserve=mode,links -v ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/ + # Find all the headers + for i in $(find . -name "*.hh") $(find . -name "*.h") ; do + install ${i} ${D}${includedir} + done + cp ${S}/*/*.a ${D}${libdir} + install -d ${D}${bindir} + for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do + install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/ + done + install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/ +} + +PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples" +FILES_live555-openrtsp = "${bindir}/openRTSP" +FILES_live555-playsip = "${bindir}/playSIP" +FILES_live555-mediaserver = "${bindir}/live555MediaServer" +FILES_live555-examples = "${bindir}/*" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb deleted file mode 100644 index b37441ecc6..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "The Geolocation Service" -DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \ -The primary goal of the Geoclue project is to make creating location-aware applications \ -as simple as possible, while the secondary goal is to ensure that no application \ -can access location information without explicit permission from user." -LICENSE = "GPLv2.0+" -SECTION = "console/network" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6" - -DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native" - -inherit meson pkgconfig gtk-doc gobject-introspection vala - -SRCREV = "555d676a91494b98ad0d52639590608a9594a8d3" -SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1" - -S = "${WORKDIR}/git" - -# Without this line, package is declared a library and named libgeoclue* -AUTO_LIBNAME_PKGS = "" - -PACKAGECONFIG ??= "3g modem-gps cdma nmea lib" -PACKAGECONFIG[3g] = "-D3g-source=true,-D3g-source=false,modemmanager" -PACKAGECONFIG[modem-gps] = "-Dmodem-gps-source=true,-Dmodem-gps-source=false,modemmanager" -PACKAGECONFIG[cdma] = "-Dcdma-source=true,-Dcdma-source=false,modemmanager" -PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi,avahi-daemon" -PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false,gobject-introspection" - -GTKDOC_MESON_OPTION = "gtk-doc" - -EXTRA_OEMESON += " \ - -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \ - -Ddemo-agent=false \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1/system-services \ - ${libdir} \ - ${systemd_unitdir} \ - ${prefix}/libexec \ -" - -FILES_${PN}-dev += " \ - ${datadir}/dbus-1/interfaces \ - ${datadir}/gir-1.0 \ -" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb new file mode 100644 index 0000000000..6c0b922c92 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb @@ -0,0 +1,47 @@ +SUMMARY = "The Geolocation Service" +DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \ +The primary goal of the Geoclue project is to make creating location-aware applications \ +as simple as possible, while the secondary goal is to ensure that no application \ +can access location information without explicit permission from user." +LICENSE = "GPLv2.0+" +SECTION = "console/network" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6" + +DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native" + +inherit meson pkgconfig gtk-doc gobject-introspection vala + +SRCREV = "3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8" +SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1" + +S = "${WORKDIR}/git" + +# Without this line, package is declared a library and named libgeoclue* +AUTO_LIBNAME_PKGS = "" + +PACKAGECONFIG ??= "3g modem-gps cdma nmea lib" +PACKAGECONFIG[3g] = "-D3g-source=true,-D3g-source=false,modemmanager" +PACKAGECONFIG[modem-gps] = "-Dmodem-gps-source=true,-Dmodem-gps-source=false,modemmanager" +PACKAGECONFIG[cdma] = "-Dcdma-source=true,-Dcdma-source=false,modemmanager" +PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi,avahi-daemon" +PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false,gobject-introspection" + +GTKDOC_MESON_OPTION = "gtk-doc" + +EXTRA_OEMESON += " \ + -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \ + -Ddemo-agent=false \ +" + +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${libdir} \ + ${systemd_unitdir} \ + ${prefix}/libexec \ +" + +FILES_${PN}-dev += " \ + ${datadir}/dbus-1/interfaces \ + ${datadir}/gir-1.0 \ +" diff --git a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.2.bb b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.2.bb deleted file mode 100644 index f59e6d1f7a..0000000000 --- a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Small and fast POSIX-compliant shell" -HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/" -SECTION = "System Environment/Shells" - -LICENSE = "BSD & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" - -inherit autotools update-alternatives - -SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz" -SRC_URI[md5sum] = "b9b71c72e40fdc4db9b4ffb81fc3bebc" -SRC_URI[sha256sum] = "00fb7d68b7599cc41ab151051c06c01e9500540183d8aa72116cb9c742bd6d5f" - -EXTRA_OECONF += "--bindir=${base_bindir}" - -ALTERNATIVE_${PN} = "sh" -ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" -ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" -ALTERNATIVE_PRIORITY = "10" - -pkg_postinst_${PN} () { - grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells -} - -pkg_postrm_${PN} () { - printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells -} diff --git a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb new file mode 100644 index 0000000000..92d9bc83d2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "Small and fast POSIX-compliant shell" +HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/" +SECTION = "System Environment/Shells" + +LICENSE = "BSD & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" + +inherit autotools update-alternatives + +SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz" +SRC_URI[md5sum] = "c7016b513f701d88c70b3082eb183581" +SRC_URI[sha256sum] = "62b9f1676ba6a7e8eaec541a39ea037b325253240d1f378c72360baa1cbcbc2a" + +EXTRA_OECONF += "--bindir=${base_bindir}" + +ALTERNATIVE_${PN} = "sh" +ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" +ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" +ALTERNATIVE_PRIORITY = "10" + +pkg_postinst_${PN} () { + grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells +} + +pkg_postrm_${PN} () { + printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells +} diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.0.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.0.bb deleted file mode 100644 index 7709075fe3..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Asio is C++ library for network and low-level I/O programming" -DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \ - I/O programming that provides developers with a consistent asynchronous \ - model using a modern C++ approach." -AUTHOR = "Christopher M. Kohlhoff (chris at kohlhoff dot com)" -HOMEPAGE = "http://think-async.com/Asio" -SECTION = "libs" -LICENSE = "BSL-1.0" - -DEPENDS = "openssl" - -SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" - -inherit autotools - -ALLOW_EMPTY_${PN} = "1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=de86c8210a433f72bd3cc98e797a6084" - -SRC_URI[md5sum] = "ed1f2dc4cf24aa2da8361179ade01682" -SRC_URI[sha256sum] = "9d539e7c09aa6394d512c433c5601c1f26dc4975f022ad7d5e8e57c3b635b370" - -SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" - -PACKAGECONFIG ??= "boost" - -PACKAGECONFIG[boost] = "--with-boost=${STAGING_LIBDIR},--without-boost,boost" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb new file mode 100644 index 0000000000..36aff75037 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "Asio is C++ library for network and low-level I/O programming" +DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \ + I/O programming that provides developers with a consistent asynchronous \ + model using a modern C++ approach." +AUTHOR = "Christopher M. Kohlhoff (chris at kohlhoff dot com)" +HOMEPAGE = "http://think-async.com/Asio" +SECTION = "libs" +LICENSE = "BSL-1.0" + +DEPENDS = "openssl" + +SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" + +inherit autotools + +ALLOW_EMPTY_${PN} = "1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=de86c8210a433f72bd3cc98e797a6084" + +SRC_URI[md5sum] = "00807b2e976f467b3cec85d1589f0825" +SRC_URI[sha256sum] = "4af9875df5497fdd507231f4b7346e17d96fc06fe10fd30e2b3750715a329113" + +SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" + +PACKAGECONFIG ??= "boost" + +PACKAGECONFIG[boost] = "--with-boost=${STAGING_LIBDIR},--without-boost,boost" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.5.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.5.bb deleted file mode 100644 index ff05227aa6..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" -DESCRIPTION = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux" - -HOMEPAGE = "https://github.com/vsergeev/c-periphery" - -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" - -SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" -SRCREV = "513f5edbcf2f2ec5c0cd711d1cc312eb2d753f1b" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb new file mode 100644 index 0000000000..a49d136924 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" +DESCRIPTION = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux" + +HOMEPAGE = "https://github.com/vsergeev/c-periphery" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" + +SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" +SRCREV = "8c9f87227b99ac74509b01602dc21d814fe91516" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb deleted file mode 100644 index 5d7dbd8bda..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design." -SECTION = "libs/network" -HOMEPAGE = "https://github.com/Microsoft/cpprestsdk/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" -DEPENDS = "openssl websocketpp zlib boost brotli" - -EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" - -SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ - file://disable-float-tests.patch \ - file://disable-outside-tests.patch " - -# tag 2.10.16 -SRCREV= "18212a2a7967e12d740bfb957e500892b3463c88" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.17.bb b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.17.bb new file mode 100644 index 0000000000..c16e893299 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.17.bb @@ -0,0 +1,19 @@ +SUMMARY = "Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design." +SECTION = "libs/network" +HOMEPAGE = "https://github.com/Microsoft/cpprestsdk/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" +DEPENDS = "openssl websocketpp zlib boost brotli" + +EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" + +SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ + file://disable-float-tests.patch \ + file://disable-outside-tests.patch " + +# tag 2.10.17 +SRCREV= "41e7d0074b6cb5b22c89f835b4531d848ab66987" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.1.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.1.bb new file mode 100644 index 0000000000..2a386086f5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.1.bb @@ -0,0 +1,50 @@ +SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" +HOMEPAGE = "https://github.com/gperftools/gperftools" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" + +SRCREV = "d8eb315fb18f6fb0d6efa923401f166343727bc6" +SRC_URI = "git://github.com/gperftools/gperftools \ + file://0001-Support-Atomic-ops-on-clang.patch \ + file://0001-fix-build-with-musl-libc.patch \ + file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ + file://disable_libunwind_aarch64.patch \ + file://sgidef.patch \ + file://0001-profile-handler-Specify-libc-specific-thread_id.patch \ + " + +inherit autotools + +S = "${WORKDIR}/git" + +# On mips, we have the following error. +# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 +# Segmentation fault (core dumped) +COMPATIBLE_HOST_mipsarch = "null" +COMPATIBLE_HOST_riscv64 = "null" +COMPATIBLE_HOST_riscv32 = "null" + +# Disable thumb1 +# {standard input}: Assembler messages: +# {standard input}:434: Error: lo register required -- `ldr pc,[sp]' +# Makefile:4538: recipe for target 'src/base/libtcmalloc_la-linuxthreads.lo' failed +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_toolchain-clang_arm = "arm" + +PACKAGECONFIG ?= "libunwind static" +PACKAGECONFIG_remove_arm_libc-musl = "libunwind" +PACKAGECONFIG_remove_riscv64 = "libunwind" +PACKAGECONFIG_remove_riscv32 = "libunwind" + +PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" +PACKAGECONFIG[static] = "--enable-static,--disable-static," + +PACKAGE_BEFORE_PN += "libtcmalloc-minimal" +FILES_libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" + +# pprof tool requires Getopt::long and POSIX perl5 modules. +# Also runs `objdump` on each cpuprofile data file +RDEPENDS_${PN} += "binutils perl-module-getopt-long perl-module-posix" + +RDEPENDS_${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" + diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb deleted file mode 100644 index d9b310bceb..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" -HOMEPAGE = "https://github.com/gperftools/gperftools" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" - -SRCREV = "180bfa10d7cb38e8b3784d60943d50e8fcef0dcb" -SRC_URI = "git://github.com/gperftools/gperftools \ - file://0001-Support-Atomic-ops-on-clang.patch \ - file://0001-fix-build-with-musl-libc.patch \ - file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ - file://disable_libunwind_aarch64.patch \ - file://sgidef.patch \ - file://0001-profile-handler-Specify-libc-specific-thread_id.patch \ - " - -inherit autotools - -S = "${WORKDIR}/git" - -# On mips, we have the following error. -# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 -# Segmentation fault (core dumped) -COMPATIBLE_HOST_mipsarch = "null" -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" - -# Disable thumb1 -# {standard input}: Assembler messages: -# {standard input}:434: Error: lo register required -- `ldr pc,[sp]' -# Makefile:4538: recipe for target 'src/base/libtcmalloc_la-linuxthreads.lo' failed -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_toolchain-clang_arm = "arm" - -PACKAGECONFIG ?= "libunwind static" -PACKAGECONFIG_remove_arm_libc-musl = "libunwind" -PACKAGECONFIG_remove_riscv64 = "libunwind" -PACKAGECONFIG_remove_riscv32 = "libunwind" - -PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" -PACKAGECONFIG[static] = "--enable-static,--disable-static," - -PACKAGE_BEFORE_PN += "libtcmalloc-minimal" -FILES_libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" - -# pprof tool requires Getopt::long and POSIX perl5 modules. -# Also runs `objdump` on each cpuprofile data file -RDEPENDS_${PN} += "binutils perl-module-getopt-long perl-module-posix" - -RDEPENDS_${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" - diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb index 85646062fd..0ac08bd51c 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.341" -SRCREV = "82fc979083e959a749ea5bb919aa6d7d61123ae0" +PV = "0.342" +SRCREV = "bdcc84fca6eb97bef9a8a8b04f71cbed8f32a986" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb deleted file mode 100644 index 2bd8148e3f..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" -HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=57d09285feac8a64efa878e692b14f36" -SECTION = "net" - -DEPENDS = "file" - -SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "c7e230e9b899282b43d9a9faa41e893d" -SRC_URI[sha256sum] = "e8f445e85faf727b89e9f9590daea4473ae00ead38b237cf1eda55172b89b182" - -inherit autotools lib_package pkgconfig gettext - -CFLAGS += "-pthread -D_REENTRANT" - -EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" - -PACKAGECONFIG ?= "curl https" -PACKAGECONFIG_append_class-target = "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ -" -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," -PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls," - -do_compile_append() { - sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc -} diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb new file mode 100644 index 0000000000..24677386f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" +HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=57d09285feac8a64efa878e692b14f36" +SECTION = "net" + +DEPENDS = "file" + +SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "2a286193af88ab2ae3149748d4b46187" +SRC_URI[sha256sum] = "0ae825f8e0d7f41201fd44a0df1cf454c1cb0bc50fe9d59c26552260264c2ff8" + +inherit autotools lib_package pkgconfig gettext + +CFLAGS += "-pthread -D_REENTRANT" + +EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" + +PACKAGECONFIG ?= "curl https" +PACKAGECONFIG_append_class-target = "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ +" +PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," +PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls," + +do_compile_append() { + sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc +} diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch b/meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch new file mode 100644 index 0000000000..5ff9bf8462 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch @@ -0,0 +1,46 @@ +From f9e3e2ee7b18ba5bb8efe083171f3e701eb0a663 Mon Sep 17 00:00:00 2001 +From: Your Name +Date: Mon, 28 Dec 2020 02:08:03 +0000 +Subject: [PATCH] Don't let host enviroment to decide if a test is build + +test ssh2.sh need sshd, for cross compile, we need it on target, so +don't use SSHD on host to decide weither to build a test + +Upstream-Status: Inappropriate[oe specific] + +Signed-off-by: Changqing Li +--- + tests/Makefile.am | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index dc0922f..6cbc35d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,16 +1,12 @@ + AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src + LDADD = ../src/libssh2.la + +-if SSHD + noinst_PROGRAMS = ssh2 + ssh2_SOURCES = ssh2.c +-endif + + ctests = simple$(EXEEXT) + TESTS = $(ctests) mansyntax.sh +-if SSHD + TESTS += ssh2.sh +-endif + check_PROGRAMS = $(ctests) + + TESTS_ENVIRONMENT = SSHD=$(SSHD) EXEEXT=$(EXEEXT) +@@ -38,4 +34,4 @@ if OPENSSL + # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c + # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c + EXTRA_DIST += test_public_key_auth_succeeds_with_correct_rsa_openssh_key.c +-endif +\ No newline at end of file ++endif +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest index c213b32e5f..5fd7ec65f6 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest @@ -2,7 +2,7 @@ ptestdir=$(dirname "$(readlink -f "$0")") cd tests -for test in $(ls) +for test in simple ssh2.sh mansyntax.sh do ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test done diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index 38f1626935..4a5a05060c 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -11,6 +11,9 @@ SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ file://CVE-2019-17498.patch \ file://run-ptest \ " + +SRC_URI_append_ptest = " file://0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch" + SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" @@ -29,7 +32,7 @@ PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGI BBCLASSEXTEND = "native nativesdk" # required for ptest on documentation -RDEPENDS_${PN}-ptest = "man-db" +RDEPENDS_${PN}-ptest = "man-db openssh" RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-en-us" do_compile_ptest() { @@ -39,9 +42,11 @@ do_compile_ptest() { do_install_ptest() { install -d ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/tests/.libs/simple ${D}${PTEST_PATH}/tests/ - install -m 0755 ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ + cp -rf ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/ssh2.sh ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/etc ${D}${PTEST_PATH}/tests/ mkdir -p ${D}${PTEST_PATH}/docs cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/ } diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch new file mode 100644 index 0000000000..d261b13d91 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch @@ -0,0 +1,39 @@ +From 8579d8a35886f91974e0ac4dbdf2edb7dac06d52 Mon Sep 17 00:00:00 2001 +From: Joe Slater +Date: Fri, 18 Dec 2020 11:17:50 +0800 +Subject: [PATCH] libmultipath/uevent.c: fix error handling for + udev_monitor_set_receive_buffer_size + +Since systemd v246.5[1], udev_monitor_set_receive_buffer_size() will +return 0 or 1 if successful. We only need to check a negative value for +the failure. + +[1] https://github.com/systemd/systemd-stable/commit/4dcae666889ae9469e4406c0bcaffadbc01c4f66 + https://github.com/systemd/systemd-stable/commit/fe9b92e566f837665cc06c82374e4e42f9295c99 + https://github.com/systemd/systemd-stable/commit/5dd4cc4b10daea5d2ba969425ba02d2098dd06a4 + +Upstream-Status: Pending + +Signed-off-by: Joe Slater +Signed-off-by: Yi Zhao +--- + libmultipath/uevent.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libmultipath/uevent.c b/libmultipath/uevent.c +index d38e8a7f..4b298052 100644 +--- a/libmultipath/uevent.c ++++ b/libmultipath/uevent.c +@@ -810,7 +810,8 @@ int uevent_listen(struct udev *udev) + } + pthread_cleanup_push(monitor_cleanup, monitor); + #ifdef LIBUDEV_API_RECVBUF +- if (udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024)) ++ err = udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024); ++ if (err < 0) + condlog(2, "failed to increase buffer size"); + #endif + fd = udev_monitor_get_fd(monitor); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index 331c0cd018..186f78b8f2 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -47,6 +47,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://0001-fix-bug-of-do_compile-and-do_install.patch \ file://0001-add-explicit-dependency-on-libraries.patch \ file://0001-fix-boolean-value-with-json-c-0.14.patch \ + file://0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb deleted file mode 100644 index 48e92de4cb..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ -Not ANOther editor) is an enhanced clone of the \ -Pico text editor." -HOMEPAGE = "http://www.nano-editor.org/" -SECTION = "console/utils" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -DEPENDS = "ncurses file" -RDEPENDS_${PN} = "ncurses-terminfo-base" - -PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" - -SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "c5c1cbcf622d9a96b6030d66409ed12b204e8bc01ef5e6554ebbe6fb1d734352" - -UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" - -inherit autotools gettext pkgconfig - -PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.4.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.4.bb new file mode 100644 index 0000000000..68c326b528 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.4.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ +Not ANOther editor) is an enhanced clone of the \ +Pico text editor." +HOMEPAGE = "http://www.nano-editor.org/" +SECTION = "console/utils" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +DEPENDS = "ncurses file" +RDEPENDS_${PN} = "ncurses-terminfo-base" + +PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" + +SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" +SRC_URI[sha256sum] = "fe993408b22286355809ce48ebecc4444d19af8203ed4959d269969112ed86e9" + +UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" + +inherit autotools gettext pkgconfig + +PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.59.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.59.bb deleted file mode 100644 index eb9162beac..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.59.bb +++ /dev/null @@ -1,271 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-nsinstall-build.patch \ - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - " -SRC_URI[sha256sum] = "e6298174caa8527beacdc2858f77ed098d7047c1792846040e27e420fed0ce24" - -UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" -UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" - -inherit siteinfo - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a -# which caused -march conflicts in gcc -TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - export NSS_ENABLE_WERROR=0 - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" \ - autobuild -} - -do_compile[vardepsexclude] += "SITEINFO_BITS" - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - CPU_ARCH=aarch64 - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} - -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" - -pkg_postinst_${PN} () { - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - echo "shlibsign -i $FN failed" - fi - done -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" - -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " - -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -RDEPENDS_${PN}-smime = "perl" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb new file mode 100644 index 0000000000..112f676297 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb @@ -0,0 +1,271 @@ +SUMMARY = "Mozilla's SSL and TLS implementation" +DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ +designed to support cross-platform development of \ +security-enabled client and server applications. \ +Applications built with NSS can support SSL v2 and v3, \ +TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ +v3 certificates, and other security standards." +HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" +SECTION = "libs" + +DEPENDS = "sqlite3 nspr zlib nss-native" +DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" + +LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" + +LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ + file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ + file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" + +VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" + +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ + file://nss.pc.in \ + file://0001-nss-fix-support-cross-compiling.patch \ + file://nss-no-rpath-for-cross-compiling.patch \ + file://nss-fix-incorrect-shebang-of-perl.patch \ + file://disable-Wvarargs-with-clang.patch \ + file://pqg.c-ULL_addend.patch \ + file://blank-cert9.db \ + file://blank-key4.db \ + file://system-pkcs11.txt \ + file://nss-fix-nsinstall-build.patch \ + file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ + " +SRC_URI[sha256sum] = "84abd5575ab874c53ae511bd461e5d0868d1a1b384ee40753154cdd1d590fe3d" + +UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" +UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" + +inherit siteinfo + +TD = "${S}/tentative-dist" +TDS = "${S}/tentative-dist-staging" + +# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a +# which caused -march conflicts in gcc +TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure_prepend_libc-musl () { + sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk +} + +do_compile_prepend_class-native() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr + export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} +} + +do_compile_prepend_class-nativesdk() { + export LDFLAGS="" +} + +do_compile_prepend_class-native() { + # Need to set RPATH so that chrpath will do its job correctly + RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" +} + +do_compile() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr + export NSS_ENABLE_WERROR=0 + + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + # Additional defines needed on Centos 7 + export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + export FREEBL_LOWHASH=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + # We can modify CC in the environment, but if we set it via an + # argument to make, nsinstall, a host program, will also build with it! + # + # nss pretty much does its own thing with CFLAGS, so we put them into CC. + # Optimization will get clobbered, but most of the stuff will survive. + # The motivation for this is to point to the correct place for debug + # source files and CFLAGS does that. Nothing uses CCC. + # + export CC="${CC} ${CFLAGS}" + make -C ./nss CCC="${CXX} -g" \ + OS_TEST=${OS_TEST} \ + RPATH="${RPATH}" \ + autobuild +} + +do_compile[vardepsexclude] += "SITEINFO_BITS" + +do_install_prepend_class-nativesdk() { + export LDFLAGS="" +} + +do_install() { + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + CPU_ARCH=aarch64 + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + make -C ./nss \ + CCC="${CXX}" \ + OS_TEST=${OS_TEST} \ + SOURCE_LIB_DIR="${TD}/${libdir}" \ + SOURCE_BIN_DIR="${TD}/${bindir}" \ + install + + install -d ${D}/${libdir}/ + for file in ${S}/dist/*.OBJ/lib/*.so; do + echo "Installing `basename $file`..." + cp $file ${D}/${libdir}/ + done + + for shared_lib in ${TD}/${libdir}/*.so.*; do + if [ -f $shared_lib ]; then + cp $shared_lib ${D}/${libdir} + ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) + fi + done + for shared_lib in ${TD}/${libdir}/*.so; do + if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then + cp $shared_lib ${D}/${libdir} + fi + done + + install -d ${D}/${includedir}/nss3 + install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* + + install -d ${D}/${bindir} + for binary in ${TD}/${bindir}/*; do + install -m 755 -t ${D}/${bindir} $binary + done +} + +do_install[vardepsexclude] += "SITEINFO_BITS" + +do_install_append() { + # Create empty .chk files for the NSS libraries at build time. They could + # be regenerated at target's boot time. + for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do + touch ${D}/${libdir}/$file + chmod 755 ${D}/${libdir}/$file + done + + install -d ${D}${libdir}/pkgconfig/ + sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc +} + +do_install_append_class-target() { + # It used to call certutil to create a blank certificate with empty password at + # build time, but the checksum of key4.db changes every time when certutil is called. + # It causes non-determinism issue, so provide databases with a blank certificate + # which are originally from output of nss in qemux86-64 build. You can get these + # databases by: + # certutil -N -d sql:/database/path/ --empty-password + install -d ${D}${sysconfdir}/pki/nssdb/ + install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db + install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db + install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt +} + +PACKAGE_WRITE_DEPS += "nss-native" + +pkg_postinst_${PN} () { + for I in $D${libdir}/lib*.chk; do + DN=`dirname $I` + BN=`basename $I .chk` + FN=$DN/$BN.so + shlibsign -i $FN + if [ $? -ne 0 ]; then + echo "shlibsign -i $FN failed" + fi + done +} + +PACKAGES =+ "${PN}-smime" +FILES_${PN}-smime = "\ + ${bindir}/smime \ +" + +FILES_${PN} = "\ + ${sysconfdir} \ + ${bindir} \ + ${libdir}/lib*.chk \ + ${libdir}/lib*.so \ + " + +FILES_${PN}-dev = "\ + ${libdir}/nss \ + ${libdir}/pkgconfig/* \ + ${includedir}/* \ + " + +RDEPENDS_${PN}-smime = "perl" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb index 1514c7a958..3dae8b33ca 100644 --- a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -35,7 +35,7 @@ EXTRA_OECONF=" \ --enable-pcsc \ --enable-doc \ --enable-api-doc \ - --with-udev=${nonarch_base_libdir}/udev \ + --with-udev=${nonarch_libdir}/udev \ --with-bundle=${libdir}/pcsc/drivers \ " @@ -43,10 +43,9 @@ inherit autotools pkgconfig FILES_${PN} += " \ ${libdir}/ctapi \ - ${nonarch_base_libdir}/udev \ + ${nonarch_libdir}/udev \ ${libdir}/openct-ifd.so \ ${libdir}/pcsc \ - /run/openct/status \ " FILES_${PN}-dbg += " \ @@ -56,10 +55,10 @@ FILES_${PN}-dbg += " \ INSANE_SKIP_${PN} += "dev-deps" +do_install[cleandirs] += "${D}" + do_install () { - rm -rf ${D} - install -d ${D}/etc - install -dm 755 ${D}${nonarch_base_libdir}/udev + install -d ${D}${sysconfdir} # fix up hardcoded paths sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ ${WORKDIR}/openct.service ${WORKDIR}/openct.init @@ -67,22 +66,18 @@ do_install () { oe_runmake install DESTDIR=${D} install -dm 755 ${D}${libdir}/ctapi/ mv ${D}${libdir}/libopenctapi.so ${D}${libdir}/ctapi/ - install -Dpm 644 etc/openct.udev ${D}/etc/udev/rules.d/60-openct.rules - install -pm 644 etc/openct.conf ${D}/etc/openct.conf + install -Dpm 644 etc/openct.udev ${D}${nonarch_libdir}/udev/rules.d/60-openct.rules + install -pm 644 etc/openct.conf ${D}${sysconfdir}/openct.conf - install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct - install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct + install -Dpm 755 ${WORKDIR}/openct.init ${D}${sysconfdir}/init.d/openct + install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/openct.service ${D}${systemd_unitdir}/system so=$(find ${D} -name \*.so | sed "s|^${D}||") sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf - install -Dpm 644 etc/reader.conf ${D}/etc/reader.conf.d/openct.conf - - install -dm 755 ${D}${localstatedir}/run/openct - touch ${D}${localstatedir}/run/openct/status - chmod 644 ${D}${localstatedir}/run/openct/status - - rm -r ${D}/${localstatedir}/run + install -Dpm 644 etc/reader.conf ${D}${sysconfdir}/reader.conf.d/openct.conf } + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch new file mode 100644 index 0000000000..1dc7ca3f17 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch @@ -0,0 +1,36 @@ +From fedef3c0b1772cee97d7288bee7d5d50805a5964 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 12 Dec 2020 08:56:04 -0800 +Subject: [PATCH] configure: Do not add native paths to pkgconfig search + +This does not work in cross environments, secondly in OE we already +point pkkconfig into recipe sysroot where it will find all the +dependencies therefore this setting is not needed + +Upstream-Status: Inappropriate [ OE-Specific ] + +Signed-off-by: Khem Raj +--- + configure.ac | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0df85b0..2481153 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -70,12 +70,6 @@ AC_CHECK_HEADERS([]) + dnl checks for library functions + AC_CHECK_FUNCS([]) + +-dnl tell pkgconfig to look in the same prefix where we're installing this to, +-dnl as that is likely where libpurple will be found if it is not in the default +-dnl pkgconfig path +-PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${libdir}/pkgconfig" +-export PKG_CONFIG_PATH +- + dnl debug mode + AC_ARG_ENABLE(debug, + [AS_HELP_STRING([--enable-debug], +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index 99fcf3c6d0..f6b4c7cee1 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -10,6 +10,7 @@ inherit autotools gettext pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ file://0001-sipe-consider-64bit-time_t-when-printing.patch \ file://0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch \ + file://0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch \ " SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch index 05e0abede6..afb0b5df08 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch @@ -15,12 +15,12 @@ Signed-off-by: Andreas Müller --- a/cmake/modules/PopplerMacros.cmake +++ b/cmake/modules/PopplerMacros.cmake -@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) +@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - + set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") -+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") ++ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") @@ -32,16 +32,16 @@ Signed-off-by: Andreas Müller set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") -@@ -167,7 +167,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL +@@ -149,7 +149,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - + set(_save_cxxflags "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 -@@ -175,7 +175,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL +@@ -157,7 +157,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") set(_save_cflags "${CMAKE_C_FLAGS}") @@ -50,3 +50,6 @@ Signed-off-by: Andreas Müller set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.11.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.11.0.bb deleted file mode 100644 index 729923d40e..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.11.0.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-Do-not-overwrite-all-our-build-flags.patch \ - file://basename-include.patch \ - " -SRC_URI[sha256sum] = "021557074516492375c2bb4226a413aad431159e9177f9f14dff4159d2723b14" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" -PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" -PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" -PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" -PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON,-DENABLE_SPLASH=OFF,boost" - -# surprise - did not expect this to work :) -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECMAKE += " \ - -DENABLE_CMS=lcms2 \ - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ - -DBUILD_GTK_TESTS=OFF \ - -DENABLE_ZLIB=ON \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ -" - -do_configure_append() { - # poppler macro uses pkg-config to check for g-ir runtimes. Something - # makes them point to /usr/bin. Align them to sysroot - that's where the - # gir-wrappers are: - sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja -} - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb new file mode 100644 index 0000000000..87a57523ff --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb @@ -0,0 +1,51 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://basename-include.patch \ + " +SRC_URI[sha256sum] = "d0aa2586c0a4296c775f0d2045f28bb95a694113fc995f95350faa12930f7b35" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" +PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON,-DENABLE_SPLASH=OFF,boost" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_CMS=lcms2 \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DENABLE_ZLIB=ON \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ +" + +do_configure_append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # gir-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES_libpoppler = "${libdir}/libpoppler.so.*" +FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb deleted file mode 100644 index 34937c83c8..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Very fast, header only, C++ logging library." -HOMEPAGE = "https://github.com/gabime/spdlog/wiki" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRCREV = "cbe9448650176797739dbab13961ef4c07f4290f" -SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x; \ - file://0001-Enable-use-of-external-fmt-library.patch" - -DEPENDS += "fmt" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" -# no need to build example&text&benchmarks on pure yocto -EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" - -inherit cmake - -# Header-only library -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb new file mode 100644 index 0000000000..67ec802cdd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Very fast, header only, C++ logging library." +HOMEPAGE = "https://github.com/gabime/spdlog/wiki" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRCREV = "de0dbfa3596a18cd70a4619b6a9766847a941276" +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x; \ + file://0001-Enable-use-of-external-fmt-library.patch" + +DEPENDS += "fmt" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" +# no need to build example&text&benchmarks on pure yocto +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" + +inherit cmake + +# Header-only library +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb index 06fb82b859..56c2d44471 100644 --- a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb @@ -4,9 +4,9 @@ AUTHOR = "Christophe BLAESS" LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" -BPV = "0.8.5" +BPV = "0.8.6" PV = "${BPV}" -SRCREV = "3c93b9038a7c4d9de4302ab6f14372e9fa381f3c" +SRCREV = "9ce73aab05873b2d3996bd21076305463133f102" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 2b38f4d693..818cad5bcd 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -13,7 +13,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=24c0c5cb2c83d9f2ab725481e4df5240" # util-linux added to get libuuid -DEPENDS = "libpcre flex glib-2.0 openssl util-linux" +DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native" # We expect the recipe to add anything specific for that version to these defaults. # diff --git a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb deleted file mode 100644 index fb60446cb2..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "USB hub per-port power control" -HOMEPAGE = "https://github.com/mvp/uhubctl" -BUGTRACKER = "https://github.com/mvp/uhubctl/issues" -DEPENDS = "libusb1" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRCREV = "5ee8260c71647f687b5e71af11f45244814835d7" -SRC_URI = "git://github.com/mvp/${BPN}" -S = "${WORKDIR}/git" - -# uhubctl gets its program version from "git describe". As we use the source -# archive do reduce download size replace the call with our hardcoded version. -do_configure_append() { - sed -i "s/^\(GIT_VERSION :=\).*$/\1 ${PV}/g" ${S}/Makefile -} - -do_install () { - oe_runmake install DESTDIR=${D} -} diff --git a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb new file mode 100644 index 0000000000..7970ca3c49 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "USB hub per-port power control" +HOMEPAGE = "https://github.com/mvp/uhubctl" +BUGTRACKER = "https://github.com/mvp/uhubctl/issues" +DEPENDS = "libusb1" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV = "1b52efddbd68b4395df3ac9cd10eeb984af22439" +SRC_URI = "git://github.com/mvp/${BPN}" +S = "${WORKDIR}/git" + +# uhubctl gets its program version from "git describe". As we use the source +# archive do reduce download size replace the call with our hardcoded version. +do_configure_append() { + sed -i "s/^\(GIT_VERSION :=\).*$/\1 ${PV}/g" ${S}/Makefile +} + +do_install () { + oe_runmake install DESTDIR=${D} +} diff --git a/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.1.0.bb deleted file mode 100644 index 09cef44a85..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.1.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Hash table and linked list for C structures" -DESCRIPTION = " uthash-dev provides a hash table implementation using C preprocessor macros.\n\ - This package also includes:\n\ - * utlist.h provides linked list macros for C structures\n\ - * utarray.h implements dynamic arrays using macros\n\ - * utstring.h implements a basic dynamic string\n\ -" -HOMEPAGE = "https://troydhanson.github.io/uthash/" -SECTION = "base" -LICENSE = "BSD-1-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a2513f7d2291df840527b76b2a8f9718" -SRCREV = "8b214aefcb81df86a7e5e0d4fa20e59a6c18bc02" - -SRC_URI = "\ - git://github.com/troydhanson/${BPN}.git \ - file://run-ptest \ -" - -S = "${WORKDIR}/git" - -inherit ptest - -do_compile[noexec] = "1" - -do_compile_ptest() { - oe_runmake -C tests tests_only TEST_TARGET= -} - -do_install () { - install -dm755 ${D}${includedir} - install -m0644 src/*.h ${D}${includedir} -} - -do_install_ptest() { - install -dm755 ${D}${PTEST_PATH}/tests - install -m0755 tests/test*[0-9] ${D}${PTEST_PATH}/tests - install -m0644 tests/test*[0-9].ans ${D}${PTEST_PATH}/tests - install -m0644 tests/test*[0-9].dat ${D}${PTEST_PATH}/tests -} - -# The main package is empty and non-existent, so -dev -# should not depend on it... -RDEPENDS_${PN}-dev = "" -RDEPENDS_${PN}-ptest_remove = "${PN}" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.2.0.bb new file mode 100644 index 0000000000..4ec7bc2f5e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.2.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "Hash table and linked list for C structures" +DESCRIPTION = " uthash-dev provides a hash table implementation using C preprocessor macros.\n\ + This package also includes:\n\ + * utlist.h provides linked list macros for C structures\n\ + * utarray.h implements dynamic arrays using macros\n\ + * utstring.h implements a basic dynamic string\n\ +" +HOMEPAGE = "https://troydhanson.github.io/uthash/" +SECTION = "base" +LICENSE = "BSD-1-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6891c324eb59289db33bac74d4cbb0d4" +SRCREV = "66e2668795d0aaf4977523f828e548470a680c33" + +SRC_URI = "\ + git://github.com/troydhanson/${BPN}.git \ + file://run-ptest \ +" + +S = "${WORKDIR}/git" + +inherit ptest + +do_compile[noexec] = "1" + +do_compile_ptest() { + oe_runmake -C tests tests_only TEST_TARGET= +} + +do_install () { + install -dm755 ${D}${includedir} + install -m0644 src/*.h ${D}${includedir} +} + +do_install_ptest() { + install -dm755 ${D}${PTEST_PATH}/tests + install -m0755 tests/test*[0-9] ${D}${PTEST_PATH}/tests + install -m0644 tests/test*[0-9].ans ${D}${PTEST_PATH}/tests + install -m0644 tests/test*[0-9].dat ${D}${PTEST_PATH}/tests +} + +# The main package is empty and non-existent, so -dev +# should not depend on it... +RDEPENDS_${PN}-dev = "" +RDEPENDS_${PN}-ptest_remove = "${PN}" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch new file mode 100644 index 0000000000..a444901f8c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch @@ -0,0 +1,321 @@ +From b6c765d693a0833b94cb2e91b32842570c3458d2 Mon Sep 17 00:00:00 2001 +From: vboxsync +Date: Tue, 15 Dec 2020 22:29:56 +0000 +Subject: [PATCH] Additions/linux/drm: Adjustment for Linux 5.10. + +Upstream-Status: Backport + +git-svn-id: http://www.virtualbox.org/svn/vbox@87092 cfe28804-0f27-0410-a406-dd0f0b0b656f + +Signed-off-by: Bruce Ashfield + +--- + src/VBox/Additions/linux/drm/vbox_drv.h | 10 +- + src/VBox/Additions/linux/drm/vbox_fb.c | 2 +- + .../src/VBox/Additions/linux/drm/vbox_mode.c | 2 +- + src/VBox/Additions/linux/drm/vbox_ttm.c | 99 +++++++++++++++++-- + 4 files changed, 99 insertions(+), 14 deletions(-) + +diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h b/src/VBox/Additions/linux/drm/vbox_drv.h +index 8c85371749..7937f2f2d2 100644 +--- a/src/VBox/Additions/linux/drm/vbox_drv.h ++++ b/src/VBox/Additions/linux/drm/vbox_drv.h +@@ -175,6 +175,9 @@ + #include + #include + #include ++#if RTLNX_VER_MIN(5,10,0) ++# include ++#endif + + #include "vboxvideo_guest.h" + #include "vboxvideo_vbe.h" +@@ -444,7 +447,10 @@ int vbox_bo_create(struct drm_device *dev, int size, int align, + int vbox_gem_create(struct drm_device *dev, + u32 size, bool iskernel, struct drm_gem_object **obj); + +-int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr); ++#define VBOX_MEM_TYPE_VRAM 0x1 ++#define VBOX_MEM_TYPE_SYSTEM 0x2 ++ ++int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr); + int vbox_bo_unpin(struct vbox_bo *bo); + + static inline int vbox_bo_reserve(struct vbox_bo *bo, bool no_wait) +@@ -469,7 +475,7 @@ static inline void vbox_bo_unreserve(struct vbox_bo *bo) + ttm_bo_unreserve(&bo->bo); + } + +-void vbox_ttm_placement(struct vbox_bo *bo, int domain); ++void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type); + int vbox_bo_push_sysram(struct vbox_bo *bo); + int vbox_mmap(struct file *filp, struct vm_area_struct *vma); + +diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c +index adead98d3d..7182d9da1a 100644 +--- a/src/VBox/Additions/linux/drm/vbox_fb.c ++++ b/src/VBox/Additions/linux/drm/vbox_fb.c +@@ -295,7 +295,7 @@ static int vboxfb_create(struct drm_fb_helper *helper, + if (ret) + return ret; + +- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL); ++ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, NULL); + if (ret) { + vbox_bo_unreserve(bo); + return ret; +diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c b/src/VBox/Additions/linux/drm/vbox_mode.c +index ce7d135cb6..5557db5ef8 100644 +--- a/src/VBox/Additions/linux/drm/vbox_mode.c ++++ b/src/VBox/Additions/linux/drm/vbox_mode.c +@@ -227,7 +227,7 @@ static int vbox_crtc_set_base(struct drm_crtc *crtc, + if (ret) + return ret; + +- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, &gpu_addr); ++ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, &gpu_addr); + vbox_bo_unreserve(bo); + if (ret) + return ret; +diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c b/src/VBox/Additions/linux/drm/vbox_ttm.c +index bf87aabc05..5eac926a42 100644 +--- a/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ b/src/VBox/Additions/linux/drm/vbox_ttm.c +@@ -41,6 +41,7 @@ + #define PLACEMENT_FLAGS(placement) ((placement).flags) + #endif + ++ + static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd) + { + return container_of(bd, struct vbox_private, ttm.bdev); +@@ -125,6 +126,7 @@ static bool vbox_ttm_bo_is_vbox_bo(struct ttm_buffer_object *bo) + return false; + } + ++#if RTLNX_VER_MAX(5,10,0) + static int + vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type, + struct ttm_mem_type_manager *man) +@@ -148,6 +150,7 @@ vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type, + + return 0; + } ++#endif + + static void + vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl) +@@ -157,7 +160,7 @@ vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl) + if (!vbox_ttm_bo_is_vbox_bo(bo)) + return; + +- vbox_ttm_placement(vboxbo, TTM_PL_FLAG_SYSTEM); ++ vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_SYSTEM); + *pl = vboxbo->placement; + } + +@@ -167,11 +170,12 @@ static int vbox_bo_verify_access(struct ttm_buffer_object *bo, + return 0; + } + ++#if RTLNX_VER_MAX(5,10,0) + static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, + struct ttm_mem_reg *mem) + { +- struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; + struct vbox_private *vbox = vbox_bdev(bdev); ++ struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; + + mem->bus.addr = NULL; + mem->bus.offset = 0; +@@ -194,12 +198,53 @@ static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, + } + return 0; + } ++#else ++static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, ++ struct ttm_resource *mem) ++{ ++ struct vbox_private *vbox = vbox_bdev(bdev); ++ mem->bus.addr = NULL; ++ mem->bus.offset = 0; ++ mem->size = mem->num_pages << PAGE_SHIFT; ++ mem->start = 0; ++ mem->bus.is_iomem = false; ++ switch (mem->mem_type) { ++ case TTM_PL_SYSTEM: ++ /* system memory */ ++ return 0; ++ case TTM_PL_VRAM: ++ mem->bus.offset = mem->start << PAGE_SHIFT; ++ mem->start = pci_resource_start(vbox->dev->pdev, 0); ++ mem->bus.is_iomem = true; ++ break; ++ default: ++ return -EINVAL; ++ } ++ return 0; ++} ++#endif + ++ ++ ++#if RTLNX_VER_MIN(5,10,0) ++static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, ++ struct ttm_resource *mem) ++{ ++} ++#else + static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, + struct ttm_mem_reg *mem) + { + } ++#endif + ++#if RTLNX_VER_MIN(5,10,0) ++static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt) ++{ ++ ttm_tt_fini(tt); ++ kfree(tt); ++} ++#else + static void vbox_ttm_backend_destroy(struct ttm_tt *tt) + { + ttm_tt_fini(tt); +@@ -209,6 +254,7 @@ static void vbox_ttm_backend_destroy(struct ttm_tt *tt) + static struct ttm_backend_func vbox_tt_backend_func = { + .destroy = &vbox_ttm_backend_destroy, + }; ++#endif + + #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) + static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev, +@@ -226,7 +272,9 @@ static struct ttm_tt *vbox_ttm_tt_create(struct ttm_buffer_object *bo, + if (!tt) + return NULL; + ++#if RTLNX_VER_MAX(5,10,0) + tt->func = &vbox_tt_backend_func; ++#endif + #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) + if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) { + #else +@@ -261,11 +309,16 @@ static void vbox_ttm_tt_unpopulate(struct ttm_tt *ttm) + + static struct ttm_bo_driver vbox_bo_driver = { + .ttm_tt_create = vbox_ttm_tt_create, ++#if RTLNX_VER_MIN(5,10,0) ++ .ttm_tt_destroy = vbox_ttm_tt_destroy, ++#endif + #if RTLNX_VER_MAX(4,17,0) + .ttm_tt_populate = vbox_ttm_tt_populate, + .ttm_tt_unpopulate = vbox_ttm_tt_unpopulate, + #endif ++#if RTLNX_VER_MAX(5,10,0) + .init_mem_type = vbox_bo_init_mem_type, ++#endif + #if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4) + .eviction_valuable = ttm_bo_eviction_valuable, + #endif +@@ -318,8 +371,13 @@ int vbox_mm_init(struct vbox_private *vbox) + #endif + } + ++#if RTLNX_VER_MIN(5,10,0) ++ ret = ttm_range_man_init(bdev, TTM_PL_VRAM, false, ++ vbox->available_vram_size >> PAGE_SHIFT); ++#else + ret = ttm_bo_init_mm(bdev, TTM_PL_VRAM, + vbox->available_vram_size >> PAGE_SHIFT); ++#endif + if (ret) { + DRM_ERROR("Failed ttm VRAM init: %d\n", ret); + goto err_device_release; +@@ -359,7 +417,7 @@ void vbox_mm_fini(struct vbox_private *vbox) + #endif + } + +-void vbox_ttm_placement(struct vbox_bo *bo, int domain) ++void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type) + { + u32 c = 0; + #if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2) +@@ -372,15 +430,36 @@ void vbox_ttm_placement(struct vbox_bo *bo, int domain) + bo->placement.placement = bo->placements; + bo->placement.busy_placement = bo->placements; + +- if (domain & TTM_PL_FLAG_VRAM) ++ if (mem_type & VBOX_MEM_TYPE_VRAM) { ++#if RTLNX_VER_MIN(5,10,0) ++ bo->placements[c].mem_type = TTM_PL_VRAM; ++ PLACEMENT_FLAGS(bo->placements[c++]) = ++ TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED; ++#else + PLACEMENT_FLAGS(bo->placements[c++]) = + TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM; +- if (domain & TTM_PL_FLAG_SYSTEM) ++#endif ++ } ++ if (mem_type & VBOX_MEM_TYPE_SYSTEM) { ++#if RTLNX_VER_MIN(5,10,0) ++ bo->placements[c].mem_type = TTM_PL_SYSTEM; ++ PLACEMENT_FLAGS(bo->placements[c++]) = ++ TTM_PL_MASK_CACHING; ++#else + PLACEMENT_FLAGS(bo->placements[c++]) = + TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM; +- if (!c) ++#endif ++ } ++ if (!c) { ++#if RTLNX_VER_MIN(5,10,0) ++ bo->placements[c].mem_type = TTM_PL_SYSTEM; ++ PLACEMENT_FLAGS(bo->placements[c++]) = ++ TTM_PL_MASK_CACHING; ++#else + PLACEMENT_FLAGS(bo->placements[c++]) = + TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM; ++#endif ++ } + + bo->placement.num_placement = c; + bo->placement.num_busy_placement = c; +@@ -414,7 +493,7 @@ int vbox_bo_create(struct drm_device *dev, int size, int align, + vboxbo->bo.bdev->dev_mapping = dev->dev_mapping; + #endif + +- vbox_ttm_placement(vboxbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM); ++ vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM); + + acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size, + sizeof(struct vbox_bo)); +@@ -452,7 +531,7 @@ static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo) + #endif + } + +-int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr) ++int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr) + { + #if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) + struct ttm_operation_ctx ctx = { false, false }; +@@ -467,7 +546,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr) + return 0; + } + +- vbox_ttm_placement(bo, pl_flag); ++ vbox_ttm_placement(bo, mem_type); + + for (i = 0; i < bo->placement.num_placement; i++) + PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT; +@@ -540,7 +619,7 @@ int vbox_bo_push_sysram(struct vbox_bo *bo) + if (bo->kmap.virtual) + ttm_bo_kunmap(&bo->kmap); + +- vbox_ttm_placement(bo, TTM_PL_FLAG_SYSTEM); ++ vbox_ttm_placement(bo, VBOX_MEM_TYPE_SYSTEM); + + for (i = 0; i < bo->placement.num_placement; i++) + PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT; +-- +2.19.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch new file mode 100644 index 0000000000..db27cb883b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch @@ -0,0 +1,119 @@ +From 2a6e3cf63f58e289802a11faad5fb495e2d04e97 Mon Sep 17 00:00:00 2001 +From: vboxsync +Date: Wed, 9 Dec 2020 18:59:04 +0000 +Subject: [PATCH] Runtime/memobj-r0drv-linux.c: Changes to support the upcoming + 5.10 kernel, bugref:9879 + +Upstream-Status: Backport + +git-svn-id: http://www.virtualbox.org/svn/vbox@87074 cfe28804-0f27-0410-a406-dd0f0b0b656f + +Signed-off-by: Bruce Ashfield +--- + .../Runtime/r0drv/linux/memobj-r0drv-linux.c | 68 ++++++++++++++++++- + 1 file changed, 67 insertions(+), 1 deletion(-) + +--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c ++++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +@@ -56,9 +56,19 @@ + * Whether we use alloc_vm_area (3.2+) for executable memory. + * This is a must for 5.8+, but we enable it all the way back to 3.2.x for + * better W^R compliance (fExecutable flag). */ +-#if RTLNX_VER_MIN(3,2,0) || defined(DOXYGEN_RUNNING) ++#if RTLNX_VER_RANGE(3,2,0, 5,10,0) || defined(DOXYGEN_RUNNING) + # define IPRT_USE_ALLOC_VM_AREA_FOR_EXEC + #endif ++/** @def IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC ++ * alloc_vm_area was removed with 5.10 so we have to resort to a different way ++ * to allocate executable memory. ++ * It would be possible to remove IPRT_USE_ALLOC_VM_AREA_FOR_EXEC and use ++ * this path execlusively for 3.2+ but no time to test it really works on every ++ * supported kernel, so better play safe for now. ++ */ ++#if RTLNX_VER_MIN(5,10,0) || defined(DOXYGEN_RUNNING) ++# define IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC ++#endif + + /* + * 2.6.29+ kernels don't work with remap_pfn_range() anymore because +@@ -502,6 +512,46 @@ static void rtR0MemObjLinuxFreePages(PRT + } + + ++#ifdef IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC ++/** ++ * User data passed to the apply_to_page_range() callback. ++ */ ++typedef struct LNXAPPLYPGRANGE ++{ ++ /** Pointer to the memory object. */ ++ PRTR0MEMOBJLNX pMemLnx; ++ /** The page protection flags to apply. */ ++ pgprot_t fPg; ++} LNXAPPLYPGRANGE; ++/** Pointer to the user data. */ ++typedef LNXAPPLYPGRANGE *PLNXAPPLYPGRANGE; ++/** Pointer to the const user data. */ ++typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE; ++ ++/** ++ * Callback called in apply_to_page_range(). ++ * ++ * @returns Linux status code. ++ * @param pPte Pointer to the page table entry for the given address. ++ * @param uAddr The address to apply the new protection to. ++ * @param pvUser The opaque user data. ++ */ ++#ifdef __i386__ ++static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) ++#else ++static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) ++#endif ++{ ++ PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser; ++ PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx; ++ size_t idxPg = (uAddr - (unsigned long)pMemLnx->Core.pv) >> PAGE_SHIFT; ++ ++ set_pte(pPte, mk_pte(pMemLnx->apPages[idxPg], pArgs->fPg)); ++ return 0; ++} ++#endif ++ ++ + /** + * Maps the allocation into ring-0. + * +@@ -584,6 +634,11 @@ static int rtR0MemObjLinuxVMap(PRTR0MEMO + else + # endif + { ++# if defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC) ++ if (fExecutable) ++ pgprot_val(fPg) |= _PAGE_NX; /* Uses RTR0MemObjProtect to clear NX when memory ready, W^X fashion. */ ++# endif ++ + # ifdef VM_MAP + pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg); + # else +@@ -1851,6 +1906,21 @@ DECLHIDDEN(int) rtR0MemObjNativeProtect( + preempt_enable(); + return VINF_SUCCESS; + } ++# elif defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC) ++ PRTR0MEMOBJLNX pMemLnx = (PRTR0MEMOBJLNX)pMem; ++ if ( pMemLnx->fExecutable ++ && pMemLnx->fMappedToRing0) ++ { ++ LNXAPPLYPGRANGE Args; ++ Args.pMemLnx = pMemLnx; ++ Args.fPg = rtR0MemObjLinuxConvertProt(fProt, true /*fKernel*/); ++ int rcLnx = apply_to_page_range(current->active_mm, (unsigned long)pMemLnx->Core.pv + offSub, cbSub, ++ rtR0MemObjLinuxApplyPageRange, (void *)&Args); ++ if (rcLnx) ++ return VERR_NOT_SUPPORTED; ++ ++ return VINF_SUCCESS; ++ } + # endif + + NOREF(pMem); diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch new file mode 100644 index 0000000000..3cfe2e917c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch @@ -0,0 +1,46 @@ +From a276f8bc5e4515f7ea51e2c56e0e634a723ca104 Mon Sep 17 00:00:00 2001 +From: vboxsync +Date: Tue, 8 Dec 2020 13:52:53 +0000 +Subject: [PATCH] linser/vboxsf: Adjustment for linux 5.10 - TASK_SIZE_MAX + replaces USER_DS.seg. bugref:9879 + +Upstream-Status: Backport + +git-svn-id: http://www.virtualbox.org/svn/vbox@87053 cfe28804-0f27-0410-a406-dd0f0b0b656f + +Signed-off-by: Bruce Ashfield +--- + src/VBox/Additions/linux/sharedfolders/regops.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c +index e1fad3d820..401fd69930 100644 +--- a/src/VBox/Additions/linux/sharedfolders/regops.c ++++ b/src/VBox/Additions/linux/sharedfolders/regops.c +@@ -147,7 +147,11 @@ static int vbsf_iov_iter_detect_type(struct iovec const *paIov, size_t cSegs) + while (cSegs-- > 0) { + if (paIov->iov_len > 0) { + if (access_ok(VERIFY_READ, paIov->iov_base, paIov->iov_len)) ++#if RTLNX_VER_MIN(5,10,0) ++ return (uintptr_t)paIov->iov_base >= TASK_SIZE_MAX ? ITER_KVEC : 0; ++#else + return (uintptr_t)paIov->iov_base >= USER_DS.seg ? ITER_KVEC : 0; ++#endif + AssertMsgFailed(("%p LB %#zx\n", paIov->iov_base, paIov->iov_len)); + break; + } +@@ -1401,7 +1405,10 @@ static int vbsf_lock_user_pages_failed_check_kernel(uintptr_t uPtrFrom, size_t c + /* + * Check that this is valid user memory that is actually in the kernel range. + */ +-#if RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1) ++#if RTLNX_VER_MIN(5,10,0) ++ if ( access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT) ++ && uPtrFrom >= TASK_SIZE_MAX) ++#elif RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1) + if ( access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT) + && uPtrFrom >= USER_DS.seg) + #else +-- +2.19.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb index 9282f663b4..ff639c09f0 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb @@ -13,6 +13,9 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ + file://0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch \ + file://0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch \ + file://0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch \ " SRC_URI[md5sum] = "a12a647f6c114f2cb1571089b36841fe" SRC_URI[sha256sum] = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1" diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch new file mode 100644 index 0000000000..5b9315cfb4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch @@ -0,0 +1,28 @@ +From 9de23a9199d26e64ab6b5be2bb74f260200b2dc5 Mon Sep 17 00:00:00 2001 +From: matt335672 <30179339+matt335672@users.noreply.github.com> +Date: Fri, 21 Aug 2020 12:20:31 +0100 +Subject: [PATCH] Fixed compiler warnings about snprintf truncations + +Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/pull/1659] +--- + common/log.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/common/log.c b/common/log.c +index 4a0bd2f3..8686789d 100644 +--- a/common/log.c ++++ b/common/log.c +@@ -555,9 +555,7 @@ log_message(const enum logLevels lvl, const char *msg, ...) + now_t = time(&now_t); + now = localtime(&now_t); + +- snprintf(buff, 21, "[%.4d%.2d%.2d-%.2d:%.2d:%.2d] ", now->tm_year + 1900, +- now->tm_mon + 1, now->tm_mday, now->tm_hour, now->tm_min, +- now->tm_sec); ++ strftime(buff, 21, "[%Y%m%d-%H:%M:%S] ", now); + + internal_log_lvl2str(lvl, buff + 20); + +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch new file mode 100644 index 0000000000..b06077bf02 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch @@ -0,0 +1,30 @@ +From c8d3df40ece7d659ccc8212b18de916d28f4398a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 22 Dec 2020 23:10:52 -0800 +Subject: [PATCH] correct the location of errno.h + +Fixes build on musl + +Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/1761] + +Signed-off-by: Khem Raj +--- + sesman/chansrv/sound.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sesman/chansrv/sound.c b/sesman/chansrv/sound.c +index b0480d33..45e17307 100644 +--- a/sesman/chansrv/sound.c ++++ b/sesman/chansrv/sound.c +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch new file mode 100644 index 0000000000..4cd26df04c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch @@ -0,0 +1,28 @@ +From 229206aa5e55a6e26a074a54a1b50139ab794b36 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 22 Dec 2020 23:01:13 -0800 +Subject: [PATCH] riscv doesn't require pointers to be aligned + +Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/1761] +Signed-off-by: Khem Raj +--- + common/arch.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/common/arch.h b/common/arch.h +index ccccfa5a..8c2ac1a4 100644 +--- a/common/arch.h ++++ b/common/arch.h +@@ -84,7 +84,8 @@ typedef int bool_t; + #define NEED_ALIGN + #elif defined(__x86__) || defined(__x86_64__) || \ + defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ +- defined(__i386__) || defined(__aarch64__) ++ defined(__i386__) || defined(__aarch64__) || \ ++ defined(__riscv) + #define NO_NEED_ALIGN + #else + #warning unknown arch +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb deleted file mode 100644 index deda0fd1b5..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb +++ /dev/null @@ -1,97 +0,0 @@ -SUMMARY = "An open source remote desktop protocol(rdp) server." - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ -" - -inherit features_check autotools pkgconfig useradd systemd - -DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" - -REQUIRED_DISTRO_FEATURES = "x11 pam" - -SRC_URI = "git://github.com/neutrinolabs/xrdp.git \ - file://xrdp.sysconfig \ - file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ - file://0001-Fix-the-compile-error.patch \ - " - -SRCREV = "1e4b03eb3c9aa7173de251a328c93c073dcc0fca" - -PV = "0.9.11" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system xrdp" -USERADD_PARAM_${PN} = "--system --home /var/run/xrdp -g xrdp \ - --no-create-home --shell /bin/false xrdp" - -FILES_${PN} += "${datadir}/dbus-1/services/*.service \ - ${datadir}/dbus-1/accessibility-services/*.service " - -FILES_${PN}-dev += "${libdir}/xrdp/libcommon.so \ - ${libdir}/xrdp/libxrdp.so \ - ${libdir}/xrdp/libscp.so \ - ${libdir}/xrdp/libxrdpapi.so " - -EXTRA_OECONF = "--enable-pam-config=suse" - -do_configure_prepend() { - cd ${S} - ./bootstrap - cd - -} - -do_compile_prepend() { - sed -i 's/(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am/(MAKE) $(AM_MAKEFLAGS) install-exec-am/g' ${S}/keygen/Makefile.in -} - - -do_install_append() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/xrdp - install -d ${D}${sysconfdir}/xrdp/pam.d - install -d ${D}${sysconfdir}/sysconfig/xrdp - - # deal with systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/instfiles/xrdp.service.in ${D}${systemd_unitdir}/system/xrdp.service - install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service - sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service - sed -i -e 's,@sysconfdir@,${sysconfdir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service - sed -i -e 's,@sbindir@,${sbindir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service - - install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/sesman.ini.in ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/startwm.sh ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp.ini.in ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp_keyboard.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/instfiles/xrdp.sh ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ - install -m 0644 ${WORKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ - chown xrdp:xrdp ${D}${sysconfdir}/xrdp -} - -SYSTEMD_SERVICE_${PN} = "xrdp.service xrdp-sesman.service" - -pkg_postinst_${PN}() { - if test -z "$D" - then - if test -x ${bindir}/xrdp-keygen - then - ${bindir}/xrdp-keygen xrdp ${sysconfdir}/xrdp/rsakeys.ini >/dev/null - fi - if test ! -s ${sysconfdir}/xrdp/cert.pem - then - openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 3652 \ - -keyout ${sysconfdir}/xrdp/key.pem \ - -out ${sysconfdir}/xrdp/cert.pem \ - -config ${sysconfdir}/xrdp/openssl.conf >/dev/null 2>&1 - chmod 400 ${sysconfdir}/xrdp/key.pem - fi - fi -} diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.14.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.14.bb new file mode 100644 index 0000000000..078e23c6ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.14.bb @@ -0,0 +1,96 @@ +SUMMARY = "An open source remote desktop protocol(rdp) server." + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ +" + +inherit features_check autotools pkgconfig useradd systemd + +DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" + +REQUIRED_DISTRO_FEATURES = "x11 pam" + +SRC_URI = "git://github.com/neutrinolabs/xrdp.git;branch=devel \ + file://xrdp.sysconfig \ + file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ + file://0001-Fix-the-compile-error.patch \ + file://0001-riscv-doesn-t-require-pointers-to-be-aligned.patch \ + file://0001-correct-the-location-of-errno.h.patch \ + file://0001-Fixed-compiler-warnings-about-snprintf-truncations.patch \ + " +SRCREV = "1469d659dbccd6d042ac44f0afc4e1309788dc9d" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system xrdp" +USERADD_PARAM_${PN} = "--system --home /var/run/xrdp -g xrdp \ + --no-create-home --shell /bin/false xrdp" + +FILES_${PN} += "${datadir}/dbus-1/services/*.service \ + ${datadir}/dbus-1/accessibility-services/*.service " + +FILES_${PN}-dev += "${libdir}/xrdp/libcommon.so \ + ${libdir}/xrdp/libxrdp.so \ + ${libdir}/xrdp/libscp.so \ + ${libdir}/xrdp/libxrdpapi.so " + +EXTRA_OECONF = "--enable-pam-config=suse" + +do_configure_prepend() { + cd ${S} + ./bootstrap + cd - +} + +do_compile_prepend() { + sed -i 's/(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am/(MAKE) $(AM_MAKEFLAGS) install-exec-am/g' ${S}/keygen/Makefile.in +} + + +do_install_append() { + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/xrdp + install -d ${D}${sysconfdir}/xrdp/pam.d + install -d ${D}${sysconfdir}/sysconfig/xrdp + + # deal with systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${S}/instfiles/xrdp.service.in ${D}${systemd_unitdir}/system/xrdp.service + install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service + sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service + sed -i -e 's,@sysconfdir@,${sysconfdir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service + sed -i -e 's,@sbindir@,${sbindir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service + + install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/sesman/sesman.ini.in ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/sesman/startwm.sh ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/xrdp/xrdp.ini.in ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/xrdp/xrdp_keyboard.ini ${D}${sysconfdir}/xrdp/ + install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ + install -m 0644 ${WORKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ + chown xrdp:xrdp ${D}${sysconfdir}/xrdp +} + +SYSTEMD_SERVICE_${PN} = "xrdp.service xrdp-sesman.service" + +pkg_postinst_${PN}() { + if test -z "$D" + then + if test -x ${bindir}/xrdp-keygen + then + ${bindir}/xrdp-keygen xrdp ${sysconfdir}/xrdp/rsakeys.ini >/dev/null + fi + if test ! -s ${sysconfdir}/xrdp/cert.pem + then + openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 3652 \ + -keyout ${sysconfdir}/xrdp/key.pem \ + -out ${sysconfdir}/xrdp/cert.pem \ + -config ${sysconfdir}/xrdp/openssl.conf >/dev/null 2>&1 + chmod 400 ${sysconfdir}/xrdp/key.pem + fi + fi +} diff --git a/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb b/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb new file mode 100644 index 0000000000..170e0bf785 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb @@ -0,0 +1,41 @@ +SUMMARY = "X.Org X cvt" +HOMEPAGE = "https://linux.die.net/man/1/cvt" +LICENSE = "MIT-X" +LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" + +DEPENDS += "pixman-native xorgproto-native libxrandr-native" + +XORG_PN = "xorg-server" + +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "8cf8bd1f33e3736bc8dd279b20a32399" +SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" + +S = "${WORKDIR}/${XORG_PN}-${PV}" +B = "${WORKDIR}/build" + +inherit native pkgconfig + +do_configure[noexec] = "1" + +do_compile() { + cd ${S} + for header in `find -name '*.h'`; do + path=`dirname $header` + if ! echo "$incpaths" | grep -q "$path" ; then + incpaths="$incpaths -I$path" + fi + done + CFLAGS="${CFLAGS} -DXORG_VERSION_CURRENT=1 $incpaths `pkg-config --cflags pixman-1`" + LDFLAGS="${LDFLAGS} -lm `pkg-config --libs pixman-1`" + ${CC} $CFLAGS -o ${B}/cvt \ + ${S}/hw/xfree86/utils/cvt/cvt.c \ + ${S}/hw/xfree86/modes/xf86cvt.c \ + ${S}/os/xprintf.c \ + $LDFLAGS +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${B}/cvt ${D}${bindir} +} diff --git a/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.9.bb b/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.9.bb deleted file mode 100644 index b7dcc70898..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.9.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "X.Org X cvt" -HOMEPAGE = "https://linux.die.net/man/1/cvt" -LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" - -DEPENDS += "pixman-native xorgproto-native libxrandr-native" - -XORG_PN = "xorg-server" - -SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "afcae2f46d47c33863cab7fd9db7279a" -SRC_URI[sha256sum] = "e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571" - -S = "${WORKDIR}/${XORG_PN}-${PV}" -B = "${WORKDIR}/build" - -inherit native pkgconfig - -do_configure[noexec] = "1" - -do_compile() { - cd ${S} - for header in `find -name '*.h'`; do - path=`dirname $header` - if ! echo "$incpaths" | grep -q "$path" ; then - incpaths="$incpaths -I$path" - fi - done - CFLAGS="${CFLAGS} -DXORG_VERSION_CURRENT=1 $incpaths `pkg-config --cflags pixman-1`" - LDFLAGS="${LDFLAGS} -lm `pkg-config --libs pixman-1`" - ${CC} $CFLAGS -o ${B}/cvt \ - ${S}/hw/xfree86/utils/cvt/cvt.c \ - ${S}/hw/xfree86/modes/xf86cvt.c \ - ${S}/os/xprintf.c \ - $LDFLAGS -} - -do_install() { - install -d ${D}${bindir} - install -m 755 ${B}/cvt ${D}${bindir} -} diff --git a/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb b/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb new file mode 100644 index 0000000000..9d359d6244 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb @@ -0,0 +1,17 @@ +SUMMARY = "yaml-cpp parser and emitter library" +DESCRIPTION = "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec." +HOMEPAGE = "https://github.com/jbeder/yaml-cpp" +SECTION = "devel" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c" + +# yaml-cpp releases are stored as archive files in github. +# download the exact revision of release +SRC_URI = "git://github.com/jbeder/yaml-cpp.git" +SRCREV = "9a3624205e8774953ef18f57067b3426c1c5ada6" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DYAML_CPP_BUILD_TESTS=OFF -DYAML_BUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TOOLS=OFF" diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.7.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.7.bb deleted file mode 100644 index df75a6e81c..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.7.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "A file format designed for highly efficient deltas while maintaining good compression" -AUTHOR = "Jonathan Dieter" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" - -SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" - -SRCREV = "45720028e69f09d1bec3c6a2af802ae2b06feb6e" -S = "${WORKDIR}/git" - -DEPENDS = "\ - curl \ - zstd \ - " - -DEPENDS_append_libc-musl = " argp-standalone" -LDFLAGS_append_libc-musl = " -largp" - -inherit meson - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.8.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.8.bb new file mode 100644 index 0000000000..ee2d8801ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.8.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A file format designed for highly efficient deltas while maintaining good compression" +AUTHOR = "Jonathan Dieter" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" + +SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" + +SRCREV = "5715157da35898a7cb3293b7a5394ba23715b5a4" +S = "${WORKDIR}/git" + +DEPENDS = "\ + curl \ + zstd \ + " + +DEPENDS_append_libc-musl = " argp-standalone" +LDFLAGS_append_libc-musl = " -largp" + +inherit meson + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.07.bb b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.07.bb deleted file mode 100644 index 4b0c1d8739..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.07.bb +++ /dev/null @@ -1,106 +0,0 @@ -# NOTE: -# You should use perl-module-encode rather than this package -# unless you specifically need a version newer than what is -# provided by perl. - -SUMMARY = "Encode - character encodings" -DESCRIPTION = "The \"Encode\" module provides the interfaces between \ -Perl's strings and the rest of the system. Perl strings are sequences \ -of characters." - -AUTHOR = "Dan Kogai " -HOMEPAGE = "https://metacpan.org/release/Encode" -SECTION = "lib" -LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://META.json;beginline=8;endline=10;md5=b12e3be1e17a7e99ca4f429ff32c28b5" - -SRC_URI = "${CPAN_MIRROR}/authors/id/D/DA/DANKOGAI/Encode-${PV}.tar.gz" -SRC_URI[md5sum] = "a63fa96cbe236b2f7bb5a5e9fd740837" -SRC_URI[sha256sum] = "34a4ec9b574b7a6c6132c4ab3ded490fd600bc7ce382124aeda58bb1e112910f" - -UPSTREAM_CHECK_REGEX = "Encode\-(?P(\d+\.\d+))(?!_\d+).tar" - -S = "${WORKDIR}/Encode-${PV}" - -inherit cpan ptest-perl - -do_install_prepend() { - # Requires "-T" (taint) option on command line - rm -rf ${B}/t/taint.t - # Circular dependency of perl-module-open on perl-module-encode - # and we cannot load perl-module-encode because we are providing - # an alternative - rm -rf ${B}/t/use-Encode-Alias.t -} - -do_install_ptest() { - mkdir ${D}${PTEST_PATH}/bin - cp -r ${B}/bin/piconv ${D}${PTEST_PATH}/bin - cp -r ${B}/blib ${D}${PTEST_PATH} - chown -R root:root ${D}${PTEST_PATH} -} - -# file /usr/bin/enc2xs from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 -# file /usr/bin/encguess from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 -# file /usr/bin/piconv from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 -RCONFLICTS_${PN} = "perl-misc perl-module-encode" - -RDEPENDS_${PN} += " \ - perl-module-bytes \ - perl-module-constant \ - perl-module-parent \ - perl-module-storable \ - perl-module-xsloader \ - " - -RPROVIDES_${PN} += " \ - libencode-alias-perl \ - libencode-byte-perl \ - libencode-cjkconstants-perl \ - libencode-cn-perl \ - libencode-cn-hz-perl \ - libencode-config-perl \ - libencode-ebcdic-perl \ - libencode-encoder-perl \ - libencode-encoding-perl \ - libencode-gsm0338-perl \ - libencode-guess-perl \ - libencode-jp-perl \ - libencode-jp-h2z-perl \ - libencode-jp-jis7-perl \ - libencode-kr-perl \ - libencode-kr-2022_kr-perl \ - libencode-mime-header-perl \ - libencode-mime-name-perl \ - libencode-symbol-perl \ - libencode-tw-perl \ - libencode-unicode-perl \ - libencode-unicode-utf7-perl \ - libencoding-perl \ - libencode-internal-perl \ - libencode-mime-header-iso_2022_jp-perl \ - libencode-utf8-perl \ - libencode-utf_ebcdic-perl \ - " - -RDEPENDS_${PN}-ptest += " \ - perl-module-blib \ - perl-module-charnames \ - perl-module-file-compare \ - perl-module-file-copy \ - perl-module-filehandle \ - perl-module-findbin \ - perl-module-integer \ - perl-module-io-select \ - perl-module-ipc-open3 \ - perl-module-mime-base64 \ - perl-module-perlio \ - perl-module-perlio-encoding \ - perl-module-perlio-scalar \ - perl-module-test-more \ - perl-module-tie-scalar \ - perl-module-unicore \ - perl-module-utf8 \ - " - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.08.bb b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.08.bb new file mode 100644 index 0000000000..3f1d35be8a --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.08.bb @@ -0,0 +1,106 @@ +# NOTE: +# You should use perl-module-encode rather than this package +# unless you specifically need a version newer than what is +# provided by perl. + +SUMMARY = "Encode - character encodings" +DESCRIPTION = "The \"Encode\" module provides the interfaces between \ +Perl's strings and the rest of the system. Perl strings are sequences \ +of characters." + +AUTHOR = "Dan Kogai " +HOMEPAGE = "https://metacpan.org/release/Encode" +SECTION = "lib" +LICENSE = "Artistic-1.0 | GPL-1.0+" +LIC_FILES_CHKSUM = "file://META.json;beginline=8;endline=10;md5=b12e3be1e17a7e99ca4f429ff32c28b5" + +SRC_URI = "${CPAN_MIRROR}/authors/id/D/DA/DANKOGAI/Encode-${PV}.tar.gz" +SRC_URI[md5sum] = "3889cf6d1b75e486d54f9fd6517a02b4" +SRC_URI[sha256sum] = "ed063d01d01a140a3a3ec0aeba2f2b4849a35c18ca96ac231a5d7c7d54d17b5b" + +UPSTREAM_CHECK_REGEX = "Encode\-(?P(\d+\.\d+))(?!_\d+).tar" + +S = "${WORKDIR}/Encode-${PV}" + +inherit cpan ptest-perl + +do_install_prepend() { + # Requires "-T" (taint) option on command line + rm -rf ${B}/t/taint.t + # Circular dependency of perl-module-open on perl-module-encode + # and we cannot load perl-module-encode because we are providing + # an alternative + rm -rf ${B}/t/use-Encode-Alias.t +} + +do_install_ptest() { + mkdir ${D}${PTEST_PATH}/bin + cp -r ${B}/bin/piconv ${D}${PTEST_PATH}/bin + cp -r ${B}/blib ${D}${PTEST_PATH} + chown -R root:root ${D}${PTEST_PATH} +} + +# file /usr/bin/enc2xs from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 +# file /usr/bin/encguess from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 +# file /usr/bin/piconv from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 +RCONFLICTS_${PN} = "perl-misc perl-module-encode" + +RDEPENDS_${PN} += " \ + perl-module-bytes \ + perl-module-constant \ + perl-module-parent \ + perl-module-storable \ + perl-module-xsloader \ + " + +RPROVIDES_${PN} += " \ + libencode-alias-perl \ + libencode-byte-perl \ + libencode-cjkconstants-perl \ + libencode-cn-perl \ + libencode-cn-hz-perl \ + libencode-config-perl \ + libencode-ebcdic-perl \ + libencode-encoder-perl \ + libencode-encoding-perl \ + libencode-gsm0338-perl \ + libencode-guess-perl \ + libencode-jp-perl \ + libencode-jp-h2z-perl \ + libencode-jp-jis7-perl \ + libencode-kr-perl \ + libencode-kr-2022_kr-perl \ + libencode-mime-header-perl \ + libencode-mime-name-perl \ + libencode-symbol-perl \ + libencode-tw-perl \ + libencode-unicode-perl \ + libencode-unicode-utf7-perl \ + libencoding-perl \ + libencode-internal-perl \ + libencode-mime-header-iso_2022_jp-perl \ + libencode-utf8-perl \ + libencode-utf_ebcdic-perl \ + " + +RDEPENDS_${PN}-ptest += " \ + perl-module-blib \ + perl-module-charnames \ + perl-module-file-compare \ + perl-module-file-copy \ + perl-module-filehandle \ + perl-module-findbin \ + perl-module-integer \ + perl-module-io-select \ + perl-module-ipc-open3 \ + perl-module-mime-base64 \ + perl-module-perlio \ + perl-module-perlio-encoding \ + perl-module-perlio-scalar \ + perl-module-test-more \ + perl-module-tie-scalar \ + perl-module-unicore \ + perl-module-utf8 \ + " + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.66.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.66.bb deleted file mode 100644 index 26c7c389d8..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.66.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "LDAP Perl module" -DESCRIPTION = "Net::LDAP is a collection of modules that implements \ -a LDAP services API for Perl programs. The module may be used to \ -search directories or perform maintenance functions such as adding, \ -deleting or modifying entries." - -SECTION = "libs" - -LICENSE = "Artistic-1.0|GPLv1+" -LIC_FILES_CHKSUM = "file://README;beginline=3;endline=5;md5=4d6588c2fa0d38ae162f6314d201d89e" - -SRC_URI = "${CPAN_MIRROR}/authors/id/M/MA/MARSCHAP/perl-ldap-${PV}.tar.gz" - -SRC_URI[md5sum] = "c4c1ae9299cd488e75c1b82904458bef" -SRC_URI[sha256sum] = "09263ce6166e80c98d689d41d09995b813389fd069b784601f6dc57f8e2b4102" - -S = "${WORKDIR}/perl-ldap-${PV}" - -inherit cpan ptest-perl - -do_configure_prepend() { - perl -pi -e 's/auto_install_now.*//g' Makefile.PL -} - -do_install_ptest() { - cp -r ${B}/data ${D}${PTEST_PATH} - chown -R root:root ${D}${PTEST_PATH} -} - -RDEPENDS_${PN} += " \ - libconvert-asn1-perl \ - libio-socket-ssl-perl \ - libauthen-sasl-perl \ - perl-module-integer \ -" - -RDEPENDS_${PN}-ptest += " \ - libxml-sax-base-perl \ - libxml-sax-writer-perl \ - perl-module-file-compare \ - perl-module-perlio \ - perl-module-test-more \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.67.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.67.bb new file mode 100644 index 0000000000..57b5fbf89e --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.67.bb @@ -0,0 +1,45 @@ +SUMMARY = "LDAP Perl module" +DESCRIPTION = "Net::LDAP is a collection of modules that implements \ +a LDAP services API for Perl programs. The module may be used to \ +search directories or perform maintenance functions such as adding, \ +deleting or modifying entries." + +SECTION = "libs" + +LICENSE = "Artistic-1.0|GPLv1+" +LIC_FILES_CHKSUM = "file://README;beginline=3;endline=5;md5=4d6588c2fa0d38ae162f6314d201d89e" + +SRC_URI = "${CPAN_MIRROR}/authors/id/M/MA/MARSCHAP/perl-ldap-${PV}.tar.gz" + +SRC_URI[md5sum] = "a949a2bab07b44cc043b965485fe493a" +SRC_URI[sha256sum] = "19a2f7f7959fe23d16367475772c325109f8604d2949e34b96dddb2dfa031170" + +S = "${WORKDIR}/perl-ldap-${PV}" + +inherit cpan ptest-perl + +do_configure_prepend() { + perl -pi -e 's/auto_install_now.*//g' Makefile.PL +} + +do_install_ptest() { + cp -r ${B}/data ${D}${PTEST_PATH} + chown -R root:root ${D}${PTEST_PATH} +} + +RDEPENDS_${PN} += " \ + libconvert-asn1-perl \ + libio-socket-ssl-perl \ + libauthen-sasl-perl \ + perl-module-integer \ +" + +RDEPENDS_${PN}-ptest += " \ + libxml-sax-base-perl \ + libxml-sax-writer-perl \ + perl-module-file-compare \ + perl-module-perlio \ + perl-module-test-more \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.4.bb deleted file mode 100644 index da77a5c75e..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Advanced Enumerations library" -HOMEPAGE = "https://pypi.org/project/aenum/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://aenum/LICENSE;md5=c6a85477543f8b8591b9c1f82abebbe9" - -SRC_URI[md5sum] = "8983562361efe5be865617341dadbb9b" -SRC_URI[sha256sum] = "81828d1fbe20b6b188d75b21a0fa936d7d929d839ef843ef385d9c2a97082864" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.6.bb new file mode 100644 index 0000000000..061770a936 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.6.bb @@ -0,0 +1,11 @@ +SUMMARY = "Advanced Enumerations library" +HOMEPAGE = "https://pypi.org/project/aenum/" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://aenum/LICENSE;md5=c6a85477543f8b8591b9c1f82abebbe9" + +SRC_URI[md5sum] = "52ec17f5efdfa13952657fe954cd6d99" +SRC_URI[sha256sum] = "260225470b49429f5893a195a8b99c73a8d182be42bf90c37c93e7b20e44eaae" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.1.bb deleted file mode 100644 index c14a7eba12..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Argcomplete provides easy, extensible command line tab completion of arguments for your Python script." -HOMEPAGE = "https://github.com/kislyuk/argcomplete" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2ee41112a44fe7014dce33e26468ba93" - -SRC_URI[md5sum] = "2262d0466a40d42267b424bba5010a0b" -SRC_URI[sha256sum] = "849c2444c35bb2175aea74100ca5f644c29bf716429399c0f2203bb5d9a8e4e6" - -PYPI_PACKAGE = "argcomplete" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-core \ -" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.2.bb new file mode 100644 index 0000000000..a08f882ab1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Argcomplete provides easy, extensible command line tab completion of arguments for your Python script." +HOMEPAGE = "https://github.com/kislyuk/argcomplete" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2ee41112a44fe7014dce33e26468ba93" + +SRC_URI[sha256sum] = "de0e1282330940d52ea92a80fea2e4b9e0da1932aaa570f84d268939d1897b04" + +PYPI_PACKAGE = "argcomplete" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-core \ +" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astor/0001-rtrip.py-convert-to-python3.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-astor/0001-rtrip.py-convert-to-python3.patch new file mode 100644 index 0000000000..009951864a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astor/0001-rtrip.py-convert-to-python3.patch @@ -0,0 +1,36 @@ +From 1a477968593a14ee9c8597c1ed4e8b61a7731e15 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 23 Dec 2020 02:23:13 +0000 +Subject: [PATCH] rtrip.py: convert to python3 + +As Python 2 reached end of life (EOL), so convert rtrip.py to python3. + +Upstream-Status: Submitted [https://github.com/berkerpeksag/astor/pull/192] + +Signed-off-by: Mingli Yu +--- + astor/rtrip.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/astor/rtrip.py b/astor/rtrip.py +index 8b108e7..e2e30a6 100755 +--- a/astor/rtrip.py ++++ b/astor/rtrip.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # -*- coding: utf-8 -*- + """ + Part of the astor library for Python AST manipulation. +@@ -160,7 +160,7 @@ def usage(msg): + + Usage: + +- python -m astor.rtrip [readonly] [] ++ python3 -m astor.rtrip [readonly] [] + + + This utility tests round-tripping of Python source to AST +-- +2.26.2 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astor_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astor_0.8.1.bb index 125a0236ec..5048e5bec9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astor_0.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astor_0.8.1.bb @@ -4,7 +4,9 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=561205fdabc3ec52cae2d30815b8ade7" -SRC_URI = "git://github.com/berkerpeksag/astor.git " +SRC_URI = "git://github.com/berkerpeksag/astor.git \ + file://0001-rtrip.py-convert-to-python3.patch \ +" SRCREV ?= "c7553c79f9222e20783fe9bd8a553f932e918072" inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.12.3.bb new file mode 100644 index 0000000000..90958dff53 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.12.3.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "WebSocket client & server library, WAMP real-time framework" +HOMEPAGE = "http://crossbar.io/autobahn" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" + +SRC_URI[md5sum] = "0a465e218d904f63537092b155489468" +SRC_URI[sha256sum] = "410a93e0e29882c8b5d5ab05d220b07609b886ef5f23c0b8d39153254ffd6895" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-twisted \ + ${PYTHON_PN}-zopeinterface \ + ${PYTHON_PN}-py-ubjson \ + ${PYTHON_PN}-cbor2 \ + ${PYTHON_PN}-u-msgpack-python \ + ${PYTHON_PN}-lz4 \ + ${PYTHON_PN}-snappy \ + ${PYTHON_PN}-pyopenssl \ + ${PYTHON_PN}-txaio \ + ${PYTHON_PN}-six \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.7.1.bb deleted file mode 100644 index 29f187cf83..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.7.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "WebSocket client & server library, WAMP real-time framework" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" - -SRC_URI[md5sum] = "1ea21f5e751517a71f605eaaff7f0c38" -SRC_URI[sha256sum] = "86bbce30cdd407137c57670993a8f9bfdfe3f8e994b889181d85e844d5aa8dfb" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-twisted \ - ${PYTHON_PN}-zopeinterface \ - ${PYTHON_PN}-py-ubjson \ - ${PYTHON_PN}-cbor2 \ - ${PYTHON_PN}-u-msgpack-python \ - ${PYTHON_PN}-lz4 \ - ${PYTHON_PN}-snappy \ - ${PYTHON_PN}-pyopenssl \ - ${PYTHON_PN}-txaio \ - ${PYTHON_PN}-six \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.8.0.bb deleted file mode 100644 index c69098b226..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.8.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "A collection of tools for internationalizing Python applications" -HOMEPAGE = "http://babel.edgewall.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=942469df9305abb1c59e95f778310384" - -SRC_URI[md5sum] = "6fad9772e75421969ddb41975483abdf" -SRC_URI[sha256sum] = "1aac2ae2d0d8ea368fa90906567f5c08463d98ade155c0c4bfedd6a0f7160e38" - -PYPI_PACKAGE = "Babel" - -inherit pypi setuptools3 - -CLEANBROKEN = "1" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pytz \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-threading \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.9.0.bb new file mode 100644 index 0000000000..7248abf33b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.9.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "A collection of tools for internationalizing Python applications" +HOMEPAGE = "http://babel.edgewall.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=22a580b27e4ebf9689e466b63aedeb7f" + +SRC_URI[sha256sum] = "da031ab54472314f210b0adcff1588ee5d1d1d0ba4dbd07b94dba82bde791e05" + +PYPI_PACKAGE = "Babel" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-codecs \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-distutils \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-pytz \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-threading \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.6.2.bb deleted file mode 100644 index fa28861e9e..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.6.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Security oriented static analyser for python code." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRC_URI[md5sum] = "c6a6772d7afa0af8828b3384e73b7085" -SRC_URI[sha256sum] = "41e75315853507aa145d62a78a2a6c5e3240fe14ee7c601459d0df9418196065" - -DEPENDS = "python3-pbr-native python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" - -inherit setuptools3 pypi - -RDEPENDS_${PN} += "python3-modules python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.0.bb new file mode 100644 index 0000000000..2ef956e07a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Security oriented static analyser for python code." +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRC_URI[md5sum] = "24965f102dc62129d3fafe4fe596a3b8" +SRC_URI[sha256sum] = "8a4c7415254d75df8ff3c3b15cfe9042ecee628a1e40b44c15a98890fbfc2608" + +DEPENDS = "python3-pbr-native python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" + +inherit setuptools3 pypi + +RDEPENDS_${PN} += "python3-modules python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.1.1.bb deleted file mode 100644 index d334070cdb..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.1.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Extensible memoizing collections and decorators" -HOMEPAGE = "https://github.com/tkem/cachetools" -DESCRIPTION = "This module provides various memoizing \ -collections and decorators, including variants of the \ -Python 3 Standard Library @lru_cache function decorator." -SECTION = "devel/python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d1e1bf0ccb26126a230c51f997ce362" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -SRC_URI[md5sum] = "ae41b69896f49727e1621d279cb72522" -SRC_URI[sha256sum] = "bbaa39c3dede00175df2dc2b03d0cf18dd2d32a7de7beb68072d13043c9edb20" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.0.bb new file mode 100644 index 0000000000..cc697d5a95 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "Extensible memoizing collections and decorators" +HOMEPAGE = "https://github.com/tkem/cachetools" +DESCRIPTION = "This module provides various memoizing \ +collections and decorators, including variants of the \ +Python 3 Standard Library @lru_cache function decorator." +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d1e1bf0ccb26126a230c51f997ce362" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-math \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +SRC_URI[md5sum] = "9d54dacd774e2af7e9a50741386f5455" +SRC_URI[sha256sum] = "3796e1de094f0eaca982441c92ce96c68c89cced4cd97721ab297ea4b16db90e" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.5.0.bb deleted file mode 100644 index cb70ed3188..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.5.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "CAN BUS tools in Python 3." -HOMEPAGE = "https://github.com/eerimoq/cantools" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" - -SRC_URI[sha256sum] = "ce26ab5d54762c314bedc35b407d498b8ae11069ab4d9251f8ac83f2956438f9" - -PYPI_PACKAGE = "cantools" - -inherit pypi setuptools3 - -CLEANBROKEN = "1" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.1.0.bb new file mode 100644 index 0000000000..b2f3fd6d82 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_36.1.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "CAN BUS tools in Python 3." +HOMEPAGE = "https://github.com/eerimoq/cantools" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" + +SRC_URI[sha256sum] = "3c4c2652907c48e7013f825cc3068b5d47a38b62f01bd04aaab1d9f69a8f53f5" + +PYPI_PACKAGE = "cantools" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb deleted file mode 100644 index 80785b8d4e..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Universal encoding detector for Python 2 and 3" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI[md5sum] = "7dd1ba7f9c77e32351b0a0cfacf4055c" -SRC_URI[sha256sum] = "84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae" - -# setup.py of chardet needs this. -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - -inherit pypi setuptools3 - -PACKAGES =+ "${PN}-cli" -FILES_${PN}-cli += " \ - ${PYTHON_SITEPACKAGES_DIR}/chardet/cli \ -" - -RDEPENDS_${PN}-cli = "${PN} " - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-logging \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_4.0.0.bb new file mode 100644 index 0000000000..4caf33cb25 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_4.0.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "Universal encoding detector for Python 2 and 3" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI[sha256sum] = "0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa" + +# setup.py of chardet needs this. +DEPENDS += "${PYTHON_PN}-pytest-runner-native" + +inherit pypi setuptools3 + +PACKAGES =+ "${PN}-cli" +FILES_${PN}-cli += " \ + ${PYTHON_SITEPACKAGES_DIR}/chardet/cli \ +" + +RDEPENDS_${PN}-cli = "${PN} " + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-logging \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.36.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.36.bb deleted file mode 100644 index b2571491b6..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.36.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "croniter provides iteration for datetime object with cron like format" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2" - -PYPI_PACKAGE = "croniter" -SRC_URI[md5sum] = "1be5dd43ca26a66b5f981e41c74fd346" -SRC_URI[sha256sum] = "9d3098e50f7edc7480470455d42f09c501fa1bb7e2fc113526ec6e90b068f32c" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " python3-dateutil python3-natsort" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.37.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.37.bb new file mode 100644 index 0000000000..28c4057cd8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.37.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "croniter provides iteration for datetime object with cron like format" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2" + +PYPI_PACKAGE = "croniter" + +SRC_URI[sha256sum] = "12ced475dfc107bf7c6c1440af031f34be14cd97bbbfaf0f62221a9c11e86404" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " python3-dateutil python3-natsort" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb deleted file mode 100644 index 8786a14842..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "A python package that provides useful locks." -HOMEPAGE = "https://github.com/harlowja/fasteners" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4476c4be31402271e101d9a4a3430d52" - -SRC_URI[md5sum] = "440f8ab461c8fed941355860d8669556" -SRC_URI[sha256sum] = "3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.16.bb new file mode 100644 index 0000000000..eed8d2c957 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.16.bb @@ -0,0 +1,8 @@ +SUMMARY = "A python package that provides useful locks." +HOMEPAGE = "https://github.com/harlowja/fasteners" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4476c4be31402271e101d9a4a3430d52" + +SRC_URI[sha256sum] = "c995d8c26b017c5d6a6de9ad29a0f9cdd57de61ae1113d28fac26622b06a0933" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.8.bb deleted file mode 100644 index 6219d20093..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.8.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Client for MQTT protocol" -HOMEPAGE = "https://github.com/wialon/gmqtt" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=903f1792621a3b35ee546da75d139177" - -SRC_URI[md5sum] = "8745f3b576e5247310276f0ef5c32f65" -SRC_URI[sha256sum] = "1285c428a5faf4c6aaac1e2ccb876383b4c7e087ef34ff7edb9f549a78cdebf1" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - python3-asyncio \ - python3-core \ - python3-datetime \ - python3-json \ - python3-logging \ - python3-netclient \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.9.bb new file mode 100644 index 0000000000..73c0ae0acf --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.9.bb @@ -0,0 +1,19 @@ +SUMMARY = "Client for MQTT protocol" +HOMEPAGE = "https://github.com/wialon/gmqtt" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=903f1792621a3b35ee546da75d139177" + +SRC_URI[sha256sum] = "0e98a964393834e724c93b5dce9524c9f1255c338c0d972188794f54c6559f04" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + python3-asyncio \ + python3-core \ + python3-datetime \ + python3-json \ + python3-logging \ + python3-netclient \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_8.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_8.2.bb deleted file mode 100644 index 61c969d760..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_8.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Human friendly output for text interfaces using Python" -HOMEPAGE = "https://humanfriendly.readthedocs.io/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=764e737b117a38d773609885e8d04f0b" - -PYPI_PACKAGE = "humanfriendly" - -SRC_URI[md5sum] = "e6064a6fe099c4231c3e969ca5fea335" -SRC_URI[sha256sum] = "bf52ec91244819c780341a3438d5d7b09f431d3f113a475147ac9b7b167a3d12" - -inherit pypi setuptools3 - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.1.bb new file mode 100644 index 0000000000..fb6a7e3b6d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Human friendly output for text interfaces using Python" +HOMEPAGE = "https://humanfriendly.readthedocs.io/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=764e737b117a38d773609885e8d04f0b" + +PYPI_PACKAGE = "humanfriendly" + +SRC_URI[sha256sum] = "066562956639ab21ff2676d1fda0b5987e985c534fc76700a19bd54bcb81121d" + +inherit pypi setuptools3 + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-fcntl \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-stringold \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.1.0.bb deleted file mode 100644 index 43b882cb84..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.1.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Python humanize utilities" -HOMEPAGE = "http://github.com/jmoiron/humanize" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" - -SRC_URI[md5sum] = "bde0a033cf200f2874e6e3fc860bed48" -SRC_URI[sha256sum] = "fd3eb915310335c63a54d4507289ecc7b3a7454cd2c22ac5086d061a3cbfd592" - -inherit pypi setuptools3 - -DEPENDS += "\ - ${PYTHON_PN}-setuptools-scm-native \ -" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.2.0.bb new file mode 100644 index 0000000000..646e20f7d8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.2.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Python humanize utilities" +HOMEPAGE = "http://github.com/jmoiron/humanize" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" + +SRC_URI[sha256sum] = "ab69004895689951b79f2ae4fdd6b8127ff0c180aff107856d5d98119a33f026" + +inherit pypi setuptools3 + +DEPENDS += "\ + ${PYTHON_PN}-setuptools-scm-native \ +" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.8.bb deleted file mode 100644 index a08ca714ac..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.8.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-idna.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.26.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.26.bb deleted file mode 100644 index b1217cfac1..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.26.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Appling JSON patches in Python 2.6+ and 3.x" -HOMEPAGE = "https://github.com/stefankoegl/python-json-patch" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=32b15c843b7a329130f4e266a281ebb3" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "3aa7e75ad472c51a6de0123137dbfdf2" -SRC_URI[sha256sum] = "e45df18b0ab7df1925f20671bbc3f6bd0b4b556fb4b9c5d97684b0a7eac01744" - -RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer ${PYTHON_PN}-netclient ${PYTHON_PN}-stringold" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.28.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.28.bb new file mode 100644 index 0000000000..cef20495b6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.28.bb @@ -0,0 +1,10 @@ +SUMMARY = "Appling JSON patches in Python 2.6+ and 3.x" +HOMEPAGE = "https://github.com/stefankoegl/python-json-patch" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=32b15c843b7a329130f4e266a281ebb3" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "e930adc932e4d36087dbbf0f22e1ded32185dfb20662f2e3dd848677a5295a14" + +RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer ${PYTHON_PN}-netclient ${PYTHON_PN}-stringold" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.0.1.bb deleted file mode 100644 index fad7432132..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.0.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A component library to support SBC display drivers" -DESCRIPTION = "A component library to support SBC display drivers" -HOMEPAGE = "https://github.com/rm-hull/luma.core" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=db07e3d471938ea7d7fd2135f88ac9a1" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "a0bc18c03cfb293c9c1b1d8883c2ec7c29d167e4af99f795b5698c8a864332df" - -CLEANBROKEN = "1" - -PYPI_PACKAGE = "luma.core" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pillow \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-smbus2 \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.2.0.bb new file mode 100644 index 0000000000..b181e09861 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.2.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "A component library to support SBC display drivers" +DESCRIPTION = "A component library to support SBC display drivers" +HOMEPAGE = "https://github.com/rm-hull/luma.core" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=db07e3d471938ea7d7fd2135f88ac9a1" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "62a24518d3aa084d75206a19056eb8aa71b5a3d0c159d2e95b388cb3150a7b1c" + +CLEANBROKEN = "1" + +PYPI_PACKAGE = "luma.core" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-pillow \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-smbus2 \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb index 3cfa3f31f4..25709a1176 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb @@ -26,6 +26,7 @@ inherit pypi setuptools3 pkgconfig # LTO with clang needs lld LDFLAGS_append_toolchain-clang = " -fuse-ld=lld" +LDFLAGS_remove_toolchain-clang_mips = "-fuse-ld=lld" RDEPENDS_${PN} = "\ freetype \ @@ -40,6 +41,7 @@ RDEPENDS_${PN} = "\ ENABLELTO_toolchain-clang_riscv64 = "echo enable_lto = False >> ${S}/setup.cfg" ENABLELTO_toolchain-clang_riscv32 = "echo enable_lto = False >> ${S}/setup.cfg" +ENABLELTO_toolchain-clang_mips = "echo enable_lto = False >> ${S}/setup.cfg" do_compile_prepend() { echo [libs] > ${S}/setup.cfg echo system_freetype = true >> ${S}/setup.cfg diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.0.0.bb deleted file mode 100644 index 676fbae7ed..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.0.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Multidicts are useful for working with HTTP headers, URL query args etc." -HOMEPAGE = "https://github.com/aio-libs/multidict/" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e74c98abe0de8f798ca609137f9cef4a" - -SRC_URI[md5sum] = "c2c3311e25636a6f213e998cd1e80d72" -SRC_URI[sha256sum] = "1b324444299c3a49b601b1bf621fc21704e29066f6ac2b7d7e4034a4a18662a1" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.1.0.bb new file mode 100644 index 0000000000..b960affac4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.1.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Multidicts are useful for working with HTTP headers, URL query args etc." +HOMEPAGE = "https://github.com/aio-libs/multidict/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e74c98abe0de8f798ca609137f9cef4a" + +SRC_URI[sha256sum] = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.0.1.bb deleted file mode 100644 index e20cdf0fa3..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Simple yet flexible natural sorting in Python." -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6a96e5ad780a0eea866ecccec4463517" - -PYPI_PACKAGE = "natsort" -SRC_URI[sha256sum] = "a633464dc3a22b305df0f27abcb3e83515898aa1fd0ed2f9726c3571a27258cf" - -inherit pypi setuptools3 - -RDEPENDS_${PN} = "python3-fastnumbers python3-icu" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.0.bb new file mode 100644 index 0000000000..c890ae2432 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.1.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "Simple yet flexible natural sorting in Python." +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a96e5ad780a0eea866ecccec4463517" + +PYPI_PACKAGE = "natsort" +SRC_URI[sha256sum] = "33f3f1003e2af4b4df20908fe62aa029999d136b966463746942efbfc821add3" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "python3-fastnumbers python3-icu" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.1.bb deleted file mode 100644 index af5da52f68..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "A case-insensitive ordered dictionary for Python" -HOMEPAGE = "https://github.com/pywbem/nocasedict" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" - -SRC_URI[md5sum] = "93e7f19f73c7cd56c36cd7535b6b9ab1" -SRC_URI[sha256sum] = "6e5d5bd11de33f93d22545d9ed23a0b98f840f2cdac0d749d2faa4617adc7772" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.2.bb new file mode 100644 index 0000000000..952286d37c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.2.bb @@ -0,0 +1,8 @@ +SUMMARY = "A case-insensitive ordered dictionary for Python" +HOMEPAGE = "https://github.com/pywbem/nocasedict" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a87a7059d580c45495c1218f53e3610d" + +SRC_URI[sha256sum] = "86e2dae49e34de7c31b65b486c8f9aa58b66dc2e8ee9b34c390c6c58885c85a0" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.3.bb deleted file mode 100644 index 1119c7f38e..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.3.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "A case-insensitive list for Python" -HOMEPAGE = "https://nocaselist.readthedocs.io/en/latest/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI[md5sum] = "42ba878fd70611cf345c61edd83f5fb0" -SRC_URI[sha256sum] = "7e6decb7d85563b9044913c9087ef4b691bc3da4d7ad1d88968cdea409553326" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.4.bb new file mode 100644 index 0000000000..60c79c22a8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.4.bb @@ -0,0 +1,8 @@ +SUMMARY = "A case-insensitive list for Python" +HOMEPAGE = "https://nocaselist.readthedocs.io/en/latest/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d229da563da18fe5d58cd95a6467d584" + +SRC_URI[sha256sum] = "73a9c0659e7135c66e46a6ab06e2cb637ce9248d73c690ebd31afb72a4e03ac0" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.4.bb deleted file mode 100644 index 78730b46af..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.4.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "pandas library for high-performance data analysis tools" -DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ -high-performance, easy-to-use data structures and data analysis tools for \ -the Python programming language." -HOMEPAGE = "http://pandas.pydata.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c2a8f987b2ce77c368c6b3e1b5b10774" - -SRC_URI[md5sum] = "594e6a429f297c77470e37d3510cccbb" -SRC_URI[sha256sum] = "a979d0404b135c63954dea79e6246c45dd45371a88631cdbb4877d844e6de3b6" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ -" - -CFLAGS_append_toolchain-clang = " -Wno-error=deprecated-declarations" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-numpy \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-pytz \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.0.bb new file mode 100644 index 0000000000..0cb631990c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "pandas library for high-performance data analysis tools" +DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ +high-performance, easy-to-use data structures and data analysis tools for \ +the Python programming language." +HOMEPAGE = "http://pandas.pydata.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c2a8f987b2ce77c368c6b3e1b5b10774" + +SRC_URI[sha256sum] = "e03386615b970b8b41da6a68afe717626741bb2431cec993640685614c0680e4" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ +" + +CFLAGS_append_toolchain-clang = " -Wno-error=deprecated-declarations" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-numpy \ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-pytz \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.8.bb deleted file mode 100644 index 0debba48d2..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.8.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Library for building powerful interactive command lines in Python" -HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" - -SRC_URI[md5sum] = "cf3ca19873fa9e7f6162296cf6bae419" -SRC_URI[sha256sum] = "25c95d2ac813909f813c93fde734b6e44406d1477a9faef7c915ff37d39c0a8c" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "prompt_toolkit" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-wcwidth \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-image \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.9.bb new file mode 100644 index 0000000000..589d9398d0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.9.bb @@ -0,0 +1,23 @@ +SUMMARY = "Library for building powerful interactive command lines in Python" +HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" + +SRC_URI[sha256sum] = "c5eeab58dd31b541442825d7870777f2a2f764eb5fda03334d5219cd84b9722f" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "prompt_toolkit" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-terminal \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-wcwidth \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-image \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.3.bb deleted file mode 100644 index 2f927d2da2..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.3.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "A cross-platform process and system utilities module for Python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b" - -SRC_URI[md5sum] = "b07a067e6a930608235f4e5d9b1f90f5" -SRC_URI[sha256sum] = "af73f7bcebdc538eda9cc81d19db1db7bf26f103f91081d780bbacfcb620dee2" - -inherit pypi setuptools3 - -PACKAGES =+ "${PN}-tests" - -FILES_${PN}-tests += " \ - ${PYTHON_SITEPACKAGES_DIR}/psutil/test* \ - ${PYTHON_SITEPACKAGES_DIR}/psutil/__pycache__/test* \ -" - - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-netclient \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.8.0.bb new file mode 100644 index 0000000000..bd43b414d0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.8.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "A cross-platform process and system utilities module for Python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b" + +SRC_URI[sha256sum] = "0c9ccb99ab76025f2f0bbecf341d4656e9c1351db8cc8a03ccd62e318ab4b5c6" + +inherit pypi setuptools3 + +PACKAGES =+ "${PN}-tests" + +FILES_${PN}-tests += " \ + ${PYTHON_SITEPACKAGES_DIR}/psutil/test* \ + ${PYTHON_SITEPACKAGES_DIR}/psutil/__pycache__/test* \ +" + + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-xml \ + ${PYTHON_PN}-netclient \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.1.bb deleted file mode 100644 index b7796251ec..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." -HOMEPAGE = "https://github.com/balloob/pychromecast" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" - -SRC_URI[md5sum] = "9dee7207b7a5c73ebf8fad64be137f27" -SRC_URI[sha256sum] = "cf2e9fa795ea1e9d0d180adfbdccefd6b4f532eae56f41f15d1a75b323096f51" - -PYPI_PACKAGE = "PyChromecast" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.1.bb new file mode 100644 index 0000000000..ca55740ba7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.7.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." +HOMEPAGE = "https://github.com/balloob/pychromecast" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" + +SRC_URI[sha256sum] = "d6fd0382395303b3260ea7a89a850c8c9e5c83e7ce71a5fbd793bb157cf8ad26" + +PYPI_PACKAGE = "PyChromecast" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.0.bb deleted file mode 100644 index 635de22d20..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Python driver for MongoDB " -DESCRIPTION = "\ -The PyMongo distribution contains tools for interacting with MongoDB \ -database from Python. The bson package is an implementation of the BSON \ -format for Python. The pymongo package is a native Python driver for \ -MongoDB. The gridfs package is a gridfs implementation on top of pymongo." -HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI[md5sum] = "5d166c8f9500c83314deadebb95b6fd5" -SRC_URI[sha256sum] = "076a7f2f7c251635cf6116ac8e45eefac77758ee5a77ab7bd2f63999e957613b" - -inherit pypi setuptools3 - -PACKAGES =+ "${PYTHON_PN}-bson" - -FILES_${PYTHON_PN}-bson = "${PYTHON_SITEPACKAGES_DIR}/bson/*" - -RDEPENDS_${PYTHON_PN}-bson += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-bson \ - ${PYTHON_PN}-pprint \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.2.bb new file mode 100644 index 0000000000..5372ac0ff1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.2.bb @@ -0,0 +1,30 @@ +SUMMARY = "Python driver for MongoDB " +DESCRIPTION = "\ +The PyMongo distribution contains tools for interacting with MongoDB \ +database from Python. The bson package is an implementation of the BSON \ +format for Python. The pymongo package is a native Python driver for \ +MongoDB. The gridfs package is a gridfs implementation on top of pymongo." +HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI[sha256sum] = "c2b67881392a9e85aa108e75f62cdbe372d5a3f17ea5f8d3436dcf4662052f14" + +inherit pypi setuptools3 + +PACKAGES =+ "${PYTHON_PN}-bson" + +FILES_${PYTHON_PN}-bson = "${PYTHON_SITEPACKAGES_DIR}/bson/*" + +RDEPENDS_${PYTHON_PN}-bson += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-threading \ +" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-bson \ + ${PYTHON_PN}-pprint \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.10.0.bb deleted file mode 100644 index 70cc98f294..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.10.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "pytest-metadata is a plugin that allowed for accessing pytest metadata" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" - -SRC_URI[sha256sum] = "b7e6e0a45adacb17a03a97bf7a2ef60cc1f4e172bcce9732ce5e814191932315" -SRC_URI[md5sum] = "4fcf9764e6210c4555411fce8109e7cd" - -PYPI_PACKAGE = "pytest-metadata" - -inherit pypi setuptools3 - -RDEPENDS_${PN} = " \ - ${PYTHON_PN}-pytest \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.11.0.bb new file mode 100644 index 0000000000..a1b62d16e4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.11.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "pytest-metadata is a plugin that allowed for accessing pytest metadata" +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" + +SRC_URI[sha256sum] = "71b506d49d34e539cc3cfdb7ce2c5f072bea5c953320002c95968e0238f8ecf1" + +PYPI_PACKAGE = "pytest-metadata" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = " \ + ${PYTHON_PN}-pytest \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.24.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.24.0.bb deleted file mode 100644 index de9a53584b..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.24.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Python HTTP for Humans." -HOMEPAGE = "http://python-requests.org" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=19b6be66ed463d93fa88c29f7860bcd7" - -FILESEXTRAPATHS_prepend := "${THISDIR}/python-requests:" - -SRC_URI[md5sum] = "b54bff26a389e5932e8b1c4983a99ce7" -SRC_URI[sha256sum] = "b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-ndg-httpsclient \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-pyasn1 \ - ${PYTHON_PN}-pyopenssl \ - ${PYTHON_PN}-pysocks \ - ${PYTHON_PN}-urllib3 \ - ${PYTHON_PN}-chardet \ - ${PYTHON_PN}-idna \ -" - -CVE_PRODUCT = "requests" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.25.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.25.1.bb new file mode 100644 index 0000000000..6af836543b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.25.1.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Python HTTP for Humans." +HOMEPAGE = "http://python-requests.org" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +SRC_URI[sha256sum] = "27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-email \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-ndg-httpsclient \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-pyasn1 \ + ${PYTHON_PN}-pyopenssl \ + ${PYTHON_PN}-pysocks \ + ${PYTHON_PN}-urllib3 \ + ${PYTHON_PN}-chardet \ + ${PYTHON_PN}-idna \ +" + +CVE_PRODUCT = "requests" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.1.bb deleted file mode 100644 index 2da9908e34..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "The new Python SDK for Sentry.io" -DESCRIPTION = "This is the next line of the Python SDK \ -for Sentry, intended to replace the raven package on PyPI." -HOMEPAGE = "https://github.com/getsentry/sentry-python" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" - -SRC_URI[md5sum] = "1e6aabe30f4c86356d1d85a9beb0b05a" -SRC_URI[sha256sum] = "5cf36eb6b1dc62d55f3c64289792cbaebc8ffa5a9da14474f49b46d20caa7fc8" - -PYPI_PACKAGE = "sentry-sdk" -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.5.bb new file mode 100644 index 0000000000..bb960eed09 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.5.bb @@ -0,0 +1,11 @@ +SUMMARY = "The new Python SDK for Sentry.io" +DESCRIPTION = "This is the next line of the Python SDK \ +for Sentry, intended to replace the raven package on PyPI." +HOMEPAGE = "https://github.com/getsentry/sentry-python" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" + +SRC_URI[sha256sum] = "737a094e49a529dd0fdcaafa9e97cf7c3d5eb964bd229821d640bc77f3502b3f" + +PYPI_PACKAGE = "sentry-sdk" +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.3.0.bb deleted file mode 100644 index 7a61927206..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.3.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Drop-in replacement for smbus-cffi/smbus-python in pure Python" -DESCRIPTION = "smbus2 is a drop-in replacement for smbus-cffi/smbus-python in pure Python" -HOMEPAGE = "https://github.com/kplindegaard/smbus2" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "d5ed5acc889b4770a84cc932853ed20a" -SRC_URI[sha256sum] = "210e66eebe4d0b1fe836b3ec2751841942e1c4918c0b429b20a0e20a222228b4" - -CLEANBROKEN = "1" - -PYPI_PACKAGE = "smbus2" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-fcntl \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.0.bb new file mode 100644 index 0000000000..1f6f61137e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "Drop-in replacement for smbus-cffi/smbus-python in pure Python" +DESCRIPTION = "smbus2 is a drop-in replacement for smbus-cffi/smbus-python in pure Python" +HOMEPAGE = "https://github.com/kplindegaard/smbus2" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "1b5c690715e1efab39e41038147dfba75afc72a10f76b3f0310d783e9f8a83a6" + +CLEANBROKEN = "1" + +PYPI_PACKAGE = "smbus2" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-fcntl \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb deleted file mode 100644 index ae242af562..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "CSS selector library for python-beautifulsoup4" -HOMEPAGE = "https://github.com/facelessuser/soupsieve" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5a6fd3b0c24fc5a041a3d1bbb22c81b5" - -SRC_URI[md5sum] = "62a7481c7dbf6d8cc21e4e3a79c72034" -SRC_URI[sha256sum] = "a59dc181727e95d25f781f0eb4fd1825ff45590ec8ff49eadfd7f1a537cc0232" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-beautifulsoup4 \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.1.bb new file mode 100644 index 0000000000..7cb0efbf97 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "CSS selector library for python-beautifulsoup4" +HOMEPAGE = "https://github.com/facelessuser/soupsieve" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5a6fd3b0c24fc5a041a3d1bbb22c81b5" + +SRC_URI[sha256sum] = "6dc52924dc0bc710a5d16794e6b3480b2c7c08b07729505feab2b2c16661ff6e" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-beautifulsoup4 \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.20.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.20.bb deleted file mode 100644 index e8f598ada3..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.20.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ -application developers the full power and flexibility of SQL" -HOMEPAGE = "http://www.sqlalchemy.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c19467890539ff718c00a019c9c7a7b2" - -SRC_URI[md5sum] = "40200b570274446a05959abd3fa81778" -SRC_URI[sha256sum] = "d2f25c7f410338d31666d7ddedfa67570900e248b940d186b48461bd4e5569a1" - -PYPI_PACKAGE = "SQLAlchemy" -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.22.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.22.bb new file mode 100644 index 0000000000..cf127241db --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.22.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ +application developers the full power and flexibility of SQL" +HOMEPAGE = "http://www.sqlalchemy.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c19467890539ff718c00a019c9c7a7b2" + +SRC_URI[sha256sum] = "758fc8c4d6c0336e617f9f6919f9daea3ab6bb9b07005eda9a1a682e24a6cacc" + +PYPI_PACKAGE = "SQLAlchemy" +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-threading \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.2.2.bb deleted file mode 100644 index 18eae35322..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.2.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Manage dynamic plugins for Python applications" -HOMEPAGE = "https://docs.openstack.org/stevedore/latest/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI[md5sum] = "c78357a02888490ef27a0d898eb97172" -SRC_URI[sha256sum] = "f845868b3a3a77a2489d226568abe7328b5c2d4f6a011cc759dfa99144a521f0" - -DEPENDS += "${PYTHON_PN}-pbr-native" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-pbr ${PYTHON_PN}-six" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.3.0.bb new file mode 100644 index 0000000000..5103717182 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.3.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Manage dynamic plugins for Python applications" +HOMEPAGE = "https://docs.openstack.org/stevedore/latest/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[sha256sum] = "3a5bbd0652bf552748871eaa73a4a8dc2899786bc497a2aa1fcb4dcdb0debeee" + +DEPENDS += "${PYTHON_PN}-pbr-native" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-pbr ${PYTHON_PN}-six" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.2.bb deleted file mode 100644 index 428b40c3b7..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -# This recipe is adapted from one in meta-jupyter: -# https://github.com/Xilinx/meta-jupyter/blob/master/recipes-python/python3-sympy_1.1.bb - -SUMMARY = "Computer algebra system (CAS) in Python" -HOMEPAGE = "https://pypi.org/project/sympy/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ebb06e9df8f57522b72d0edb0fcf83d4" - -SRC_URI[md5sum] = "50d6b69b1de36b757484b9ff833a9e0a" -SRC_URI[sha256sum] = "1cfadcc80506e4b793f5b088558ca1fcbeaec24cd6fc86f1fdccaa3ee1d48708" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "python3-mpmath" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.7.1.bb new file mode 100644 index 0000000000..d4508689f6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.7.1.bb @@ -0,0 +1,15 @@ +# This recipe is adapted from one in meta-jupyter: +# https://github.com/Xilinx/meta-jupyter/blob/master/recipes-python/python3-sympy_1.1.bb + +SUMMARY = "Computer algebra system (CAS) in Python" +HOMEPAGE = "https://pypi.org/project/sympy/" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ebb06e9df8f57522b72d0edb0fcf83d4" + +SRC_URI[sha256sum] = "a3de9261e97535b83bb8607b0da2c7d03126650fafea2b2789657b229c246b2e" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-mpmath" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.5.bb deleted file mode 100644 index 7f88bc1d22..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.5.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "A lightweight, object-oriented Python state machine implementation with many extensions." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=de0a0876a688a4483bfafa764773ab39" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "e441c66a0c753d56c01c3e5e547f21dbe4a5569c939f12477475c5e81d79769b" - -RDEPENDS_${PN} += "python3-six" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.6.bb new file mode 100644 index 0000000000..701c82cda8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.6.bb @@ -0,0 +1,9 @@ +SUMMARY = "A lightweight, object-oriented Python state machine implementation with many extensions." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=baac7be1f4c17620df74188e23da6d47" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "032e10113139852ffb3ecfa4c2a5138f87441d85c3d6ad9122bb4b0978180a8d" + +RDEPENDS_${PN} += "python3-six" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.2.0.bb deleted file mode 100644 index 34309585f8..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.2.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Utilities for interacting with PyPI" -HOMEPAGE = "https://twine.readthedocs.io/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" - -SRC_URI[md5sum] = "41ce5c8aad253ef4b43b19c76997e2f2" -SRC_URI[sha256sum] = "34352fd52ec3b9d29837e6072d5a2a7c6fe4290e97bba46bb8d478b5c598f7ab" - -inherit pypi setuptools3 - -DEPENDS += "\ - ${PYTHON_PN}-setuptools-scm-native \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.3.0.bb new file mode 100644 index 0000000000..0bc1999923 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.3.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Utilities for interacting with PyPI" +HOMEPAGE = "https://twine.readthedocs.io/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" + +SRC_URI[sha256sum] = "fcffa8fc37e8083a5be0728371f299598870ee1eccc94e9a25cef7b1dcfa8297" + +inherit pypi setuptools3 + +DEPENDS += "\ + ${PYTHON_PN}-setuptools-scm-native \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_20.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_20.12.1.bb new file mode 100644 index 0000000000..f4baeb10fe --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_20.12.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Compatibility API between asyncio/Twisted/Trollius" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" + +SRC_URI[sha256sum] = "1488d31d564a116538cc1265ac3f7979fb6223bb5a9e9f1479436ee2c17d8549" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-twisted \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_20.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_20.4.1.bb deleted file mode 100644 index 75a9395a25..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_20.4.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Compatibility API between asyncio/Twisted/Trollius" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" - -SRC_URI[sha256sum] = "17938f2bca4a9cabce61346758e482ca4e600160cbc28e861493eac74a19539d" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-twisted \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_0.10.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_0.10.3.bb deleted file mode 100644 index 2108cbb93b..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_0.10.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Filesystem events monitoring" -DEPENDS = "${PYTHON_PN}-argh" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI[md5sum] = "9a5c9134e943b534b9f8b51d78338cf8" -SRC_URI[sha256sum] = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04" - -inherit pypi setuptools3 - -RDEPENDS_${PN} = " \ - ${PYTHON_PN}-argh \ - ${PYTHON_PN}-pathtools3 \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-requests \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_1.0.2.bb new file mode 100644 index 0000000000..698dfe7704 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_1.0.2.bb @@ -0,0 +1,18 @@ +SUMMARY = "Filesystem events monitoring" +DEPENDS = "${PYTHON_PN}-argh" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[sha256sum] = "376cbc2a35c0392b0fe7ff16fbc1b303fd99d4dd9911ab5581ee9d69adc88982" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = " \ + ${PYTHON_PN}-argh \ + ${PYTHON_PN}-pathtools3 \ + ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-requests \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.12.1.bb index 49fde1003d..bb9b95201b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.12.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.12.1.bb @@ -13,3 +13,5 @@ RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-stringold \ ${PYTHON_PN}-threading \ " + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb deleted file mode 100644 index 207642575b..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.16.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" - -SRC_URI[md5sum] = "45a80f75336c980d240987badc3dcf60" -SRC_URI[sha256sum] = "f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb deleted file mode 100644 index 3d2a5edd26..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.17.8.bb +++ /dev/null @@ -1,10 +0,0 @@ -require nginx.inc - -# 1.16.x branch is the current stable branch, the recommended default -# 1.17.x is the current mainline branches containing all new features -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" - -SRC_URI[md5sum] = "29cd861a13aae69a058cbabaae86177b" -SRC_URI[sha256sum] = "97d23ecf6d5150b30e284b40e8a6f7e3bb5be6b601e373a4d013768d5a25965b" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb new file mode 100644 index 0000000000..ac303e47d2 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.18.0.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" + +SRC_URI[md5sum] = "b2d33d24d89b8b1f87ff5d251aa27eb8" +SRC_URI[sha256sum] = "4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb new file mode 100644 index 0000000000..16c80cd094 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.19.6.bb @@ -0,0 +1,10 @@ +require nginx.inc + +# 1.18.x branch is the current stable branch, the recommended default +# 1.19.x is the current mainline branches containing all new features +DEFAULT_PREFERENCE = "-1" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=52e384aaac868b755b93ad5535e2d075" + +SRC_URI[md5sum] = "0be1d90b45b1bdfcf8339f299e74063a" +SRC_URI[sha256sum] = "b11195a02b1d3285ddf2987e02c6b6d28df41bb1b1dd25f33542848ef4fc33b5" diff --git a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.2.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.2.bb deleted file mode 100644 index ac878c5fd0..0000000000 --- a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.2.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Web-based MySQL administration interface" -HOMEPAGE = "http://www.phpmyadmin.net" -# Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT -LICENSE = "GPLv2 & LGPLv3 & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=dd6470bbcd3436ca317f82d34abaf688 \ - file://js/vendor/jquery/MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9 \ -" - -SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ - file://apache.conf \ -" - -SRC_URI[md5sum] = "442eb85912d3a2ad2fc0b9d6c21b1527" -SRC_URI[sha256sum] = "cbcc78d1499308d9329950fcba2ebaa84c559a934fe54efc027d459d8e4161c8" - -UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" -UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P\d+(\.\d+)+)-all-languages.tar.xz" - -S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" - -inherit allarch - -do_install() { - install -d ${D}${datadir}/${BPN} - cp -R --no-dereference --preserve=mode,links -v * ${D}${datadir}/${BPN} - chown -R root:root ${D}${datadir}/${BPN} - # Don't install patches to target - rm -rf ${D}${datadir}/${BPN}/patches - - install -d ${D}${sysconfdir}/apache2/conf.d - install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf - - # Remove a few scripts that explicitly require bash (!) - rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh -} - -FILES_${PN} = "${datadir}/${BPN} \ - ${sysconfdir}/apache2/conf.d" - -RDEPENDS_${PN} += "bash php-cli" diff --git a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.4.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.4.bb new file mode 100644 index 0000000000..43fed10810 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.0.4.bb @@ -0,0 +1,41 @@ +SUMMARY = "Web-based MySQL administration interface" +HOMEPAGE = "http://www.phpmyadmin.net" +# Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT +LICENSE = "GPLv2 & LGPLv3 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=dd6470bbcd3436ca317f82d34abaf688 \ + file://js/vendor/jquery/MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9 \ +" + +SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ + file://apache.conf \ +" + +SRC_URI[md5sum] = "38c6b9f38e4aeb68a2840d5903dd00c5" +SRC_URI[sha256sum] = "1578c1a08e594da4f4f62e676ccbdbd17784c3de769b094ba42c35bf05c057db" + +UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" +UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P\d+(\.\d+)+)-all-languages.tar.xz" + +S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" + +inherit allarch + +do_install() { + install -d ${D}${datadir}/${BPN} + cp -R --no-dereference --preserve=mode,links -v * ${D}${datadir}/${BPN} + chown -R root:root ${D}${datadir}/${BPN} + # Don't install patches to target + rm -rf ${D}${datadir}/${BPN}/patches + + install -d ${D}${sysconfdir}/apache2/conf.d + install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf + + # Remove a few scripts that explicitly require bash (!) + rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh +} + +FILES_${PN} = "${datadir}/${BPN} \ + ${sysconfdir}/apache2/conf.d" + +RDEPENDS_${PN} += "bash php-cli" diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb deleted file mode 100644 index 29038ac19a..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "A simple text editor for Xfce" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "gtk+3 gtksourceview3 xfconf xfce4-dev-tools-native" - -inherit xfce-app gsettings mime-xdg - -SRC_URI[md5sum] = "98d908842d4a93c35756a67d681c08fe" -SRC_URI[sha256sum] = "84c02adfca7f8b33b9466a306ded72fb9f38f93c9edb78660343854c4a3aded7" - -FILES_${PN} += " \ - ${datadir}/glib-2.0/schemas \ - ${datadir}/polkit-1 \ -" diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.1.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.1.bb new file mode 100644 index 0000000000..47bf1e2213 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "A simple text editor for Xfce" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "gtk+3 gtksourceview3 xfconf xfce4-dev-tools-native" + +inherit xfce-app gsettings mime-xdg + +SRC_URI[sha256sum] = "3d2e277b1ae82dd0f0fa25e27169491fc38c2b70a9a624f2ea472604b317a582" + +FILES_${PN} += " \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/metainfo \ + ${datadir}/polkit-1 \ +" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch index 80cdfb9039..b5421f6f74 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch @@ -12,11 +12,11 @@ diff --git a/Makefile.in.in b/Makefile.in.in index c0ce866..c2f26fe 100644 --- a/Makefile.in.in +++ b/Makefile.in.in -@@ -61,7 +61,6 @@ install: all xfce4-panel-profiles.1.gz +@@ -70,7 +70,6 @@ install: all xfce4-panel-profiles.1 install data/metainfo/*.xml $(DESTDIR)/$(PREFIX)/share/metainfo cp -rf locale $(DESTDIR)/$(PREFIX)/share - ln -sf $(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale - install -d $(DESTDIR)/$(PREFIX)/share/man/man1 - install xfce4-panel-profiles.1.gz $(DESTDIR)/$(PREFIX)/share/man/man1 + install -d $(DESTDIR)/$(MANDIR)/man1 + install xfce4-panel-profiles.1 $(DESTDIR)/$(MANDIR)/man1 diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.10.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.10.bb deleted file mode 100644 index 7226b1a032..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.10.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Backup, restore, import, and export panel layouts" -SECTION = "x11/application" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -inherit python3native gettext features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -DEPENDS += "intltool-native" - -SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BP}.tar.bz2 \ - file://not-create-link-to-locale.patch \ - " -SRC_URI[md5sum] = "6190678bc701c197babcb2389ba46182" -SRC_URI[sha256sum] = "a84d5e748d53bc5da269954cc3ad7f5ac0c4f5813acfd3892ea6f9064f17fb68" - -do_configure() { - # special configure - no autotools... - ./configure --prefix=${prefix} -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install - sed -i 's:${PYTHON}:python3:g' ${D}${bindir}/xfce4-panel-profiles -} - -FILES_${PN} += "${datadir}/metainfo" - -RDEPENDS_${PN} += "python3-pygobject python3-pexpect" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb new file mode 100644 index 0000000000..1fcb7edc03 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb @@ -0,0 +1,29 @@ +SUMMARY = "Backup, restore, import, and export panel layouts" +SECTION = "x11/application" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit python3native gettext gtk-icon-cache features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS += "intltool-native" + +SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BP}.tar.bz2 \ + file://not-create-link-to-locale.patch \ + " +SRC_URI[sha256sum] = "246e459d2d2f3f524968440ed7fddb2a891567ebc05f10a800f7f5821b3452a7" + +do_configure() { + # special configure - no autotools... + ./configure --prefix=${prefix} +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + sed -i 's:${PYTHON}:python3:g' ${D}${bindir}/xfce4-panel-profiles +} + +FILES_${PN} += "${datadir}/metainfo" + +RDEPENDS_${PN} += "python3-pygobject python3-pexpect" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch deleted file mode 100644 index 94cad23f8e..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch +++ /dev/null @@ -1,14 +0,0 @@ -'@include' is not a standard sysntax and not supported by oe. - -Upstream-Status: Submitted [https://bugzilla.xfce.org/show_bug.cgi?id=15626] - -Signed-off-by: Kai Kang ---- -diff --git a/data/xfce4-screensaver.common-auth b/data/xfce4-screensaver.common-auth -index a9fd9ce..3bfea70 100644 ---- a/data/xfce4-screensaver.common-auth -+++ b/data/xfce4-screensaver.common-auth -@@ -1,2 +1,2 @@ --@include common-auth -+auth include common-auth - auth optional pam_gnome_keyring.so diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.10.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.10.bb deleted file mode 100644 index 62f0640f09..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.10.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Xfce screensaver Application" -DESCRIPTION = "Xfce screensaver is a screen saver and locker that aims to have simple, sane, secure defaults and be well integrated with the desktop." -HOMEPAGE = "https://git.xfce.org/apps/xfce4-screensaver/about/" -SECTION = "x11/application" - -LICENSE = "GPLv2+ & LGPLv2+ " -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ - " - -DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3" - -inherit xfce-app - -SRC_URI_append = " \ - file://fix-cross-compile.patch \ - file://fix-pam-config.patch \ -" -SRC_URI[md5sum] = "1f093cde5af09e9fd9be017774e032ef" -SRC_URI[sha256sum] = "586f1c78dd6745a20e9ce9f12d0117189d597ba7ad0c8ffcfcd25c9bb05f1d57" - -do_install_append() { - install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver -} - -FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" -RDEPENDS_${PN} += "python3-core" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb new file mode 100644 index 0000000000..d4ea43ce1c --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Xfce screensaver Application" +DESCRIPTION = "Xfce screensaver is a screen saver and locker that aims to have simple, sane, secure defaults and be well integrated with the desktop." +HOMEPAGE = "https://git.xfce.org/apps/xfce4-screensaver/about/" +SECTION = "x11/application" + +LICENSE = "GPLv2+ & LGPLv2+ " +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + " + +DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3" + +inherit xfce-app + +SRC_URI_append = " file://fix-cross-compile.patch" +SRC_URI[sha256sum] = "6d4d143e3e62db679ce83ce7da97903390773ee0a8ceb05ff4c3dac36616268d" + +do_install_append() { + install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver +} + +FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" + +RDEPENDS_${PN} += "python3-core" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb deleted file mode 100644 index a0de630040..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Application to take screenshots" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" - -inherit xfce-app - -SRC_URI[md5sum] = "9b63c0fa7cbde8ec4e6cacb75fc44b65" -SRC_URI[sha256sum] = "0f7161053a23a6413376f4d17db6b774d4849384a9b1ffe01fdb2b0035a070d1" - -do_compile_prepend() { - mkdir -p lib - mkdir -p src panel-plugin -} - -FILES_${PN} += " \ - ${datadir}/metainfo \ - ${datadir}/xfce4/panel/plugins \ - ${libdir}/xfce4/panel/plugins \ -" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb new file mode 100644 index 0000000000..9e2497d43d --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb @@ -0,0 +1,21 @@ +SUMMARY = "Application to take screenshots" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" + +inherit xfce-app + +SRC_URI[sha256sum] = "6f029d614ad3b63fbcf742984dc6c976f3008e7d88fa487d49ed544f56f62c50" + +do_compile_prepend() { + mkdir -p lib + mkdir -p src panel-plugin +} + +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/xfce4/panel/plugins \ + ${libdir}/xfce4/panel/plugins \ +" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.3.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.3.bb deleted file mode 100644 index 2560094856..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.3.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Easy to use task manager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-app - -DEPENDS += "gtk+3 cairo libwnck libxmu xfce4-dev-tools-native exo-native" - -SRC_URI[md5sum] = "202928c8ff0678a9df949d22a43f1614" -SRC_URI[sha256sum] = "dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.4.0.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.4.0.bb new file mode 100644 index 0000000000..d41ee894ac --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.4.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Easy to use task manager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-app + +DEPENDS += "gtk+3 cairo libwnck libxmu xfce4-dev-tools-native" + +SRC_URI[sha256sum] = "655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb new file mode 100644 index 0000000000..783d386523 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb @@ -0,0 +1,13 @@ +SUMMARY = "Terminal emulator for the Xfce desktop environment" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui" + +inherit xfce-app + +FILES_${PN} += "${datadir}/xfce4 \ + ${datadir}/gnome-control-center" + +SRC_URI[sha256sum] = "7a3337c198e01262a0412384823185753ac8a0345be1d6776a7e9bbbcbf33dc7" + +RRECOMMENDS_${PN} += "vte-prompt" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.2.bb deleted file mode 100644 index ba0f127717..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Terminal emulator for the Xfce desktop environment" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui" - -inherit xfce-app - -FILES_${PN} += "${datadir}/xfce4 \ - ${datadir}/gnome-control-center" - -SRC_URI[md5sum] = "d0308313def5d7cc51070a6db1cf24dc" -SRC_URI[sha256sum] = "9ba23bf86d350ef8a95d2dfb50bbd1bbb2144d82985a779ec28caf47faaeeeeb" - -RRECOMMENDS_${PN} += "vte-prompt" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.0.bb deleted file mode 100644 index 1216456b45..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "A calculator plugin for the Xfce panel" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=909430f63fddd63f120ba29e8979f65c" - -inherit xfce-panel-plugin gtk-icon-cache - -SRC_URI[md5sum] = "1ae192a69834ee2f51f34a0a981181f4" -SRC_URI[sha256sum] = "7b50ab947ab058e1c079113e7f0f8b38ef242fec36ec9f31bb4e3c19cb3f9de9" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.1.bb new file mode 100644 index 0000000000..6ed9e35d77 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.1.bb @@ -0,0 +1,8 @@ +SUMMARY = "A calculator plugin for the Xfce panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=909430f63fddd63f120ba29e8979f65c" + +inherit xfce-panel-plugin gtk-icon-cache + +SRC_URI[sha256sum] = "e4016a03c3ef4ebddd97e4135f5e304f80677033c98e19644b9989ec6f5ada81" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb index 8dfb2e626d..1cb489f7e8 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" inherit xfce-panel-plugin xfce-git gtk-icon-cache perlnative -DEPENDS += "exo-native libwnck3 xfconf" +DEPENDS += "xfce4-dev-tools-native libwnck3 xfconf" -PV = "0.1.0+gitr${SRCPV}" +PV = "4.16.0" -SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master" -SRCREV = "6ed5c3ee1ba7103ca854c5e81fb2c1220b913a40" +SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git" +SRCREV = "538f9acfc5d5019f5cde734d056bcc0c95da9b4c" S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-maintainer-mode" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.1.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.1.0.bb deleted file mode 100644 index eeb54b315e..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin with graphical representation of the cpu frequency" -HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "48ead9dcc019212795637c170d9e2ca2" -SRC_URI[sha256sum] = "3ece0a24e55827e0d9b6314129906da60513acdc1748d9dece9f50526e906ba4" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.0.bb new file mode 100644 index 0000000000..55941d74b8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.0.bb @@ -0,0 +1,8 @@ +SUMMARY = "Panel plugin with graphical representation of the cpu frequency" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "7866dddbbe0557a9bfe603934e9ce82df968fe36e21533d05ee71704e6602da7" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.0.bb deleted file mode 100644 index a1fc139bb4..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin displaying date and time and a calendar when left-clicked" -HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "b88e47af4e9e156e43dc993f18218bd3" -SRC_URI[sha256sum] = "cd358bc2ff0707b8ef1504396a19b0a27f802c2ec7bceb5cebe2c7baf6adebd4" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.1.bb new file mode 100644 index 0000000000..f95995b07c --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.1.bb @@ -0,0 +1,8 @@ +SUMMARY = "Panel plugin displaying date and time and a calendar when left-clicked" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "e9f6f15be29ceb5c45718006b46dbd19b89981617d0768b2ef942b5a70af2540" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb deleted file mode 100644 index 6a72c89a65..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Panel plugin displaying instant disk/partition performance" -HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" - -inherit xfce-panel-plugin - -SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "538119ea97a217695b297e2d165b305f" -SRC_URI[sha256sum] = "fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.3.bb new file mode 100644 index 0000000000..31eeefd6ac --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.3.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin displaying instant disk/partition performance" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" + +inherit xfce-panel-plugin + +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" +SRC_URI[sha256sum] = "73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.6.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.6.0.bb deleted file mode 100644 index 387b183f1b..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.6.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "A panel plugin that embeds arbitrary windows (or GtkPlug widgets) into the panel." -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit xfce-panel-plugin - -# DEPENDS += "xfconf xorgproto libxtst" - -SRC_URI[md5sum] = "6870b116b85e4fa68d1b9ef76bd1d279" -SRC_URI[sha256sum] = "c767df6360e8194b32bc24823dd000975edba0cafe525c23d7854029359ee228" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb deleted file mode 100644 index 8b24e98b04..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Equake XFCE is a panel plugin for the XFCE panel which monitors earthquakes and displays an update each time a new earthquake occurs." -HOMEPAGE = "http://freecode.com/projects/equake-xfce" -SECTION = "x11/application" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -inherit xfce-panel-plugin - -DEPENDS += "curl" - -SRC_URI[md5sum] = "07d42b8a3d440d6f1861048a6cc3a15a" -SRC_URI[sha256sum] = "eff9cfd604d1bd998c5208176fbe2c6da705c250dce572f5e30b2c77f4ec741c" - -FILES_${PN} += "${libdir}/xfce4/panel-plugins/xfce4-equake-plugin" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.1.bb deleted file mode 100644 index 183d521afd..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "The FSGuard panel plugin checks free space on a chosen mount point frequently and displays a message when a limit is reached" -HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=3434d79d62df09abf5f78bb76d6cd21b" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "d1e1fda4e80c36741643b1d9eca5c5c1" -SRC_URI[sha256sum] = "d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.2.bb new file mode 100644 index 0000000000..5585a4f0aa --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.2.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "The FSGuard panel plugin checks free space on a chosen mount point frequently and displays a message when a limit is reached" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=3434d79d62df09abf5f78bb76d6cd21b" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.2.bb deleted file mode 100644 index 3108a77602..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "This plugin cyclically spawns the indicated script/program, captures its output (stdout) and displays the resulting string into the panel." -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "d808fe77a438c95b97ec6feda6162d22" -SRC_URI[sha256sum] = "256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.1.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.1.0.bb new file mode 100644 index 0000000000..a51c52f23b --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.1.0.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "This plugin cyclically spawns the indicated script/program, captures its output (stdout) and displays the resulting string into the panel." +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "d1256b4b47545c7bdb16842b21eaf3ac167be443e8f2f1093cf4209e65c84e7d" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin/0001-CMakeLists.txt-fix-library-install-path.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin/0001-CMakeLists.txt-fix-library-install-path.patch deleted file mode 100644 index df348dc852..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin/0001-CMakeLists.txt-fix-library-install-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Submitted [https://github.com/brianhsu/xfce4-hotcorner-plugin/pull/8] - -The library install path may be ${CMAKE_INSTALL_PREFIX}/lib64 rather -than fixed ${CMAKE_INSTALL_PREFIX}/lib. Provide a variable to make it -could override by cmake command line. - -Signed-off-by: Kai Kang ---- - CMakeLists.txt | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e193787..84cb52d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,8 +10,9 @@ include(GNUInstallDirs) - - PKG_CHECK_MODULES(GTK REQUIRED libxfce4panel-1.0 libxfce4ui-1 libwnck-3.0) - --set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) --set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -+set(BASE_LIB_PATH "lib" CACHE STRING "base library install path") -+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BASE_LIB_PATH}) -+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BASE_LIB_PATH}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - - INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS}) -@@ -28,7 +29,7 @@ ADD_LIBRARY(hotcorner SHARED src/hotcorner.c src/util.c) - - TARGET_LINK_LIBRARIES(hotcorner ${GTK_LIBRARIES}) - --INSTALL(TARGETS hotcorner LIBRARY DESTINATION lib/xfce4/panel/plugins/) -+INSTALL(TARGETS hotcorner LIBRARY DESTINATION ${BASE_LIB_PATH}/xfce4/panel/plugins/) - INSTALL(FILES hotcorner.desktop DESTINATION share/xfce4/panel/plugins/) - GETTEXT_CREATE_TRANSLATIONS(po/xfce4-hotcorner-plugin.pot ALL po/zh_TW.po) - --- -2.11.0 - diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb deleted file mode 100644 index 57a815b1b5..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Plugin providing hotcorners" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README.md;beginline=48;endline=53;md5=2c694b8e0f73274b13465b509e4f5427" - -inherit xfce-panel-plugin cmake - -DEPENDS += "libwnck3" - -SRC_URI = "https://github.com/brianhsu/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-CMakeLists.txt-fix-library-install-path.patch" -SRC_URI[md5sum] = "ac31b45cda1867cb6bd69bb285638263" -SRC_URI[sha256sum] = "942684c92f96a158e1417e597947f822769ac56aa1993a8c9f166ee633ef2b8d" - -EXTRA_OECMAKE = "-DBASE_LIB_PATH=${baselib}" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch index e2165c2fa5..d81f702891 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch @@ -14,38 +14,38 @@ Signed-off-by: Khem Raj Patch Reworked for xfce4-mount-plugin 0.6.4->1.1.2 Signed-off-by: Andreas Müller --- - configure.ac | 1 + + configure.ac | 2 + panel-plugin/devices.c | 22 +++++++++++++++++++--- - 2 files changed, 20 insertions(+), 3 deletions(-) + 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index b131117..c633fef 100644 +index 375e64a..590b7ad 100644 --- a/configure.ac +++ b/configure.ac -@@ -69,6 +69,7 @@ AC_CHECK_HEADERS([sys/socket.h]) - AC_CHECK_HEADERS([sys/time.h]) - AC_CHECK_HEADERS([unistd.h]) - AC_CHECK_HEADERS([sys/sockio.h]) +@@ -65,6 +65,9 @@ dnl param.h is part of libc6 on Linux, but important for old-style Unix and espe + AC_CHECK_HEADERS([sys/param.h]) + AC_CHECK_HEADERS([sys/mount.h]) + ++dnl make musl happy +AC_CHECK_HEADERS([fstab.h]) - AC_HEADER_SYS_WAIT - AC_PROG_GCC_TRADITIONAL - AC_TYPE_SIZE_T ++ + dnl Add -traditional to output variable CC if using the GNU C compiler and ioctl does not work properly without -traditional. That usually happens when the fixed header files have not been installed on an old system. Leave here commented out to comment in if some older *NIX systems might require it as was recently written on the ML. + dnl AC_PROG_GCC_TRADITIONAL + diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c index 797b079..d29df56 100644 --- a/panel-plugin/devices.c +++ b/panel-plugin/devices.c -@@ -24,8 +24,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - #ifdef HAVE_CONFIG_H +@@ -25,7 +25,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include #endif -- + +#if HAVE_FSTAB_H #include +#endif -+ #include #include - #include + #include @@ -468,11 +470,12 @@ disks_new (gboolean include_NFSs, gboolean *showed_fstab_dialog, gint length) { GPtrArray * pdisks; /* to be returned */ diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.3.bb deleted file mode 100644 index 4600104ad1..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Mount/umount utility for the xfce panel" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-panel-plugin - -SRC_URI += "file://0001-check-for-fstab.h-during-configure.patch" -SRC_URI[md5sum] = "2f1f903d0bdf6ee6776afd8af73497ac" -SRC_URI[sha256sum] = "aae5bd6b984bc78daf6b5fb9d15817a27253674a4264ad60f62ccb1aa194911e" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb new file mode 100644 index 0000000000..3f35b8c248 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb @@ -0,0 +1,11 @@ +SUMMARY = "Mount/umount utility for the xfce panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +SRC_URI += "file://0001-check-for-fstab.h-during-configure.patch" + +SRC_URI[sha256sum] = "584cd954929e542b3da0ff8d69e0325d8838dc39e7b32a509d1074ce3bb58ec2" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch deleted file mode 100644 index e1ede27c42..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0218e5ebf38f94d58b908fca451ba3789efa8899 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 20 Sep 2013 23:09:25 +0200 -Subject: [PATCH] main-status-icon.c remove deprecated g_type_init -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -this file was auto created by valac and xfce-vala when creating tarball. So - -Upstream-Status: Inappropriate [other] - -Signed-off-by: Andreas Müller ---- - src/main-status-icon.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/main-status-icon.c b/src/main-status-icon.c -index c6d73f8..f7db773 100644 ---- a/src/main-status-icon.c -+++ b/src/main-status-icon.c -@@ -290,7 +290,6 @@ gint _vala_main (char** args, int args_length1) { - - - int main (int argc, char ** argv) { -- g_type_init (); - return _vala_main (argv, argc); - } - --- -1.8.3.1 - diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch deleted file mode 100644 index 8066df0041..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch +++ /dev/null @@ -1,53 +0,0 @@ -Fix formatting strings when compiling with Wformat options - -Imported from debian - ---- a/lib/application.c -+++ b/lib/application.c -@@ -352,7 +352,7 @@ static void xnp_application_update_notes - XfconfChannel* _tmp16_; - const gchar* _tmp17_; - _tmp9_ = _ ("Select notes path"); -- _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp9_); -+ _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp9_); - g_object_ref_sink (_tmp10_); - error_dialog = _tmp10_; - _tmp11_ = error_dialog; -@@ -419,7 +419,7 @@ static void xnp_application_update_notes - XfconfChannel* _tmp35_; - const gchar* _tmp36_; - _tmp27_ = _ ("Select notes path"); -- _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp27_); -+ _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp27_); - g_object_ref_sink (_tmp28_); - error_dialog = _tmp28_; - _tmp29_ = error_dialog; -@@ -2082,7 +2082,7 @@ static void xnp_application_delete_windo - gint _tmp9_; - _tmp3_ = window; - _tmp4_ = _ ("Are you sure you want to delete this group?"); -- _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp4_); -+ _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp4_); - g_object_ref_sink (_tmp5_); - dialog = _tmp5_; - _tmp6_ = dialog; -@@ -2721,7 +2721,7 @@ void xnp_application_open_settings_dialo - e = _inner_error_; - _inner_error_ = NULL; - _tmp0_ = _ ("Unable to open the settings dialog"); -- _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp0_); -+ _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp0_); - g_object_ref_sink (_tmp1_); - error_dialog = _tmp1_; - _tmp2_ = error_dialog; ---- a/lib/window.c -+++ b/lib/window.c -@@ -3542,7 +3542,7 @@ void xnp_window_delete_note (XnpWindow* - GtkMessageDialog* _tmp13_; - gint _tmp14_; - _tmp9_ = _ ("Are you sure you want to delete this note?"); -- _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp9_); -+ _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp9_); - g_object_ref_sink (_tmp10_); - dialog = _tmp10_; - _tmp11_ = dialog; diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb deleted file mode 100644 index fcf98c181b..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Notes plugin for the Xfce Panel" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-panel-plugin - -DEPENDS += "gtk+ libxfce4ui xfce4-panel xfconf libunique" - -SRC_URI += " \ - file://0001-main-status-icon.c-remove-deprecated-g_type_init.patch \ - file://01_fix_format-string.patch \ -" -SRC_URI[md5sum] = "31cb9520b01512a94344770b4befdb3b" -SRC_URI[sha256sum] = "07a4c3e71431c24f97d2e270452dd0fa51ff0bdb6219a13a20d0bfa8d9de54b2" - -FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so.*" - -# *.so are required for plugin detection -INSANE_SKIP_${PN} = "dev-so" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch deleted file mode 100644 index 30cb487c8f..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 6c6de7c07290248a3c72a50c7790885ee4bc13a2 Mon Sep 17 00:00:00 2001 -From: Robin Lee -Date: Mon, 24 Feb 2020 17:52:39 +0800 -Subject: [PATCH] Fix multiple definition errors under GCC 10.0 - -Fixes #16436, RHBZ#1800268 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - include/sensors-interface-common.h | 22 ++++++++++++++-------- - lib/sensors-interface-common.c | 1 + - 2 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/include/sensors-interface-common.h b/include/sensors-interface-common.h -index 62a27eb..05146c5 100644 ---- a/include/sensors-interface-common.h -+++ b/include/sensors-interface-common.h -@@ -146,6 +146,12 @@ t_sensors_dialog; - - - -+#ifdef XFCE4_SENSORS_INTERFACE_COMMON_DEFINING -+#define EXTERN -+#else -+#define EXTERN extern -+#endif -+ - /* Extern functions that need to be re-implemented in the sensors-viewer and - * the panel code. - * They kind of need to be registered at the library by any software -@@ -157,7 +163,7 @@ t_sensors_dialog; - * @param ptr_widget: Pointer to original widget, i.e, the update timer box - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*adjustment_value_changed) (GtkWidget *ptr_widget, - t_sensors_dialog *ptr_sensorsdialog); - -@@ -167,7 +173,7 @@ void - * @param ptr_widget: Pointer to original widget, i.e, the sensor entry combobox - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*sensor_entry_changed) (GtkWidget *ptr_widget, - t_sensors_dialog *ptr_sensorsdialog); - -@@ -178,7 +184,7 @@ void - * @param ptr_str_newtext: Pointer to the string containing the new label - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*list_cell_text_edited) (GtkCellRendererText *ptr_cellrenderertext, - gchar *ptr_str_path, gchar *ptr_str_newtext, - t_sensors_dialog *ptr_sensorsdialog); -@@ -189,7 +195,7 @@ void - * @param ptr_str_path: pointer to the string with the path of the changed item - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*list_cell_toggle) (GtkCellRendererToggle *ptr_cellrenderertoggle, gchar *ptr_str_path, - t_sensors_dialog *ptr_sensorsdialog); - -@@ -201,7 +207,7 @@ void - * hexadecimal rgb format #0011ff - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*list_cell_color_edited) (GtkCellRendererText *ptr_cellrenderertext, - gchar *ptr_str_path, gchar *ptr_str_newcolor, - t_sensors_dialog *ptr_sensorsdialog); -@@ -214,7 +220,7 @@ void - * temperature - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*minimum_changed) (GtkCellRendererText *ptr_cellrenderertext, gchar *ptr_str_path, - gchar *ptr_str_newmin, t_sensors_dialog *ptr_sensorsdialog); - -@@ -226,7 +232,7 @@ void - * temperature - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*maximum_changed) (GtkCellRendererText *ptr_cellrenderertext, gchar *ptr_str_path, - gchar *ptr_str_newmax, t_sensors_dialog *ptr_sensorsdialog); - -@@ -236,7 +242,7 @@ void - * @param ptr_widget: Pointer to original widget, i.e, the update timer box - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*temperature_unit_change) (GtkWidget *ptr_widget, - t_sensors_dialog *ptr_sensorsdialog); - -diff --git a/lib/sensors-interface-common.c b/lib/sensors-interface-common.c -index 70aa154..8c79f1d 100644 ---- a/lib/sensors-interface-common.c -+++ b/lib/sensors-interface-common.c -@@ -28,6 +28,7 @@ - #include - - /* Local/package includes */ -+#define XFCE4_SENSORS_INTERFACE_COMMON_DEFINING - #include - #include - #include --- -2.24.1 - diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb deleted file mode 100644 index aa5fe019d5..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Sensors plugin for the Xfce Panel" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" -SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" -SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch \ - file://0001-Fix-multiple-definition-errors-under-GCC-10.0.patch \ - " - -EXTRA_OECONF = " \ - --disable-procacpi \ - --disable-xnvctrl \ -" - -do_configure_prepend() { - sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac -} - -PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" -PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" -PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" -PACKAGECONFIG[libnotify] = "--enable-notification,--disable-notification, libnotify" - -FILES_SOLIBSDEV = "${libdir}/xfce4/modules/lib*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.95.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.95.bb new file mode 100644 index 0000000000..3c7fa9a915 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.95.bb @@ -0,0 +1,25 @@ +SUMMARY = "Sensors plugin for the Xfce Panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c" +SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" + +EXTRA_OECONF = " \ + --disable-procacpi \ + --disable-xnvctrl \ +" + +do_configure_prepend() { + sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac +} + +PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" +PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" +PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" +PACKAGECONFIG[libnotify] = "--enable-notification,--disable-notification, libnotify" + +FILES_SOLIBSDEV = "${libdir}/xfce4/modules/lib*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.1.bb deleted file mode 100644 index fa2c474d67..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin allowing to send requests directly to browser" -HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "f1c97ac62dd9054e8f2b01568fef3ba6" -SRC_URI[sha256sum] = "3e28fb7cd2e2251e89a8715684081b862406e3fb4e6d8c0caa1b798a97703600" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.2.bb new file mode 100644 index 0000000000..81370e3c11 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.2.bb @@ -0,0 +1,8 @@ +SUMMARY = "Panel plugin allowing to send requests directly to browser" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "2a279e2f5a54518684e62ad1f3cd8ef950826505b39725f1b5d8f0c43031cdd3" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.3.bb deleted file mode 100644 index 88d40c4951..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Panel plugin displaying current CPU load, the memory in use, the swap space and the system uptime" -HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8" - -inherit xfce-panel-plugin - -DEPENDS += "upower" - -SRC_URI[md5sum] = "5d75865be699d0b3d36a5fc17ed02d44" -SRC_URI[sha256sum] = "052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.4.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.4.bb new file mode 100644 index 0000000000..b966711bdf --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.4.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Panel plugin displaying current CPU load, the memory in use, the swap space and the system uptime" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8" + +inherit xfce-panel-plugin + +DEPENDS += "upower" + +SRC_URI[sha256sum] = "0531b8df923cba3be8d064cb8b638b954df74915e5a447228999517847789835" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.0.bb deleted file mode 100644 index 36e04a438b..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Verve panel plugin is a comfortable command line plugin for the Xfce panel" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "94429b1be9d66ba9b31e4aafb726a8c7" -SRC_URI[sha256sum] = "9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.1.bb new file mode 100644 index 0000000000..5902ad0bd5 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.1.bb @@ -0,0 +1,8 @@ +SUMMARY = "Verve panel plugin is a comfortable command line plugin for the Xfce panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb deleted file mode 100644 index 95c1fe4d90..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin displaying stats from a wireless lan interface" -HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "e4e3d5240297253d242464e77f6145df" -SRC_URI[sha256sum] = "f41f81ea063ae3c7d7904e1ee647a6b5efafc7436f47caed662ee417038eed17" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.2.bb new file mode 100644 index 0000000000..c52b35d02f --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.2.bb @@ -0,0 +1,8 @@ +SUMMARY = "Panel plugin displaying stats from a wireless lan interface" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "ea7aa36650c596b1a29567d100776c68ed732aaf0f48c92245c4466058b5481d" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb deleted file mode 100644 index bbb274ed96..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "An alternate menu for the Xfce desktop environment" -HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit xfce-panel-plugin cmake - -SRC_URI[md5sum] = "81a4a4c7635273485fac5c2d98e48d02" -SRC_URI[sha256sum] = "8974d38cc87df528693efe4b6e14bcd233cdb49d2018a23ddddf745110b25744" - -RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb new file mode 100644 index 0000000000..6077fdfc6e --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "An alternate menu for the Xfce desktop environment" +HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin cmake + +SRC_URI[sha256sum] = "b2074f8a9caa766e2d97f0b960ef2f4d1e20dd804497229bc1f0157791896925" + +RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb deleted file mode 100644 index 8ee374035a..0000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "XKB layout switching panel plug-in for the Xfce desktop environment" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=496f09f084b0f7e6f02f769a84490c6b" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "72530bf59d7cd902326469e5a7a9892b" -SRC_URI[sha256sum] = "c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1" - -DEPENDS += "libxklavier libwnck3 librsvg garcon" - -FILES_${PN} += "${datadir}/xfce4/xkb" - -RDEPENDS_${PN} = "xfce4-settings" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.2.bb new file mode 100644 index 0000000000..bf9e0435b8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "XKB layout switching panel plug-in for the Xfce desktop environment" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=496f09f084b0f7e6f02f769a84490c6b" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967" + +DEPENDS += "libxklavier libwnck3 librsvg garcon" + +FILES_${PN} += "${datadir}/xfce4/xkb" + +RDEPENDS_${PN} = "xfce4-settings" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.11.bb b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.11.bb deleted file mode 100644 index 4a5a7720ee..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.11.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "Application library for the Xfce desktop environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gtk+3 libxfce4ui virtual/libx11 liburi-perl-native cairo" -DEPENDS_class-native = "glib-2.0-native xfce4-dev-tools-native intltool-native" - -inherit xfce perlnative gtk-doc features_check mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" -REQUIRED_DISTRO_FEATURES_class-native = "" - -# SRC_URI must follow inherited one -SRC_URI += " \ - file://exo-no-tests-0.8.patch \ - file://configure.patch \ -" - -SRC_URI_append_class-native = " \ - file://reduce-build-to-exo-csource-only.patch \ -" - -SRC_URI[md5sum] = "efeb039d64b3257e39a1a38e75eb19b1" -SRC_URI[sha256sum] = "ec892519c08a67f3e0a1f0f8d43446e26871183e5aa6be7f82e214f388d1e5b6" - -PACKAGECONFIG ??= "" -PACKAGECONFIG_class-target ??= "gtk" -PACKAGECONFIG[gtk] = "--enable-gtk2,--disable-gtk2,gtk+" - -PACKAGES =+ "exo-csource" - -# Note: python bindings did not work in oe-dev and are about to be moved to -# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 -FILES_${PN} += " \ - ${datadir}/xfce4/ \ - ${libdir}/xfce4/exo* \ -" - -FILES_exo-csource += "${bindir}/exo-csource" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.0.bb new file mode 100644 index 0000000000..5b91b8b7ee --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Application library for the Xfce desktop environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gtk+3 libxfce4ui virtual/libx11 liburi-perl-native cairo" + +inherit xfce perlnative gtk-doc features_check mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +# SRC_URI must follow inherited one +SRC_URI += " \ + file://exo-no-tests-0.8.patch \ + file://configure.patch \ +" + +SRC_URI[sha256sum] = "1975b00eed9a8aa1f899eab2efaea593731c19138b83fdff2f13bdca5275bacc" + +# Note: python bindings did not work in oe-dev and are about to be moved to +# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 +FILES_${PN} += " \ + ${datadir}/xfce4/ \ + ${libdir}/xfce4/exo* \ +" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.7.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.7.0.bb deleted file mode 100644 index c4b858fd73..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.7.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Xfce Menu Library" -SECTION = "x11/libs" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" -DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" - -inherit xfce gtk-doc features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" -SRC_URI[md5sum] = "2964c7a7e5d4aac58b4afef9b8602914" -SRC_URI[sha256sum] = "82c3b61b508011642b09e6fb01b1d3f22c4e4de0fc54a9244327d0ddb66b2423" - -EXTRA_OECONF = "--disable-gtk-doc" - -FILES_${PN} += "${datadir}/desktop-directories" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb new file mode 100644 index 0000000000..bbaa6fd6f7 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Xfce Menu Library" +SECTION = "x11/libs" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" +DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" + +inherit xfce gtk-doc gobject-introspection features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" +SRC_URI[sha256sum] = "4811d89ee5bc48dbdeffd69fc3eec6c112bbf01fde98a9e848335b374a4aa1bb" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/garcon/.libs" +} + +FILES_${PN} += "${datadir}/desktop-directories" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch index 6d107b1b61..616142761e 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch @@ -19,7 +19,7 @@ index 723a10d..e6502f3 100644 --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml @@ -75,4 +75,8 @@ - + + diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb deleted file mode 100644 index 348b685be3..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Xfce4 Widget library and X Window System interaction" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "intltool-native perl-native gtk+ gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" - -inherit xfce gtk-doc gobject-introspection features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " \ - file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ -" -SRC_URI[md5sum] = "50eae4bab5eeced186bce16fb5f802ac" -SRC_URI[sha256sum] = "c449075eaeae4d1138d22eeed3d2ad7032b87fb8878eada9b770325bed87f2da" - -EXTRA_OECONF += "--with-vendor-info=${DISTRO}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" - -PACKAGES =+ "${PN}-gtk2 ${PN}-gtk3" -FILES_${PN}-gtk2 += "${libdir}/libxfce4ui-1.so.* ${libdir}/libxfce4kbd-private-2.so.*" -FILES_${PN}-gtk3 += "${libdir}/libxfce4ui-2.so.* ${libdir}/libxfce4kbd-private-3.so.*" - -PACKAGES += "${PN}-glade" -FILES_${PN}-glade = " \ - ${libdir}/glade \ - ${datadir}/glade \ -" - -RDEPENDS_${PN}-gtk2 = "${PN}" -RDEPENDS_${PN}-gtk3 = "${PN}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb new file mode 100644 index 0000000000..7a269ad666 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Xfce4 Widget library and X Window System interaction" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" +DEPENDS = "intltool-native perl-native gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" + +inherit xfce gtk-doc gobject-introspection features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +# TODO: Check if this can go +SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" +SRC_URI[sha256sum] = "8b06c9e94f4be88a9d87c47592411b6cbc32073e7af9cbd64c7b2924ec90ceaa" + +EXTRA_OECONF += "--with-vendor-info=${DISTRO}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" + +PACKAGES += "${PN}-glade" +FILES_${PN}-glade = " \ + ${libdir}/glade \ + ${datadir}/glade \ +" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.14.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.14.0.bb deleted file mode 100644 index 1bb5007fd7..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.14.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Basic utility library for Xfce4" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" - -inherit xfce gtk-doc gobject-introspection - -SRC_URI[md5sum] = "46f44e36acc3abf1a5ba814c22a773cb" -SRC_URI[sha256sum] = "32ad79b7992ec3fd863e8ff2f03eebda8740363ef9d7d910a35963ac1c1a6324" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb new file mode 100644 index 0000000000..1a0b7183ee --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Basic utility library for Xfce4" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" +DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" + +inherit xfce gtk-doc gobject-introspection + +SRC_URI[sha256sum] = "60598d745d1fc81ff5ad3cecc3a8d1b85990dd22023e7743f55abd87d8b55b83" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index 255d2b5ebd..cd3fa26aa6 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -34,19 +34,15 @@ RRECOMMENDS_${PN} = " \ xfce4-systemload-plugin \ xfce4-time-out-plugin \ xfce4-timer-plugin \ - xfce4-embed-plugin \ xfce4-weather-plugin \ xfce4-fsguard-plugin \ xfce4-battery-plugin \ xfce4-mount-plugin \ xfce4-powermanager-plugin \ xfce4-closebutton-plugin \ - xfce4-equake-plugin \ - xfce4-notes-plugin \ xfce4-whiskermenu-plugin \ xfce4-mailwatch-plugin \ xfce4-smartbookmark-plugin \ - xfce4-hotcorner-plugin \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'xfce4-pulseaudio-plugin', '', d)} \ xfce4-sensors-plugin \ xfce4-calculator-plugin \ diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.5.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.5.bb deleted file mode 100644 index d499e22ea6..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.5.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Automatic management of removable drives and media for thunar" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo libnotify libgudev" - -inherit xfce features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[md5sum] = "f9ef39ed4bbff05eb74058dfff24dd84" -SRC_URI[sha256sum] = "7ea7c6693334f2248cf399586af8974dfb7db9aad685ee31ac100e62e19a1837" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" - -RDEPENDS_${PN} = "eject" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb new file mode 100644 index 0000000000..138796e6c4 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Automatic management of removable drives and media for thunar" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo libnotify libgudev" + +inherit xfce features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "d2c0e719b242b7fd3db70bc6678a2df1abf2cfaa899b775a1591a5efa08a547d" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" + +RDEPENDS_${PN} = "eject" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.15.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.15.bb deleted file mode 100644 index b1f1c967af..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.15.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "File manager for the Xfce Desktop Environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" - -inherit xfce gobject-introspection features_check mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[md5sum] = "303010f4959fa23f7c13c0ccd9b8527e" -SRC_URI[sha256sum] = "7624560cf21f13869804947042610aab22075146b711593f11ceb9e494277c93" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" - -FILES_${PN} += " \ - ${libdir}/thunarx-3/* \ - ${libdir}/xfce4/panel/plugins/* \ - ${libdir}/Thunar/[Tt]hunar* \ - ${systemd_user_unitdir} \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/polkit-1 \ - ${datadir}/Thunar \ - ${datadir}/xfce4/panel/plugins/* \ -" - -RRECOMMENDS_${PN} = "gvfs gvfsd-trash" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb new file mode 100644 index 0000000000..ae05f867f4 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "File manager for the Xfce Desktop Environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" + +inherit xfce gobject-introspection features_check mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "6277c448116a91ebfa564972645d8d79ef69864992a02bb164b7b13f98fdfd9b" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" + +FILES_${PN} += " \ + ${libdir}/thunarx-3/* \ + ${libdir}/xfce4/panel/plugins/* \ + ${libdir}/Thunar/[Tt]hunar* \ + ${systemd_user_unitdir} \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/polkit-1 \ + ${datadir}/Thunar \ + ${datadir}/xfce4/panel/plugins/* \ +" + +RRECOMMENDS_${PN} = "gvfs gvfsd-trash" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.3.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.3.1.bb deleted file mode 100644 index c9f2ddc8b1..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.3.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Thumbnail service implementing the thumbnail management D-Bus specification" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" - -inherit xfce gtk-doc - -SRC_URI[sha256sum] = "e4a30f3c0656b5b29fcd4a2450293f20f283a95b7fb0754a947c55427784c454" - -INSANE_SKIP_${PN} = "dev-so" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gstreamer-thumbnailer] = "--enable-gstreamer-thumbnailer,--disable-gstreamer-thumbnailer,gstreamer1.0 gstreamer1.0-plugins-base" - -do_install_append() { - # Makefile seems to race on creation of symlink. So ensure creation here - # until fixed properly - ln -sf tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so -} - -FILES_${PN} += "${datadir}/dbus-1/services \ - ${libdir}/tumbler-1/tumblerd \ - ${libdir}/tumbler-1/plugins/*.so \ - ${libdir}/tumbler-1/plugins/cache/*.so \ -" - -FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ - ${libdir}/tumbler-1/plugins/cache/*.la \ -" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb new file mode 100644 index 0000000000..fcc39fd7d8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Thumbnail service implementing the thumbnail management D-Bus specification" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" + +inherit xfce gtk-doc + +SRC_URI[sha256sum] = "9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66" + +INSANE_SKIP_${PN} = "dev-so" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gstreamer-thumbnailer] = "--enable-gstreamer-thumbnailer,--disable-gstreamer-thumbnailer,gstreamer1.0 gstreamer1.0-plugins-base" + +do_install_append() { + # Makefile seems to race on creation of symlink. So ensure creation here + # until fixed properly + ln -sf tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so +} + +FILES_${PN} += "${datadir}/dbus-1/services \ + ${libdir}/tumbler-1/tumblerd \ + ${libdir}/tumbler-1/plugins/*.so \ + ${libdir}/tumbler-1/plugins/cache/*.so \ +" + +FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ + ${libdir}/tumbler-1/plugins/cache/*.la \ +" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.14.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.14.0.bb deleted file mode 100644 index e4f35b0fc9..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.14.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Xfce4 Application Finder" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "glib-2.0 gtk+3 libxfce4util libxfce4ui garcon xfconf" - -inherit xfce features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[md5sum] = "03b226a2ee20f95243e74d1868e94e0e" -SRC_URI[sha256sum] = "7ec175d4954fceb2e76cbfbca76ac4a4f53fe799d097a14117e7de68e88a4d98" - -FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.0.bb new file mode 100644 index 0000000000..39198306b9 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Xfce4 Application Finder" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "glib-2.0 gtk+3 libxfce4util libxfce4ui garcon xfconf" + +inherit xfce features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "37b92aaaeeec8220ed23163cf89321168d3b49e0c48b4c10f12dc4a21fdf0954" + +FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-Run-native-xdt-csource-on-tests.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-Run-native-xdt-csource-on-tests.patch new file mode 100644 index 0000000000..74b1679ab4 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-Run-native-xdt-csource-on-tests.patch @@ -0,0 +1,33 @@ +From b2fcd5c09ee6b4ad03f93ee5e1dd32f2f062cf07 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 3 Jan 2021 15:36:07 +0100 +Subject: [PATCH] Run native xdt-csource on tests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Tests cannot be opted out so let them pass. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller +--- + tests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index fa0832c..7c46bbf 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -26,7 +26,7 @@ DISTCLEANFILES = test-xdt-csource-data.c + BUILT_SOURCES = test-xdt-csource-data.c + + test-xdt-csource-data.c: Makefile $(srcdir)/data/data.bin $(srcdir)/data/data.txt +- $(top_builddir)/xdt-csource/xdt-csource --extern --build-list data_bin $(srcdir)/data/data.bin data_txt $(srcdir)/data/data.txt > test-xdt-csource-data.c ++ xdt-csource --extern --build-list data_bin $(srcdir)/data/data.bin data_txt $(srcdir)/data/data.txt > test-xdt-csource-data.c + + clean-local: + rm -f *.core core core.* +-- +2.26.2 + diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.14.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.14.0.bb deleted file mode 100644 index 0b11966192..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.14.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Xfce4 development tools" -HOMEPAGE = "http://www.xfce.org" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" -DEPENDS = "glib-2.0" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native" - -SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "5f8fc8af73819c08d9e4c26a3ac457e7" -SRC_URI[sha256sum] = "2c9eb8e0fe23e47dc31411a93b683fd1b7a49140e9163f0aab9e94a3d8a0b5fd" - -do_install_append() { - install -d ${D}${datadir}/aclocal - install -m 644 ${S}/m4macros/*.m4 ${D}${datadir}/aclocal/ -} - -FILES_${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4" - -RDEPENDS_${PN} = "bash" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb new file mode 100644 index 0000000000..143a0a5e7a --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Xfce4 development tools" +HOMEPAGE = "http://www.xfce.org" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" + +DEPENDS = "glib-2.0" +DEPENDS_append_class-target = " ${BPN}-native" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" + +SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2" +SRC_URI_append_class-target = " file://0001-Run-native-xdt-csource-on-tests.patch" +SRC_URI[sha256sum] = "f50b3070e66f3ebdf331744dd1ec5e1af5de333965d491e15ce05545e8eb4f04" + +do_install_append() { + install -d ${D}${datadir}/aclocal + install -m 644 ${S}/m4macros/*.m4 ${D}${datadir}/aclocal/ +} + +FILES_${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4" + +RDEPENDS_${PN} = "bash" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.4.bb deleted file mode 100644 index 73cb82a15e..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.4.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Xfce4 Panel" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" -DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native" - -inherit xfce gtk-doc gobject-introspection features_check remove-libtool mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[md5sum] = "76efdbf7fb461f3058919c1309da67ca" -SRC_URI[sha256sum] = "8e5ea79412ba84cfada897ff309cbe2cd4aca16b9bd4f93df060229528576fd5" -SRC_URI += " \ - file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ - file://0002-use-lxdm-to-replace-dm-tool.patch \ -" - -python populate_packages_prepend() { - plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') - plugin_name = d.expand('${PN}-plugin-%s') - do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, - '${PN} plugin for %s', extra_depends='', prepend=True, - aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop', - '${sysconfdir}/xdg/xfce/panel/%s-*', - '${datadir}/icons/hicolor/48x48/apps/*-%s.png', - '${bindir}/*%s*']) -} - -PACKAGES_DYNAMIC += "^${PN}-plugin-.*" - -PACKAGES =+ "${PN}-gtk3" - -FILES_${PN} += "${libdir}/xfce4/panel/migrate \ - ${libdir}/xfce4/panel/wrapper-1.0" - -FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" - -FILES_${PN}-gtk3 = " \ - ${libdir}/libxfce4panel-2.0${SOLIBS} \ - ${libdir}/xfce4/panel/wrapper-2.0 \ -" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.0.bb new file mode 100644 index 0000000000..0b210ffcce --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.0.bb @@ -0,0 +1,40 @@ +SUMMARY = "Xfce4 Panel" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" +DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native" + +inherit xfce gtk-doc gobject-introspection features_check remove-libtool mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "5e979aeeb37d306d72858b1bc67448222ea7a68de01409055b846cd31f3cc53d" +SRC_URI += " \ + file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ + file://0002-use-lxdm-to-replace-dm-tool.patch \ +" + +python populate_packages_prepend() { + plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') + plugin_name = d.expand('${PN}-plugin-%s') + do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, + '${PN} plugin for %s', extra_depends='', prepend=True, + aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop', + '${sysconfdir}/xdg/xfce/panel/%s-*', + '${datadir}/icons/hicolor/48x48/apps/*-%s.png', + '${bindir}/*%s*']) +} + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*" + +PACKAGES =+ "${PN}-gtk3" + +FILES_${PN} += "${libdir}/xfce4/panel/migrate \ + ${libdir}/xfce4/panel/wrapper-1.0" + +FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" + +FILES_${PN}-gtk3 = " \ + ${libdir}/libxfce4panel-2.0${SOLIBS} \ + ${libdir}/xfce4/panel/wrapper-2.0 \ +" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb deleted file mode 100644 index 608990ad4b..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Power manager for the Xfce desktop environment" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-power-manager" -SECTION = "x11" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit xfce features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" - -SRC_URI[md5sum] = "19873fc8a6de5e37ed57036a0002a5ce" -SRC_URI[sha256sum] = "1b7bf0d3e8af69b10f7b6a518451e01fc7888e0d9d360bc33f6c89179bb6080b" - -EXTRA_OECONF = " \ - --enable-network-manager \ - --enable-panel-plugins \ -" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" -PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" - -PACKAGES += "xfce4-powermanager-plugin" - -FILES_${PN} += " \ - ${datadir}/polkit-1 \ - ${datadir}/metainfo \ -" - -FILES_xfce4-powermanager-plugin = " \ - ${libdir}/xfce4 \ - ${datadir}/xfce4 \ -" - -RDEPENDS_xfce4-powermanager-plugin = "${PN}" -RDEPENDS_${PN} = "networkmanager ${@bb.utils.contains('DISTRO_FEATURES','systemd','','consolekit',d)}" - -# xfce4-brightness-plugin was replaced by xfce4-powermanager-plugin -RPROVIDES_xfce4-powermanager-plugin += "xfce4-brightness-plugin" -RREPLACES_xfce4-powermanager-plugin += "xfce4-brightness-plugin" -RCONFLICTS_xfce4-powermanager-plugin += "xfce4-brightness-plugin" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb new file mode 100644 index 0000000000..7a778bdfc8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Power manager for the Xfce desktop environment" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-power-manager" +SECTION = "x11" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" + +SRC_URI[sha256sum] = "eb9c587c01b502fa45a32e7fc2aba98fa6d8391475133883654f77e562c43bf3" + +EXTRA_OECONF = " \ + --enable-network-manager \ + --enable-panel-plugins \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" +PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" + +PACKAGES += "xfce4-powermanager-plugin" + +FILES_${PN} += " \ + ${datadir}/polkit-1 \ + ${datadir}/metainfo \ +" + +FILES_xfce4-powermanager-plugin = " \ + ${libdir}/xfce4 \ + ${datadir}/xfce4 \ +" + +RDEPENDS_xfce4-powermanager-plugin = "${PN}" +RDEPENDS_${PN} = "networkmanager ${@bb.utils.contains('DISTRO_FEATURES','systemd','','consolekit',d)}" + +# xfce4-brightness-plugin was replaced by xfce4-powermanager-plugin +RPROVIDES_xfce4-powermanager-plugin += "xfce4-brightness-plugin" +RREPLACES_xfce4-powermanager-plugin += "xfce4-brightness-plugin" +RCONFLICTS_xfce4-powermanager-plugin += "xfce4-brightness-plugin" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.2.bb deleted file mode 100644 index f497b7666b..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.2.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "xfce4-session is a session manager for Xfce 4 Desktop Environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" - -DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" - -inherit xfce update-alternatives features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" -PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" - -SRC_URI += " \ - file://0001-configure.in-hard-code-path-to-iceauth.patch \ -" -SRC_URI[md5sum] = "5ad23062fd08ef5f5ad9b4389c7b54c6" -SRC_URI[sha256sum] = "fbe3a4a60c91589a2024ce12b2d2667625a8fedcbc90ef031831f56319f597af" - -ALTERNATIVE_${PN} = "x-session-manager" -ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" -ALTERNATIVE_PRIORITY_${PN} = "100" - -FILES_${PN} += " \ - ${libdir}/xfce4/*/*/*.so \ - ${libdir}/xfce4/session/*-*-* \ - ${datadir}/xsessions \ - ${datadir}/themes/Default/balou/* \ - ${datadir}/polkit-1 \ -" - -RDEPENDS_${PN} = " \ - dbus-x11 \ - iceauth \ - netbase \ - upower \ - xinit \ - xrdb \ -" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb new file mode 100644 index 0000000000..36b5bc2d03 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "xfce4-session is a session manager for Xfce 4 Desktop Environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" + +DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" + +inherit xfce update-alternatives features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" +PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" + +SRC_URI += "file://0001-configure.in-hard-code-path-to-iceauth.patch" +SRC_URI[sha256sum] = "22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b07d17b7" + +ALTERNATIVE_${PN} = "x-session-manager" +ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" +ALTERNATIVE_PRIORITY_${PN} = "100" + +FILES_${PN} += " \ + ${libdir}/xfce4/*/*/*.so \ + ${libdir}/xfce4/session/*-*-* \ + ${datadir}/xsessions \ + ${datadir}/themes/Default/balou/* \ + ${datadir}/polkit-1 \ +" + +RDEPENDS_${PN} = " \ + dbus-x11 \ + iceauth \ + netbase \ + upower \ + xinit \ + xrdb \ +" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.3.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.3.bb deleted file mode 100644 index 08c612aa7a..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.3.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Xfce4 settings" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo exo-native garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" - -inherit xfce features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " \ - file://0001-xsettings.xml-Set-default-themes.patch \ -" -SRC_URI[md5sum] = "fe8f7d4221be1467b85c8539344c3f07" -SRC_URI[sha256sum] = "cab1a4d5351f9871533700523570f86f92bbe6e4055f44e5df950eb4b4f48bb3" - -EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" - -PACKAGECONFIG ??= " \ - ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ -" -PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" -PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop" - -FILES_${PN} += " \ - ${libdir}/xfce4 \ - ${datadir}/xfce4 \ -" - -RRECOMMENDS_${PN} += "adwaita-icon-theme" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','xfce4-datetime-setter','',d)}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.0.bb new file mode 100644 index 0000000000..47de8c571e --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "Xfce4 settings" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" + +inherit xfce features_check mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += "file://0001-xsettings.xml-Set-default-themes.patch" +SRC_URI[sha256sum] = "67a1404fc754c675c6431e22a8fe0e5d79644fdfadbfe25a4523d68e1442ddc2" + +EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ +" +PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" +PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop" + +FILES_${PN} += " \ + ${libdir}/xfce4 \ + ${datadir}/xfce4 \ +" + +RRECOMMENDS_${PN} += "adwaita-icon-theme" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','xfce4-datetime-setter','',d)}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.3.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.3.bb deleted file mode 100644 index 792f8b1600..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Xfce configuration daemon and utilities" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native" - -inherit xfce gtk-doc gobject-introspection - -EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" - -SRC_URI[md5sum] = "25c32ed08a43e81f7900c03601dffc02" -SRC_URI[sha256sum] = "589052a0efc6151c5fb5f438da463502a4fd91848cae7b9376d417be4c5a0c02" - -FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ - ${libdir}/gio/modules/libxfconfgsettingsbackend.so \ - ${datadir}/dbus-1/services/org.xfce.Xfconf.service" - -FILES_${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" - -PACKAGECONFIG[gsettings-backend] = "--enable-gsettings-backend,--disable-gsettings-backend," diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb new file mode 100644 index 0000000000..9b341bb273 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Xfce configuration daemon and utilities" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native" + +inherit xfce gtk-doc gobject-introspection bash-completion + +EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" + +SRC_URI[sha256sum] = "652a119007c67d9ba6c0bc7a740c923d33f32d03dc76dfc7ba682584e72a5425" + +FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ + ${libdir}/gio/modules/libxfconfgsettingsbackend.so \ + ${datadir}/dbus-1/services/org.xfce.Xfconf.service" + +FILES_${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" + +PACKAGECONFIG[gsettings-backend] = "--enable-gsettings-backend,--disable-gsettings-backend," diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.14.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.14.2.bb deleted file mode 100644 index a512a62ff7..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.14.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Xfce4 Desktop Manager" -SECTION = "x11/base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libxfce4ui libwnck thunar garcon exo" - -inherit xfce features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[md5sum] = "5db09df39b0808f25bd3a3128f8c9e77" -SRC_URI[sha256sum] = "a30534461fea907f969f608a11c84be0b1aaad687c591c32cd56a9d274ea3e74" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" - -FILES_${PN} += "${datadir}/backgrounds" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb new file mode 100644 index 0000000000..e8b2b72b67 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Xfce4 Desktop Manager" +SECTION = "x11/base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "libxfce4ui libwnck thunar garcon exo" + +inherit xfce features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "934ba5affecff21e62d9fac1dd50c50cd94b3a807fefa5f5bff59f3d6f155bae" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" + +FILES_${PN} += "${datadir}/backgrounds" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch deleted file mode 100644 index 04fd623e8f..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch +++ /dev/null @@ -1,92 +0,0 @@ -From acdceb0b28d86199b8c2233880fa8a04cb24d4d4 Mon Sep 17 00:00:00 2001 -From: Kai Kang -Date: Wed, 24 Jul 2019 09:48:04 +0800 -Subject: [PATCH] Revert "compositor: Revert to GLX as default vblank method - (again)" - -This reverts commit e07574d6e7a2dbaa08c3ba4765c6306073d9493e. - -It sets the default vblank method (auto) to GLX from 4.13.2. But it -fails to start xfwm4 on intel-x86-64 boards with error: - -| xfwm4: ../mesa-19.1.1/src/mesa/drivers/dri/i965/intel_mipmap_tree.c:1293: -| intel_miptree_match_image: Assertion `image->TexObject->Target == mt->target' failed. -| Aborted - -There is also a RHEL defect: -https://bugzilla.redhat.com/show_bug.cgi?id=1678334 - -Revert the commit to fix the issue. - -Upstream-Status: Inappropriate [workaround] - -Signed-off-by: Kai Kang ---- - src/compositor.c | 41 +++++++++++++++++++---------------------- - 1 file changed, 19 insertions(+), 22 deletions(-) - -diff --git a/src/compositor.c b/src/compositor.c -index 25615282..daced607 100644 ---- a/src/compositor.c -+++ b/src/compositor.c -@@ -4483,13 +4483,28 @@ compositorManageScreen (ScreenInfo *screen_info) - XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE); - TRACE ("manual compositing enabled"); - -+#ifdef HAVE_PRESENT_EXTENSION -+ screen_info->use_present = display_info->have_present && -+ (screen_info->vblank_mode == VBLANK_AUTO || -+ screen_info->vblank_mode == VBLANK_XPRESENT); -+ if (screen_info->use_present) -+ { -+ screen_info->present_pending = FALSE; -+ XPresentSelectInput (display_info->dpy, -+ screen_info->output, -+ PresentCompleteNotifyMask); -+ } -+#else /* HAVE_PRESENT_EXTENSION */ -+ screen_info->use_present = FALSE; -+#endif /* HAVE_PRESENT_EXTENSION */ -+ - #ifdef HAVE_EPOXY -- screen_info->use_glx = (screen_info->vblank_mode == VBLANK_AUTO || -- screen_info->vblank_mode == VBLANK_GLX); -+ screen_info->use_glx = !screen_info->use_present && - #ifdef HAVE_XSYNC -- screen_info->use_glx &= display_info->have_xsync; -+ display_info->have_xsync && - #endif /* HAVE_XSYNC */ -- -+ (screen_info->vblank_mode == VBLANK_AUTO || -+ screen_info->vblank_mode == VBLANK_GLX); - if (screen_info->use_glx) - { - screen_info->glx_context = None; -@@ -4503,24 +4518,6 @@ compositorManageScreen (ScreenInfo *screen_info) - screen_info->use_glx = FALSE; - #endif /* HAVE_EPOXY */ - --#ifdef HAVE_PRESENT_EXTENSION -- screen_info->use_present = display_info->have_present && --#ifdef HAVE_EPOXY -- !screen_info->use_glx && --#endif /* HAVE_EPOXY */ -- (screen_info->vblank_mode == VBLANK_AUTO || -- screen_info->vblank_mode == VBLANK_XPRESENT); -- if (screen_info->use_present) -- { -- screen_info->present_pending = FALSE; -- XPresentSelectInput (display_info->dpy, -- screen_info->output, -- PresentCompleteNotifyMask); -- } --#else /* HAVE_PRESENT_EXTENSION */ -- screen_info->use_present = FALSE; --#endif /* HAVE_PRESENT_EXTENSION */ -- - if (screen_info->use_present) - { - g_info ("Compositor using XPresent for vsync"); --- -2.20.1 - diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb deleted file mode 100644 index f8febe8041..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Xfce4 Window Manager" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama exo-native" - -inherit xfce update-alternatives features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += "file://0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch" -SRC_URI[sha256sum] = "d7a7c63fa42ec6d7cb3caab130d6f496be5bd7689b775d20e8786b7f3e282930" - -PACKAGECONFIG ?= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ - xpresent \ - startup-notification \ -" - -PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy" -PACKAGECONFIG[xpresent] = "--enable-xpresent,--disable-xpresent,libxpresent" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" - -python populate_packages_prepend () { - themedir = d.expand('${datadir}/themes') - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} - -PACKAGES_DYNAMIC += "^xfwm4-theme-.*" - -ALTERNATIVE_${PN} = "x-window-manager" -ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" -ALTERNATIVE_PRIORITY[x-window-manager] = "30" - -RDEPENDS_${PN} = "xfwm4-theme-default" -FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ - ${datadir}/xfwm4/defaults \ -" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb new file mode 100644 index 0000000000..3f64365f0d --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Xfce4 Window Manager" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama" + +inherit xfce update-alternatives features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3" + +PACKAGECONFIG ?= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ + xpresent \ + startup-notification \ +" + +PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy" +PACKAGECONFIG[xpresent] = "--enable-xpresent,--disable-xpresent,libxpresent" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" + +python populate_packages_prepend () { + themedir = d.expand('${datadir}/themes') + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES_DYNAMIC += "^xfwm4-theme-.*" + +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" +ALTERNATIVE_PRIORITY[x-window-manager] = "30" + +RDEPENDS_${PN} = "xfwm4-theme-default" +FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ + ${datadir}/xfwm4/defaults \ +" -- cgit v1.2.3