From 868407c65d79e82e83c37f7c32bef9a2e2bc4cd5 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 4 Nov 2019 13:24:47 -0500 Subject: meta-openembedded: subtree update:c986cbed93..e0daf6f8e0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (19): lldpd: Upgrade 1.0.3 -> 1.0.4 usrsctp: Upgrade to a more recent git snapshot cim-schema: Remove duplicate file dovecot: Upgrade 2.2.36.3 -> 2.2.36.4 flashrom: Upgrade 1.0 -> 1.1 doxygen: Upgrade 1.8.15 -> 1.8.16 nodejs: Upgrade 10.16.3 -> 10.17.0 php: Upgrade 7.3.9 -> 7.3.11 libdivecomputer: Upgrade to 0.6.0 libnss-nisplus: Upgrade to the latest upstream git pegtl: Upgrade 2.1.4 -> 2.8.1 openwsman: Upgrade 2.6.9 -> 2.6.11 cgdb: Upgrade 0.6.8 -> 0.7.1 packagegroup-meta-networking: Exclude nonbuilding recipes with musl xf86-input-tslib: Upgrade 0.0.6 -> 0.0.7 libmicrohttpd: Upgrade 0.9.66 -> 0.9.67 poco: Upgrade 1.9.0 -> 1.9.4 libgphoto2: Remove obsolete HAL files mdns: Mark as incompatible with musl Andreas Müller (5): unicode-ucd: initial add 12.1.0 unicode-ucd: Set correct SUMMARY and HOMEPAGE colord: initial add 1.4.4 colord-gtk: initial add 0.2.0 ibus: initial add 1.5.21 André Draszik (3): nodejs: allow use of system c-ares (and make default) libuv: update to 1.33.1 nodejs: allow use of system libuv (and make default) Carlos Rafael Giani (1): opencv: Enable pkg-config .pc file generation Khem Raj (5): miniupnpd: Update to 2.1.20191006 miniupnpd: Build config.h before full build poco: Fix build on risc-v python-docutils: Upgrade to 0.15.2 iwd: Use python3 variant of docutils during build Luca Boccassi (1): dbus-broker: build with libaudit if selinux is enabled Martin Siegumfeldt (1): libiio: add python3 packageconfig Paul Eggleton (1): python3-pillow: update to 6.2.1 Slater, Joseph (2): syslog-ng: add volatile directory init for systemd syslog-ng: change conf files to version 3.19 Trevor Gamblin (4): python-priority: add recipe python-h2: add recipe python-hyperframe: add recipe python-hpack: add recipe Yi Zhao (1): freeradius: set CLEANBROKEN Zang Ruochen (22): poppler: upgrade 0.80.0 -> 0.82.0 gmime: upgrade 3.2.3 -> 3.2.4 autofs: upgrade 5.1.5 -> 5.1.6 python-simplejson: enable native and nativesdk python-dnspython: upgrade 1.15.0 -> 1.16.0 python-engineio: upgrade 3.9.3 -> 3.10.0 python-evdev: upgrade 0.7.0 -> 1.2.0 python-future: upgrade 0.16.0 -> 0.18.2 python-intervals: upgrade 1.5.4 -> 1.10.0 python-isort: upgrade 4.3.4 -> 4.3.21 python-javaobj-py3: upgrade 0.2.4 -> 0.3.0 python-lazy-object-proxy: upgrade 1.3.1 -> 1.4.3 python-parse: upgrade 1.8.4 -> 1.12.1 python-pathlib2: upgrade 2.3.4 -> 2.3.5 python-periphery: upgrade 1.1.1 -> 2.0.0 python-pint: upgrade 0.8.1 -> 0.9 python-progress: upgrade 1.4 -> 1.5 python-prompt-toolkit: upgrade 2.0.4 -> 2.0.10 python-pybind11: upgrade 2.2.3 -> 2.4.3 python-pycryptodome: upgrade 3.4.11 -> 3.9.0 python-pyexpect: upgrade 1.0.17 -> 1.0.19 python-pyfirmata: upgrade 1.0.3 -> 1.1.0 Zheng Ruoqin (23): pure-ftpd: upgrade 1.0.47 -> 1.0.49 grpc: upgrade 1.24.1 -> 1.24.3 corosync: upgrade 2.4.4 -> 2.4.5 dhcpcd: upgrade 8.0.2 -> 8.1.1 iscsi-initiator-utils: upgrade 2.0.877 -> 2.0.878 znc: upgrade 1.7.4 -> 1.7.5 babeld: upgrade 1.8.4 -> 1.9.1 htpdate: upgrade 1.2.1 -> 1.2.2 nbd: upgrade 3.19 -> 3.20 unbound: upgrade 1.9.2 -> 1.9.4 wireshark: upgrade 3.0.3 -> 3.0.6 mtr: upgrade 0.92 -> 0.93 libowfat: upgrade 0.31 -> 0.32 iozone3: upgrade 484 -> 487 libhugetlbfs: upgrade 2.21 -> 2.22 phoronix-test-suite: upgrade 8.8.1 -> 9.0.1 lmsensors: upgrade 3.5.0 -> 3.6.0 paho-mqtt-c: upgrade 1.3.0 -> 1.3.1 rtorrent: upgrade 0.9.7 -> 0.9.8 zabbix: upgrade 4.2.6 -> 4.2.7 iwd: upgrade 0.20 -> 0.23 libtorrent: upgrade 0.13.7 -> 0.13.8 ledmon: upgrade to 0.93 Change-Id: I66f0f395da9087e46899cf882e36d9cc50718c62 Signed-off-by: Brad Bishop --- .../recipes-support/colord-gtk/colord-gtk_0.2.0.bb | 21 + .../meta-gnome/recipes-support/ibus/ibus-native.bb | 34 + .../meta-gnome/recipes-support/ibus/ibus.bb | 37 + .../meta-gnome/recipes-support/ibus/ibus.inc | 36 + ...y-to-start-dbus-we-do-not-have-dbus-lauch.patch | 39 + .../recipes-connectivity/dhcpcd/dhcpcd_8.0.2.bb | 26 - .../recipes-connectivity/dhcpcd/dhcpcd_8.1.1.bb | 28 + .../0001-dhcpcd-Fix-build-error-with-musl.patch | 34 + .../freeradius/freeradius_3.0.19.bb | 2 + .../0001-Add-OpenEmbedded-cross-compile-case.patch | 12 +- .../miniupnpd/miniupnpd_2.1.20190630.bb | 48 - .../miniupnpd/miniupnpd_2.1.20191006.bb | 49 + .../packagegroups/packagegroup-meta-networking.bb | 9 + .../0001-Bug-fix-for-pid_t-not-found-on-musl.patch | 30 + .../0001-Do-not-hardcode-path-for-pkg.m4.patch | 4 +- .../recipes-daemons/autofs/autofs_5.1.5.bb | 84 - .../recipes-daemons/autofs/autofs_5.1.6.bb | 85 + ...-build-issues-with-string-length-overflow.patch | 115 - .../0001-Make-iscsid-systemd-usage-optional.patch | 88 - ...g-config-in-Makefiles-for-newer-libraries.patch | 92 - .../iscsi-initiator-utils_2.0.877.bb | 119 - .../iscsi-initiator-utils_2.0.878.bb | 120 + .../0001-priv-include-limits.h-for-PATH_MAX.patch | 27 - .../recipes-daemons/lldpd/lldpd_1.0.3.bb | 65 - .../recipes-daemons/lldpd/lldpd_1.0.4.bb | 64 + ...coded-usr-local-includes-from-configure.a.patch | 37 +- .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb | 21 - .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.49.bb | 20 + .../recipes-devtools/grpc/grpc_1.24.1.bb | 49 - .../recipes-devtools/grpc/grpc_1.24.3.bb | 49 + .../recipes-extended/corosync/corosync_2.4.4.bb | 80 - .../recipes-extended/corosync/corosync_2.4.5.bb | 80 + .../meta-networking/recipes-irc/znc/znc_1.7.4.bb | 32 - .../meta-networking/recipes-irc/znc/znc_1.7.5.bb | 32 + .../recipes-protocols/babeld/babeld_1.8.4.bb | 27 - .../recipes-protocols/babeld/babeld_1.9.1.bb | 27 + ...mdns-Do-not-include-nss.h-when-libc-glibc.patch | 42 - .../recipes-protocols/mdns/mdns_878.200.35.bb | 3 +- .../0001-Use-foreign-switch-for-automake.patch | 28 - .../recipes-protocols/usrsctp/usrsctp_git.bb | 3 +- .../cim-schema/cim-schema/files/LICENSE | 34 - .../recipes-support/dovecot/dovecot_2.2.36.3.bb | 69 - .../recipes-support/dovecot/dovecot_2.2.36.4.bb | 69 + .../recipes-support/htpdate/htpdate_1.2.1.bb | 39 - .../recipes-support/htpdate/htpdate_1.2.2.bb | 39 + .../recipes-support/mtr/mtr_0.92.bb | 27 - .../recipes-support/mtr/mtr_0.93.bb | 25 + .../recipes-support/nbd/nbd_3.19.bb | 19 - .../recipes-support/nbd/nbd_3.20.bb | 19 + .../recipes-support/ncp/libowfat_0.31.bb | 27 - .../recipes-support/ncp/libowfat_0.32.bb | 27 + .../recipes-support/unbound/unbound_1.9.2.bb | 46 - .../recipes-support/unbound/unbound_1.9.4.bb | 46 + .../recipes-support/wireshark/wireshark_3.0.3.bb | 81 - .../recipes-support/wireshark/wireshark_3.0.6.bb | 81 + .../recipes-benchmark/iozone3/iozone3_484.bb | 119 - .../recipes-benchmark/iozone3/iozone3_487.bb | 119 + ....py-not-use-hard-coded-path-.-obj-hugeadm.patch | 13 +- .../files/0005-Include-dirent.h-for-ino_t.patch | 9 +- .../libhugetlbfs/libhugetlbfs_git.bb | 6 +- .../phoronix-test-suite_8.8.1.bb | 41 - .../phoronix-test-suite_9.0.1.bb | 41 + ...41a_spi-Avoid-deprecated-libusb-functions.patch | 39 - ...001-platform-Add-riscv-to-known-platforms.patch | 37 - .../recipes-bsp/flashrom/flashrom/sst26.patch | 198 - .../meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb | 20 - .../meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb | 19 + ...-t-build-with-Werror-to-fix-compile-error.patch | 29 + .../meta-oe/recipes-bsp/ledmon/ledmon_git.bb | 17 +- ...ensors-detect-print-a-special-message-whe.patch | 40 - ...fix-sensors-detect-can-t-read-the-cpu-inf.patch | 74 - .../recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 170 - .../recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | 168 + .../meta-oe/recipes-connectivity/iwd/iwd_0.20.bb | 37 - .../meta-oe/recipes-connectivity/iwd/iwd_0.23.bb | 37 + .../libtorrent/libtorrent_git.bb | 4 +- .../recipes-connectivity/libuv/libuv_1.32.0.bb | 19 - .../recipes-connectivity/libuv/libuv_1.33.1.bb | 19 + .../paho-mqtt-c/paho-mqtt-c_1.3.0.bb | 30 - .../paho-mqtt-c/paho-mqtt-c_1.3.1.bb | 30 + .../don-t-run-code-while-configuring-package.patch | 48 +- .../recipes-connectivity/rtorrent/rtorrent_git.bb | 6 +- .../recipes-connectivity/zabbix/zabbix_4.2.6.bb | 79 - .../recipes-connectivity/zabbix/zabbix_4.2.7.bb | 79 + .../meta-oe/recipes-core/dbus/dbus-broker_21.bb | 2 + ...oid-use-of-mips-which-is-reserved-on-mips.patch | 67 + .../cgdb/cgdb/remove-help2man.patch | 47 - .../meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb | 21 - .../meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb | 22 + .../doxygen/doxygen/0001-Fix-6906.patch | 94 - .../recipes-devtools/doxygen/doxygen_1.8.15.bb | 17 - .../recipes-devtools/doxygen/doxygen_1.8.16.bb | 17 + ...3-Crypto-reduce-memory-usage-of-SignFinal.patch | 122 - .../recipes-devtools/nodejs/nodejs_10.16.3.bb | 113 - .../recipes-devtools/nodejs/nodejs_10.17.0.bb | 114 + .../meta-oe/recipes-devtools/php/php.inc | 263 - ...049-ext-intl-Use-pkg-config-to-detect-icu.patch | 161 - .../meta-oe/recipes-devtools/php/php_7.3.11.bb | 275 + .../meta-oe/recipes-devtools/php/php_7.3.9.bb | 20 - .../libdivecomputer/files/fix-ar.patch | 16 - .../libdivecomputer/libdivecomputer_git.bb | 7 +- .../libnss-nisplus/libnss-nisplus.bb | 3 +- ...nisplus-hosts-Remove-use-of-RES_USE_INET6.patch | 245 - .../recipes-extended/openwsman/openwsman_2.6.11.bb | 72 + .../recipes-extended/openwsman/openwsman_2.6.9.bb | 73 - ...-Fix-clang-warning-about-non-virtual-dtor.patch | 25 - .../meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb | 13 - .../meta-oe/recipes-extended/pegtl/pegtl_2.8.1.bb | 12 + .../libgphoto2/10-camera-libgphoto2-device.fdi | 9533 ---------- .../gphoto2/libgphoto2/10-camera-libgphoto2.fdi | 19018 ------------------- .../recipes-graphics/gphoto2/libgphoto2_2.5.17.bb | 7 +- .../xf86-input-tslib/10-x11-input-tslib.fdi | 11 - .../xf86-input-tslib/double-free-crash.patch | 20 - ...f86-input-tslib-0.0.6-xf86XInputSetScreen.patch | 31 - .../xf86-input-tslib-port-ABI-12-r48.patch | 196 - .../xserver-174-XGetPointerControl.patch | 34 - .../xorg-driver/xf86-input-tslib_0.0.6.bb | 35 - .../xorg-driver/xf86-input-tslib_0.0.7.bb | 20 + .../recipes-support/colord/colord-native.bb | 64 + ...nction-cd_icc_create_from_edid-to-avoid-u.patch | 166 + .../recipes-support/colord/colord-native/Makefile | 48 + .../meta-oe/recipes-support/colord/colord.bb | 45 + .../meta-oe/recipes-support/colord/colord.inc | 13 + ...0001-Run-native-cd_idt8-cd_create_profile.patch | 59 + .../meta-oe/recipes-support/libiio/libiio_git.bb | 11 +- .../fix-build-with-older-gnutls.patch | 32 - .../libmicrohttpd/libmicrohttpd_0.9.66.bb | 31 - .../libmicrohttpd/libmicrohttpd_0.9.67.bb | 30 + .../meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 1 + .../meta-oe/recipes-support/pidgin/gmime_3.2.3.bb | 23 - .../meta-oe/recipes-support/pidgin/gmime_3.2.4.bb | 23 + ...arch-riscv64-by-Manuel-A.-Fernandez-Monte.patch | 41 - ...e-double-operations-when-using-double-flo.patch | 28 + .../meta-oe/recipes-support/poco/poco_1.9.0.bb | 100 - .../meta-oe/recipes-support/poco/poco_1.9.4.bb | 100 + .../recipes-support/poppler/poppler_0.80.0.bb | 50 - .../recipes-support/poppler/poppler_0.82.0.bb | 50 + .../syslog-ng/files/syslog-ng-tmp.conf | 1 + .../syslog-ng/files/syslog-ng.conf.systemd | 9 +- .../syslog-ng/files/syslog-ng.conf.sysvinit | 9 +- .../recipes-support/syslog-ng/syslog-ng.inc | 6 + .../recipes-support/syslog-ng/syslog-ng_3.19.1.bb | 10 +- .../unicode-ucd/unicode-ucd_12.1.0.bb | 25 + .../recipes-connectivity/python-h2/python-h2.inc | 10 + .../python-h2/python-h2_3.1.1.bb | 3 + .../python-h2/python3-h2_3.1.1.bb | 3 + .../python-hpack/python-hpack.inc | 10 + .../python-hpack/python-hpack_3.0.0.bb | 3 + .../python-hpack/python3-hpack_3.0.0.bb | 3 + .../python-hyperframe/python-hyperframe.inc | 10 + .../python-hyperframe/python-hyperframe_5.2.0.bb | 3 + .../python-hyperframe/python3-hyperframe_5.2.0.bb | 3 + .../python-priority/python-priority.inc | 10 + .../python-priority/python-priority_1.3.0.bb | 3 + .../python-priority/python3-priority_1.3.0.bb | 3 + .../packagegroups/packagegroup-meta-python.bb | 2 +- .../recipes-devtools/python/python-dnspython.inc | 6 +- .../python/python-dnspython_1.15.0.bb | 2 - .../python/python-dnspython_1.16.0.bb | 2 + .../python/python-docutils_0.14rc2.bb | 18 - .../python/python-docutils_0.15.2.bb | 15 + .../recipes-devtools/python/python-engineio.inc | 4 +- .../python/python-engineio_3.10.0.bb | 2 + .../python/python-engineio_3.9.3.bb | 2 - .../recipes-devtools/python/python-evdev.inc | 4 +- .../recipes-devtools/python/python-evdev_0.7.0.bb | 2 - .../recipes-devtools/python/python-evdev_1.2.0.bb | 2 + .../recipes-devtools/python/python-future.inc | 6 +- .../python/python-future_0.16.0.bb | 2 - .../python/python-future_0.18.2.bb | 2 + .../recipes-devtools/python/python-intervals.inc | 4 +- .../python/python-intervals_1.10.0.bb | 2 + .../python/python-intervals_1.5.4.bb | 2 - .../recipes-devtools/python/python-isort.inc | 4 +- .../recipes-devtools/python/python-isort_4.3.21.bb | 2 + .../recipes-devtools/python/python-isort_4.3.4.bb | 2 - .../recipes-devtools/python/python-javaobj-py3.inc | 6 +- .../python/python-javaobj-py3_0.2.4.bb | 2 - .../python/python-javaobj-py3_0.3.0.bb | 2 + .../python/python-lazy-object-proxy.inc | 8 +- .../python/python-lazy-object-proxy_1.3.1.bb | 2 - .../python/python-lazy-object-proxy_1.4.3.bb | 2 + .../recipes-devtools/python/python-parse.inc | 6 +- .../recipes-devtools/python/python-parse_1.12.1.bb | 2 + .../recipes-devtools/python/python-parse_1.8.4.bb | 2 - .../recipes-devtools/python/python-pathlib2.inc | 4 +- .../python/python-pathlib2_2.3.4.bb | 2 - .../python/python-pathlib2_2.3.5.bb | 2 + .../recipes-devtools/python/python-periphery.inc | 4 +- .../python/python-periphery_1.1.1.bb | 4 - .../python/python-periphery_2.0.0.bb | 4 + .../recipes-devtools/python/python-pint.inc | 4 +- .../recipes-devtools/python/python-pint_0.8.1.bb | 2 - .../recipes-devtools/python/python-pint_0.9.bb | 2 + .../recipes-devtools/python/python-progress.inc | 4 +- .../recipes-devtools/python/python-progress_1.4.bb | 2 - .../recipes-devtools/python/python-progress_1.5.bb | 2 + .../python/python-prompt-toolkit.inc | 4 +- .../python/python-prompt-toolkit_2.0.10.bb | 6 + .../python/python-prompt-toolkit_2.0.4.bb | 6 - .../recipes-devtools/python/python-pybind11.inc | 4 +- .../python/python-pybind11_2.2.3.bb | 2 - .../python/python-pybind11_2.4.3.bb | 2 + .../python/python-pycryptodome.inc | 6 +- .../python/python-pycryptodome_3.4.11.bb | 2 - .../python/python-pycryptodome_3.9.0.bb | 2 + .../recipes-devtools/python/python-pyexpect.inc | 4 +- .../python/python-pyexpect_1.0.17.bb | 2 - .../python/python-pyexpect_1.0.19.bb | 2 + .../recipes-devtools/python/python-pyfirmata.inc | 4 +- .../python/python-pyfirmata_1.0.3.bb | 3 - .../python/python-pyfirmata_1.1.0.bb | 3 + .../recipes-devtools/python/python-simplejson.inc | 2 + .../python/python3-dnspython_1.15.0.bb | 2 - .../python/python3-dnspython_1.16.0.bb | 2 + .../python/python3-docutils_0.15.2.bb | 15 + .../python/python3-engineio_3.10.0.bb | 2 + .../python/python3-engineio_3.9.3.bb | 2 - .../recipes-devtools/python/python3-evdev_0.7.0.bb | 2 - .../recipes-devtools/python/python3-evdev_1.2.0.bb | 2 + .../python/python3-future_0.16.0.bb | 2 - .../python/python3-future_0.18.2.bb | 2 + .../python/python3-intervals_1.10.0.bb | 2 + .../python/python3-intervals_1.5.4.bb | 2 - .../python/python3-isort_4.3.21.bb | 2 + .../recipes-devtools/python/python3-isort_4.3.4.bb | 2 - .../python/python3-javaobj-py3_0.2.4.bb | 2 - .../python/python3-javaobj-py3_0.3.0.bb | 2 + .../python/python3-lazy-object-proxy_1.3.1.bb | 2 - .../python/python3-lazy-object-proxy_1.4.3.bb | 2 + .../python/python3-parse_1.12.1.bb | 2 + .../recipes-devtools/python/python3-parse_1.8.4.bb | 2 - .../python/python3-pathlib2_2.3.4.bb | 2 - .../python/python3-pathlib2_2.3.5.bb | 2 + .../python/python3-periphery_1.1.1.bb | 4 - .../python/python3-periphery_2.0.0.bb | 4 + .../0001-explicitly-set-compile-options.patch | 16 +- .../recipes-devtools/python/python3-pillow_6.1.bb | 38 - .../python/python3-pillow_6.2.1.bb | 38 + .../recipes-devtools/python/python3-pint_0.8.1.bb | 2 - .../recipes-devtools/python/python3-pint_0.9.bb | 2 + .../python/python3-progress_1.4.bb | 2 - .../python/python3-progress_1.5.bb | 2 + .../python/python3-prompt-toolkit_2.0.10.bb | 7 + .../python/python3-prompt-toolkit_2.0.4.bb | 7 - .../python/python3-pybind11_2.2.3.bb | 2 - .../python/python3-pybind11_2.4.3.bb | 2 + .../python/python3-pycryptodome_3.4.11.bb | 2 - .../python/python3-pycryptodome_3.9.0.bb | 2 + .../python/python3-pyexpect_1.0.17.bb | 2 - .../python/python3-pyexpect_1.0.19.bb | 2 + .../python/python3-pyfirmata_1.0.3.bb | 3 - .../python/python3-pyfirmata_1.1.0.bb | 3 + 253 files changed, 3304 insertions(+), 32858 deletions(-) create mode 100644 meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc create mode 100644 meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.0.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.5.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-i586-build-issues-with-string-length-overflow.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Make-iscsid-systemd-usage-optional.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.877.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/lldpd/files/0001-priv-include-limits.h-for-PATH_MAX.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.3.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.49.bb delete mode 100644 meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb delete mode 100644 meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb delete mode 100644 meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.5.bb delete mode 100644 meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.8.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch delete mode 100644 meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE delete mode 100644 meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.3.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.92.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.19.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.31.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.4.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_484.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_487.bb delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.0.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.20.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.32.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.33.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php.inc delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/colord/colord-native/Makefile create mode 100644 meta-openembedded/meta-oe/recipes-support/colord/colord.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/colord/colord.inc create mode 100644 meta-openembedded/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Support-of-arch-riscv64-by-Manuel-A.-Fernandez-Monte.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.82.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng-tmp.conf create mode 100644 meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2.inc create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2_3.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_3.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack.inc create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack_3.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-hpack/python3-hpack_3.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe.inc create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe_5.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_5.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority.inc create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority_1.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-priority/python3-priority_1.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.15.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.16.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.14rc2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.15.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.10.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.9.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-evdev_1.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-future_0.16.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-future_0.18.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.10.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.5.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.21.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.3.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.4.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.12.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.8.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-periphery_1.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-periphery_2.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.8.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.10.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.4.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.9.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.19.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-docutils_0.15.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.10.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.9.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.16.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.18.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.5.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.3.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.4.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.12.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.8.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_1.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.8.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.10.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.4.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.9.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.19.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb (limited to 'meta-openembedded') diff --git a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb new file mode 100644 index 000000000..c960b99c4 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "GTK support library for colord" +HOMEPAGE = "https://www.freedesktop.org/software/colord/" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +inherit meson gobject-introspection gettext gtk-doc distro_features_check + +DEPENDS = " \ + gtk+3 \ + colord \ +" + +SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "66d048803c8b89e5e63da4b461484933" +SRC_URI[sha256sum] = "2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717" + +EXTRA_OEMESON = "-Dman=false" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb new file mode 100644 index 000000000..ca65114c4 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb @@ -0,0 +1,34 @@ +require ${BPN}.inc + +inherit native + +DEPENDS += " \ + glib-2.0-native \ + dbus-native \ + iso-codes \ +" + +PACKAGECONFIG = "" + +# for allarch iso-codes +EXTRA_NATIVE_PKGCONFIG_PATH = ":${RECIPE_SYSROOT}${datadir_native}/pkgconfig" +# for allarch unicode-ucd - just to make configure happy +EXTRA_OECONF += "--with-ucd-dir=${RECIPE_SYSROOT}${datadir_native}/unicode/ucd" + +do_compile() { + cd src + # seems by moving to src we break dependency tracking so build what's + # necessary step by step + oe_runmake ibusenumtypes.h + oe_runmake ibusmarshalers.h + oe_runmake ibusenumtypes.c + oe_runmake unicode-parser +} + +do_install() { + install -d ${D}/${libdir} + install -m 755 ${S}/src/.libs/libibus-*.so* ${D}/${libdir} + + install -d ${D}/${bindir} + install -m 755 ${S}/src/.libs/unicode-parser ${D}/${bindir} +} diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb new file mode 100644 index 000000000..caec455b6 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb @@ -0,0 +1,37 @@ +require ${BPN}.inc + +DEPENDS += " \ + ${BPN}-native \ + glib-2.0-native \ + glib-2.0 \ + dbus \ + iso-codes \ +" + +inherit gtk-icon-cache bash-completion + +# for unicode-ucd +EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd" + +PACKAGECONFIG ??= " \ + dconf vala \ + ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ +" + +do_configure_prepend() { + # run native unicode-parser + sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am +} + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/GConf \ + ${datadir}/glib-2.0 \ + ${libdir}/gtk-3.0 \ +" + +FILES_${PN}-dev += " \ + ${datadir}/gettext \ +" + diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc new file mode 100644 index 000000000..0f4ae7d04 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc @@ -0,0 +1,36 @@ +SUMMARY = "Intelligent Input Bus for Linux/Unix" +HOMEPAGE = "https://github.com/ibus/ibus/wiki" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala + +PV = "1.5.21" + +DEPENDS = "unicode-ucd" + +SRC_URI = " \ + git://github.com/ibus/ibus.git \ + file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ +" +SRCREV = "ae0040c73466bb6e78fce5e669a55fcce6ffd16d" +S = "${WORKDIR}/git" + +PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" +PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf" +PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+" +PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" +PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" +PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11" + +EXTRA_OECONF = " \ + --disable-tests \ + --disable-emoji-dict \ + --disable-python2 \ +" + +do_configure_prepend() { + touch ${S}/ChangeLog + touch ${S}/ABOUT-NLS +} diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch new file mode 100644 index 000000000..3701d19f5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch @@ -0,0 +1,39 @@ +From f567bcbc2108d722faa90afeb03d3a3bcdf5f58b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 10 May 2019 14:30:08 +0200 +Subject: [PATCH] Do not try to start dbus - we do not have dbus-lauch +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller +--- + data/dconf/make-dconf-override-db.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh +index 9c650e97..02fbf059 100755 +--- a/data/dconf/make-dconf-override-db.sh ++++ b/data/dconf/make-dconf-override-db.sh +@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" + export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas" + mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR + +-eval `dbus-launch --sh-syntax` +- +-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR +- + # in case that schema is not installed on the system + glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" + +@@ -46,5 +42,3 @@ for schema in $schemas; do + done + + rm -rf $TMPDIR +- +-kill $DBUS_SESSION_BUS_PID +-- +2.20.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.0.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.0.2.bb deleted file mode 100644 index 79d1dada0..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.0.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -SECTION = "console/network" -SUMMARY = "dhcpcd - a DHCP client" -DESCRIPTION = "dhcpcd runs on your machine and silently configures your computer to work on the attached networks without trouble and mostly without configuration." - -HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0531457992a97ecebc6975914a874a9d" - -UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" - -SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch" -SRC_URI[md5sum] = "c0375a1f725f1c191b43af60e4f7175b" -SRC_URI[sha256sum] = "33a26ad561546cd2cfe1e6de6352a85df72b41c37def8c7eb00e90e57c627a5c" - -inherit pkgconfig autotools-brokensep - -PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" - -PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" - -EXTRA_OECONF = "--enable-ipv4" - -FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.1.bb new file mode 100644 index 000000000..a5aa584f5 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.1.bb @@ -0,0 +1,28 @@ +SECTION = "console/network" +SUMMARY = "dhcpcd - a DHCP client" +DESCRIPTION = "dhcpcd runs on your machine and silently configures your computer to work on the attached networks without trouble and mostly without configuration." + +HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0531457992a97ecebc6975914a874a9d" + +UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" + +SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ + file://0001-dhcpcd-Fix-build-error-with-musl.patch" + +SRC_URI[md5sum] = "dc4f29a62afc53cdac311e925cfd1bc7" +SRC_URI[sha256sum] = "485d308fe10febd36b6f936e4260e4ab34a146e4f00a9f7a5509c4377ad5ea82" + +inherit pkgconfig autotools-brokensep + +PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" + +PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" + +EXTRA_OECONF = "--enable-ipv4" + +FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch new file mode 100644 index 000000000..b48b467b8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch @@ -0,0 +1,34 @@ +Subject: [PATCH] dhcpcd: Fix build error with musl. + +Re-organize the header includes in if-linux.c to fix error as follows: +In file included from if-linux.c:49: +path/usr/include/netinet/if_ether.h:112:8: error: redefinition of 'struct ethhdr' + +Signed-off-by: Zheng Ruoqin +--- + src/if-linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/if-linux.c b/src/if-linux.c +index fd47278..bfa878b 100644 +--- a/src/if-linux.c ++++ b/src/if-linux.c +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -46,7 +47,6 @@ + + #include + #include +-#include + #include + #include + #include +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb index 8c95bbae3..31e6978d6 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb @@ -230,3 +230,5 @@ FILES_${PN} =+ "${libdir}/rlm_*.so* ${libdir}/proto_*so*" RDEPENDS_${PN} += "perl" RDEPENDS_${PN}-utils = "${PN} perl" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch index cd4291d91..e33d8eac1 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch @@ -3,17 +3,15 @@ From: Khem Raj Date: Sat, 22 Dec 2018 18:47:45 -0800 Subject: [PATCH] Add OpenEmbedded cross compile case -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/miniupnp/miniupnp/pull/410] Signed-off-by: Khem Raj --- genconfig.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/genconfig.sh b/genconfig.sh -index dc42462..59922e9 100755 --- a/genconfig.sh +++ b/genconfig.sh -@@ -98,6 +98,12 @@ if [ -f ../shared/tomato_version ]; then +@@ -103,6 +103,12 @@ if [ -f ../shared/tomato_version ]; then OS_VERSION="Tomato $TOMATO_VER" fi @@ -26,14 +24,14 @@ index dc42462..59922e9 100755 ${RM} ${CONFIGFILE} echo "/* MiniUPnP Project" >> ${CONFIGFILE} -@@ -318,6 +324,11 @@ case $OS_NAME in +@@ -346,6 +352,11 @@ case $OS_NAME in echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} - FW=netfilter + FW=iptables ;; + OpenEmbedded) + OS_URL=http://www.openembedded.org/ + echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE} -+ FW=netfilter ++ FW=iptables + ;; AstLinux) OS_URL=http://www.astlinux.org/ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb deleted file mode 100644 index 6b8fdca4c..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "Lightweight UPnP IGD daemon" -DESCRIPTION = "The miniUPnP daemon is an UPnP IGD (internet gateway device) \ -which provide NAT traversal services to any UPnP enabled client on \ -the network." - -SECTION = "networking" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a1ed15843ce66639bcf9f109cf247870" - -inherit autotools gettext pkgconfig systemd - -DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack" - -SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;downloadfilename=${BP}.tar.gz \ - file://miniupnpd.service \ - file://0001-Add-OpenEmbedded-cross-compile-case.patch \ - " -SRC_URI[md5sum] = "394e676f555d8047be69730d9c4d23a5" -SRC_URI[sha256sum] = "29f49fe6868597d041ee29f511fa7b65781b9e4e85ef2569a2381c2079e1743e" - -IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" - -do_configure_prepend() { - echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded -} - -do_compile() { - cd ${S} - CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux -} - -do_install() { - install -d ${D}/${sbindir} - install ${S}/miniupnpd ${D}/${sbindir} - install -d ${D}/${sysconfdir}/${BPN} - install ${S}/netfilter/iptables_init.sh ${D}/${sysconfdir}/${BPN} - install ${S}/netfilter/iptables_removeall.sh ${D}/${sysconfdir}/${BPN} - install ${S}/netfilter/ip6tables_init.sh ${D}/${sysconfdir}/${BPN} - install ${S}/netfilter/ip6tables_removeall.sh ${D}/${sysconfdir}/${BPN} - install -m 0644 -b ${S}/miniupnpd.conf ${D}/${sysconfdir}/${BPN} - install -d ${D}/${sysconfdir}/init.d - install ${S}/linux/miniupnpd.init.d.script ${D}/${sysconfdir}/init.d/miniupnpd - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ -} - -SYSTEMD_SERVICE_${PN} = "miniupnpd.service" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb new file mode 100644 index 000000000..81bfe66a9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb @@ -0,0 +1,49 @@ +SUMMARY = "Lightweight UPnP IGD daemon" +DESCRIPTION = "The miniUPnP daemon is an UPnP IGD (internet gateway device) \ +which provide NAT traversal services to any UPnP enabled client on \ +the network." + +SECTION = "networking" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a1ed15843ce66639bcf9f109cf247870" + +inherit autotools gettext pkgconfig systemd + +DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack" + +SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;downloadfilename=${BP}.tar.gz \ + file://miniupnpd.service \ + file://0001-Add-OpenEmbedded-cross-compile-case.patch \ + " +SRC_URI[md5sum] = "340789edd49c113afe37834cc901a1e8" +SRC_URI[sha256sum] = "218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00d2206d" + +IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" + +do_configure_prepend() { + echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded +} + +do_compile() { + cd ${S} + CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux config.h + CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux +} + +do_install() { + install -d ${D}/${sbindir} + install ${S}/miniupnpd ${D}/${sbindir} + install -d ${D}/${sysconfdir}/${BPN} + install ${S}/netfilter/iptables_init.sh ${D}/${sysconfdir}/${BPN} + install ${S}/netfilter/iptables_removeall.sh ${D}/${sysconfdir}/${BPN} + install ${S}/netfilter/ip6tables_init.sh ${D}/${sysconfdir}/${BPN} + install ${S}/netfilter/ip6tables_removeall.sh ${D}/${sysconfdir}/${BPN} + install -m 0644 -b ${S}/miniupnpd.conf ${D}/${sysconfdir}/${BPN} + install -d ${D}/${sysconfdir}/init.d + install ${S}/linux/miniupnpd.init.d.script ${D}/${sysconfdir}/init.d/miniupnpd + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ +} + +SYSTEMD_SERVICE_${PN} = "miniupnpd.service" diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index f511d729e..8f8d7fe3c 100644 --- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -42,6 +42,8 @@ RDEPENDS_packagegroup-meta-networking-connectivity = "\ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "samba", "", d)} \ " +RDEPENDS_packagegroup-meta-networking-connectivity_remove_libc-musl = "rdist" + RDEPENDS_packagegroup-meta-networking-daemons = "\ ippool radvd autofs keepalived proftpd openhpi lldpd \ ptpd igmpproxy opensaf squid \ @@ -50,6 +52,8 @@ RDEPENDS_packagegroup-meta-networking-daemons = "\ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "networkd-dispatcher", "", d)} \ " +RDEPENDS_packagegroup-meta-networking-daemons_remove_libc-musl = "opensaf" + RDEPENDS_packagegroup-meta-networking-devtools = "\ python-ldap grpc \ " @@ -81,6 +85,9 @@ RDEPENDS_packagegroup-meta-networking-netkit = "\ netkit-ftp netkit-rpc \ " +RDEPENDS_packagegroup-meta-networking-netkit_remove_libc-musl = " \ + netkit-rsh-client netkit-rsh-server netkit-telnet" + RDEPENDS_packagegroup-meta-networking-protocols = "\ tsocks freediameter xl2tpd babeld mdns net-snmp \ quagga pptp-linux zeroconf nopoll openflow rp-pppoe \ @@ -88,6 +95,8 @@ RDEPENDS_packagegroup-meta-networking-protocols = "\ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "dante", "", d)} \ " +RDEPENDS_packagegroup-meta-networking-protocols_remove_libc-musl = "mdns" + RDEPENDS_packagegroup-meta-networking-support = "\ ncp ndisc6 mtr tinyproxy ssmping ntp \ wpan-tools bridge-utils ifenslave celt051 pimd \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch new file mode 100644 index 000000000..2a583466e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch @@ -0,0 +1,30 @@ +From d0d5ac317dab11610a5fc91ca3e7f5ad72ce2236 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen +Date: Tue, 29 Oct 2019 13:19:37 +0800 +Subject: [PATCH] Bug fix for pid_t not found on musl. + +When compiling version 5.1.6 on musl, the following error occurs: +log.h:49:8: error: unknown type name 'pid_t' + +Upstream-Status: Pending + +Signed-off-by: Zang Ruochen +--- + lib/defaults.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/defaults.c b/lib/defaults.c +index a6ea116..b3ecfa5 100644 +--- a/lib/defaults.c ++++ b/lib/defaults.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + + #include "config.h" +-- +2.20.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch index 410827b33..b991acad3 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch @@ -9,7 +9,7 @@ Upstream-Status: Pending Signed-off-by: Khem Raj -update patch to version 5.1.5 +update patch to version 5.1.6 Signed-off-by: Changqing Li --- configure.in | 2 +- @@ -20,7 +20,7 @@ index 493b9f1..268d06b 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl - AC_INIT(.autofs-5.1.5) + AC_INIT(.autofs-5.1.6) # for pkg-config macros -m4_include([/usr/share/aclocal/pkg.m4]) diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.5.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.5.bb deleted file mode 100644 index 9e43549e8..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.5.bb +++ /dev/null @@ -1,84 +0,0 @@ -SUMMARY = "Kernel based automounter for linux" -SECTION = "utils" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl libxml2 util-linux cyrus-sasl libnsl2" - -CFLAGS += "-I${STAGING_INCDIR}/tirpc" - -inherit autotools-brokensep systemd update-rc.d pkgconfig - -SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ - file://autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch \ - file://no-bash.patch \ - file://cross.patch \ - file://fix_disable_ldap.patch \ - file://autofs-5.0.7-fix-lib-deps.patch \ - file://add-the-needed-stdarg.h.patch \ - file://using-pkg-config-to-detect-libxml-2.0-and-krb5.patch \ - file://force-STRIP-to-emtpy.patch \ - file://remove-bashism.patch \ - file://fix-the-YACC-rule-to-fix-a-building-failure.patch \ - file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \ - file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \ - file://pkgconfig-libnsl.patch \ - file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \ - file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ - " - - -SRC_URI[md5sum] = "03b13168ec7bd66a6f2d5f6fea705eee" -SRC_URI[sha256sum] = "86a8e56ea9d72bb53ff8cdfeefb5cafe983592c6b0178fb99c4a731e59879181" - -UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/" - -INITSCRIPT_NAME = "autofs" -INITSCRIPT_PARAMS = "defaults" - -# FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS -#CFLAGS += "${LDFLAGS}" - -PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -EXTRA_OEMAKE = "DONTSTRIP=1" -EXTRA_OECONF += "--disable-mount-locking \ - --enable-ignore-busy --with-openldap=no \ - --with-sasl=no --with-libtirpc \ - --with-path=${STAGING_BINDIR_NATIVE} \ - --with-fifodir=${localstatedir}/run \ - --with-flagdir=${localstatedir}/run \ -" -CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \ - ac_cv_path_RPCGEN=rpcgen \ -" - -do_configure_prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cp ${S}/aclocal.m4 ${S}/acinclude.m4 - fi - cp ${STAGING_DATADIR_NATIVE}/aclocal/pkg.m4 . -} - -do_install_append () { - # samples have been removed from SUBDIRS from 5.1.5, need to install separately - oe_runmake 'DESTDIR=${D}' install_samples - - if [ -d ${D}/run ]; then - rmdir ${D}/run - fi - if [ -d ${D}${localstatedir}/run ]; then - rmdir ${D}${localstatedir}/run - fi -} -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -INSANE_SKIP_${PN} = "dev-so" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "autofs.service" - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb new file mode 100644 index 000000000..aeadc9d5d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb @@ -0,0 +1,85 @@ +SUMMARY = "Kernel based automounter for linux" +SECTION = "utils" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl libxml2 util-linux cyrus-sasl libnsl2" + +CFLAGS += "-I${STAGING_INCDIR}/tirpc" + +inherit autotools-brokensep systemd update-rc.d pkgconfig + +SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ + file://autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch \ + file://no-bash.patch \ + file://cross.patch \ + file://fix_disable_ldap.patch \ + file://autofs-5.0.7-fix-lib-deps.patch \ + file://add-the-needed-stdarg.h.patch \ + file://using-pkg-config-to-detect-libxml-2.0-and-krb5.patch \ + file://force-STRIP-to-emtpy.patch \ + file://remove-bashism.patch \ + file://fix-the-YACC-rule-to-fix-a-building-failure.patch \ + file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \ + file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \ + file://pkgconfig-libnsl.patch \ + file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \ + file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ + file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \ + " + + +SRC_URI[md5sum] = "e6800e0afd6009ecdff148088c564050" +SRC_URI[sha256sum] = "82094cad44f4e5c4f93eff2789cd66b57d7ab3fa646b7722d97608571001e694" + +UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/" + +INITSCRIPT_NAME = "autofs" +INITSCRIPT_PARAMS = "defaults" + +# FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS +#CFLAGS += "${LDFLAGS}" + +PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +EXTRA_OEMAKE = "DONTSTRIP=1" +EXTRA_OECONF += "--disable-mount-locking \ + --enable-ignore-busy --with-openldap=no \ + --with-sasl=no --with-libtirpc \ + --with-path=${STAGING_BINDIR_NATIVE} \ + --with-fifodir=${localstatedir}/run \ + --with-flagdir=${localstatedir}/run \ +" +CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \ + ac_cv_path_RPCGEN=rpcgen \ +" + +do_configure_prepend () { + if [ ! -e ${S}/acinclude.m4 ]; then + cp ${S}/aclocal.m4 ${S}/acinclude.m4 + fi + cp ${STAGING_DATADIR_NATIVE}/aclocal/pkg.m4 . +} + +do_install_append () { + # samples have been removed from SUBDIRS from 5.1.5, need to install separately + oe_runmake 'DESTDIR=${D}' install_samples + + if [ -d ${D}/run ]; then + rmdir ${D}/run + fi + if [ -d ${D}${localstatedir}/run ]; then + rmdir ${D}${localstatedir}/run + fi +} +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +INSANE_SKIP_${PN} = "dev-so" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "autofs.service" + diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-i586-build-issues-with-string-length-overflow.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-i586-build-issues-with-string-length-overflow.patch deleted file mode 100644 index f945c636f..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-i586-build-issues-with-string-length-overflow.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 24ce8f62e042e69497e1299212504c356179e15b Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Tue, 6 Nov 2018 11:16:06 -0800 -Subject: [PATCH] Fix i586 build issues with string length overflow. - -Gcc7 warns of possible string print overflow, on i586, -when printing password length (via a macro), generating -errors like: - -[ 59s] ^~~~~~~~~~~~~~~~~~~~ -[ 59s] In file included from /usr/include/stdio.h:862:0, -[ 59s] from idbm.h:27, -[ 59s] from context.h:22, -[ 59s] from idbm.c:59: -[ 59s] /usr/include/bits/stdio2.h:64:10: note: -'__builtin___snprintf_chk' output between 2 and 11 bytes into a -destination of size 8 -[ 59s] return __builtin___snprintf_chk (__s, __n, -__USE_FORTIFY_LEVEL - 1, -[ 59s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -~~~~~~~~~~ -[ 59s] __bos (__s), __fmt, __va_arg_pack ()); -[ 59s] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -[ 59s] cc1: all warnings being treated as errors -[ 59s] make[1]: *** [: idbm.o] Error 1 -[ 59s] make[1]: Leaving directory - -The fix is to limit the size of the string printed, so that no -overflow is possible. - -The print macros in usr/idbm.c were updated, as well, to match -the newer version in libopeniscsiusr/idbm.c, also to help the -i586 build. - -Upstream-Status: Backport[https://github.com/open-iscsi/open-iscsi/commit/24ce8f62e042e69497e1299212504c356179e15b] - -Signed-off-by: Mingli Yu ---- - libopeniscsiusr/idbm.c | 2 +- - usr/idbm.c | 11 ++++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c -index 7724de2..055dd9a 100644 ---- a/libopeniscsiusr/idbm.c -+++ b/libopeniscsiusr/idbm.c -@@ -676,7 +676,7 @@ updated: - if (!passwd_done && !strcmp(#_param, name)) { \ - passwd_done = 1; \ - name = #_param "_length"; \ -- snprintf(passwd_len, 8, "%d", (int)strlen(value)); \ -+ snprintf(passwd_len, 8, "%.7d", (int)strlen(value) & 0xffff); \ - value = passwd_len; \ - goto setup_passwd_len; \ - } -diff --git a/usr/idbm.c b/usr/idbm.c -index a0207e2..89a6c27 100644 ---- a/usr/idbm.c -+++ b/usr/idbm.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #include "idbm.h" - #include "idbm_fields.h" -@@ -65,7 +66,7 @@ static struct idbm *db; - #define __recinfo_int(_key, _info, _rec, _name, _show, _n, _mod) do { \ - _info[_n].type = TYPE_INT; \ - strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ -- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ -+ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIi32, _rec->_name); \ - _info[_n].data = &_rec->_name; \ - _info[_n].data_len = sizeof(_rec->_name); \ - _info[_n].visible = _show; \ -@@ -76,7 +77,7 @@ static struct idbm *db; - #define __recinfo_uint8(_key, _info, _rec, _name, _show, _n, _mod) do { \ - _info[_n].type = TYPE_UINT8; \ - strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ -- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ -+ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIu8, _rec->_name); \ - _info[_n].data = &_rec->_name; \ - _info[_n].data_len = sizeof(_rec->_name); \ - _info[_n].visible = _show; \ -@@ -87,7 +88,7 @@ static struct idbm *db; - #define __recinfo_uint16(_key, _info, _rec, _name, _show, _n, _mod) do { \ - _info[_n].type = TYPE_UINT16; \ - strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ -- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ -+ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIu16, _rec->_name); \ - _info[_n].data = &_rec->_name; \ - _info[_n].data_len = sizeof(_rec->_name); \ - _info[_n].visible = _show; \ -@@ -98,7 +99,7 @@ static struct idbm *db; - #define __recinfo_uint32(_key, _info, _rec, _name, _show, _n, _mod) do { \ - _info[_n].type = TYPE_UINT32; \ - strlcpy(_info[_n].name, _key, NAME_MAXVAL); \ -- snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \ -+ snprintf(_info[_n].value, VALUE_MAXVAL, "%" PRIu32, _rec->_name); \ - _info[_n].data = &_rec->_name; \ - _info[_n].data_len = sizeof(_rec->_name); \ - _info[_n].visible = _show; \ -@@ -1041,7 +1042,7 @@ updated: - if (!passwd_done && !strcmp(#_param, name)) { \ - passwd_done = 1; \ - name = #_param "_length"; \ -- snprintf(passwd_len, 8, "%d", (int)strlen(value)); \ -+ snprintf(passwd_len, 8, "%.7" PRIi32, (int)strlen(value) & 0xffff); \ - value = passwd_len; \ - goto setup_passwd_len; \ - } --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Make-iscsid-systemd-usage-optional.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Make-iscsid-systemd-usage-optional.patch deleted file mode 100644 index 08248d358..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Make-iscsid-systemd-usage-optional.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 365efb2fd3062065af4b6eb3dc1661b96557dae8 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 21 Aug 2019 16:37:53 +0800 -Subject: [PATCH] Make iscsid systemd usage optional - -Upstream-Status: Backport[https://github.com/open-iscsi/open-iscsi -/commit/f71581bd641dc26d330cb8b97e5ec272dd08f811] - -Signed-off-by: Changqing Li ---- - Makefile | 5 +++++ - usr/Makefile | 2 ++ - usr/iscsid.c | 6 ++++++ - 3 files changed, 13 insertions(+) - -diff --git a/Makefile b/Makefile -index c533e9d..1ef0921 100644 ---- a/Makefile -+++ b/Makefile -@@ -39,6 +39,11 @@ ifneq (,$(CFLAGS)) - export CFLAGS - endif - -+# export systemd disablement if set -+ifneq ($(NO_SYSTEMD),) -+export NO_SYSTEMD -+endif -+ - # Random comments: - # using '$(MAKE)' instead of just 'make' allows make to run in parallel - # over multiple makefile. -diff --git a/usr/Makefile b/usr/Makefile -index f9445ad..0203127 100644 ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -41,7 +41,9 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ - CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) - ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr - LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) -+ifneq ($(NO_SYSTEMD),) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) -+endif - PROGRAMS = iscsid iscsiadm iscsistart - - # libc compat files -diff --git a/usr/iscsid.c b/usr/iscsid.c -index 0c98440..164325e 100644 ---- a/usr/iscsid.c -+++ b/usr/iscsid.c -@@ -34,7 +34,9 @@ - #include - #include - #include -+#ifndef NO_SYSTEMD - #include -+#endif - - #include "iscsid.h" - #include "mgmt_ipc.h" -@@ -339,6 +341,7 @@ static void missing_iname_warn(char *initiatorname_file) - /* called right before we enter the event loop */ - static void set_state_to_ready(void) - { -+#ifndef NO_SYSTEMD - if (sessions_to_recover) - sd_notify(0, "READY=1\n" - "RELOADING=1\n" -@@ -346,14 +349,17 @@ static void set_state_to_ready(void) - else - sd_notify(0, "READY=1\n" - "STATUS=Ready to process requests\n"); -+#endif - } - - /* called when recovery process has been reaped */ - static void set_state_done_reloading(void) - { -+#ifndef NO_SYSTEMD - sessions_to_recover = 0; - sd_notifyf(0, "READY=1\n" - "STATUS=Ready to process requests\n"); -+#endif - } - - int main(int argc, char *argv[]) --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch deleted file mode 100644 index 37b764e85..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch +++ /dev/null @@ -1,92 +0,0 @@ -From e9b49664e969fd5cad1abef7b8b59e1fb8d02a47 Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Mon, 12 Nov 2018 13:10:04 -0800 -Subject: [PATCH] Use pkg-config in Makefiles for newer libraries. - -These two recently-added libraries can be in different -locations on different distros, so use pkg-config to -added the appropriate actions in the make files. - -Upstream-Status: Backport[https://github.com/open-iscsi/open-iscsi/commit/ -623a81123c494f5c69dc6616bd72e838862e2f1f#diff-c4bf6688222ad28c9719cfaf88c16329] - -Signed-off-by: Changqing Li ---- - libopeniscsiusr/Makefile | 8 +++++++- - usr/Makefile | 11 ++++++++--- - 2 files changed, 15 insertions(+), 4 deletions(-) - -diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile -index bf7c96c..a045a45 100644 ---- a/libopeniscsiusr/Makefile -+++ b/libopeniscsiusr/Makefile -@@ -23,6 +23,8 @@ endif - INCLUDE_DIR ?= $(prefix)/include - PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig - -+PKG_CONFIG = /usr/bin/pkg-config -+ - LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr - - LIBISCSI_USR_VERSION_MAJOR=0 -@@ -43,13 +45,17 @@ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o - - CFLAGS ?= -O2 -g - CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC -+CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) -+ -+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) - - LIBADD = - - all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc - - $(LIBS): $(OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) -+ @echo CFLAGS= $(CFLAGS) -+ $(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS) $(LIBADD) - ln -sf $@ $(DEVLIB) - - $(LIBS_MAJOR): $(LIBS) -diff --git a/usr/Makefile b/usr/Makefile -index f9445ad..f1c35aa 100644 ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -32,11 +32,16 @@ IPC_OBJ=ioctl.o - endif - endif - -+PKG_CONFIG = /usr/bin/pkg-config -+ - CFLAGS ?= -O2 -g - WARNFLAGS ?= -Wall -Wstrict-prototypes - CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ - -I$(TOPDIR)/libopeniscsiusr -+CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) - ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr -+LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) -+LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) - PROGRAMS = iscsid iscsiadm iscsistart - - # libc compat files -@@ -60,14 +65,14 @@ all: $(PROGRAMS) - - iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ - iscsid.o session_mgmt.o discoveryd.o mntcheck.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(ISCSI_LIB) -+ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(LDFLAGS) $(ISCSI_LIB) - - iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB) -+ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB) - - iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB) -+ $(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB) - clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) - --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.877.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.877.bb deleted file mode 100644 index 3cef70f5e..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.877.bb +++ /dev/null @@ -1,119 +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" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRCREV ?= "120ac127654c4644d46a74799fffe527ab1f4f42" - -SRC_URI = "git://github.com/open-iscsi/open-iscsi \ - file://0001-Fix-i586-build-issues-with-string-length-overflow.patch \ - file://initd.debian \ - file://99_iscsi-initiator-utils \ - file://iscsi-initiator \ - file://iscsi-initiator.service \ - file://iscsi-initiator-targets.service \ - file://set_initiatorname \ - file://0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch \ - file://0001-Make-iscsid-systemd-usage-optional.patch \ - " -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" - -PV .= "+git${SRCPV}" - -inherit update-rc.d systemd autotools pkgconfig - -EXTRA_OECONF = " \ - --target=${TARGET_SYS} \ - --host=${BUILD_SYS} \ -" - -EXTRA_OEMAKE = ' \ - OS="${TARGET_SYS}" \ - TARGET="${TARGET_OS}" \ - BASE="${prefix}" \ - MANDIR="${mandir}" \ - OPTFLAGS="-DNO_SYSTEMD ${CFLAGS}" \ - PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \ - NO_SYSTEMD=1 \ -' - -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.0.878.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb new file mode 100644 index 000000000..b75e54b9c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.878.bb @@ -0,0 +1,120 @@ +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 ?= "288add22d6b61cc68ede358faeec9affb15019cd" + +SRC_URI = "git://github.com/open-iscsi/open-iscsi \ + 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" +B = "${WORKDIR}/build" + +PV .= "+git${SRCPV}" + +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', d)}" + +EXTRA_OEMAKE = ' \ + OS="${TARGET_SYS}" \ + TARGET="${TARGET_OS}" \ + BASE="${prefix}" \ + MANDIR="${mandir}" \ + OPTFLAGS="-DNO_SYSTEMD ${CFLAGS}" \ + PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \ + NO_SYSTEMD=1 \ +' + + +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/lldpd/files/0001-priv-include-limits.h-for-PATH_MAX.patch b/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/0001-priv-include-limits.h-for-PATH_MAX.patch deleted file mode 100644 index 9ea4a9ffb..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/0001-priv-include-limits.h-for-PATH_MAX.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c6a283bfcbfefe9c89113e81b0f792c12c4eefb8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= -Date: Mon, 25 Mar 2019 18:43:03 +0100 -Subject: [PATCH] priv: include limits.h for PATH_MAX - -Upstream-Status: Backport - -Signed-off-by: Oleksandr Kravchuk ---- - src/daemon/priv.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/daemon/priv.c b/src/daemon/priv.c -index f4d6bdf..ba5ae58 100644 ---- a/src/daemon/priv.c -+++ b/src/daemon/priv.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.3.bb b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.3.bb deleted file mode 100644 index e650b5795..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.3.bb +++ /dev/null @@ -1,65 +0,0 @@ -SUMMARY = "A 802.1ab implementation (LLDP) to help you locate neighbors of all your equipments" -SECTION = "net/misc" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" - -DEPENDS = "libbsd libevent" - -SRC_URI = "\ - http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \ - file://lldpd.init.d \ - file://lldpd.default \ - file://0001-priv-include-limits.h-for-PATH_MAX.patch \ - " - -SRC_URI[md5sum] = "04844328f053ee343344d892efb8a00c" -SRC_URI[sha256sum] = "39fced395168015416bfe78b95414facf066f841f349024433aa20ab54e4c360" - -inherit autotools update-rc.d useradd systemd pkgconfig bash-completion - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system -g lldpd --shell /bin/false lldpd" -GROUPADD_PARAM_${PN} = "--system lldpd" - -EXTRA_OECONF += "--without-embedded-libevent \ - --disable-oldies \ - --with-privsep-user=lldpd \ - --with-privsep-group=lldpd \ - --with-systemdsystemunitdir=${systemd_system_unitdir} \ - --without-sysusersdir \ -" - -PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" -PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2" -PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" -PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp" -PACKAGECONFIG[cdp] = "--enable-cdp,--disable-cdp" -PACKAGECONFIG[fdp] = "--enable-fdp,--disable-fdp" -PACKAGECONFIG[edp] = "--enable-edp,--disable-edp" -PACKAGECONFIG[sonmp] = "--enable-sonmp,--disable-sonmp" -PACKAGECONFIG[lldpmed] = "--enable-lldpmed,--disable-lldpmed" -PACKAGECONFIG[dot1] = "--enable-dot1,--disable-dot1" -PACKAGECONFIG[dot3] = "--enable-dot3,--disable-dot3" -PACKAGECONFIG[custom] = "--enable-custom,--disable-custom" - -INITSCRIPT_NAME = "lldpd" -INITSCRIPT_PARAMS = "defaults" - -SYSTEMD_SERVICE_${PN} = "lldpd.service" - -do_install_append() { - install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd - install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd - # Make an empty configuration file - touch ${D}${sysconfdir}/lldpd.conf -} - -PACKAGES =+ "${PN}-zsh-completion" - -FILES_${PN} += "${libdir}/sysusers.d" -RDEPENDS_${PN} += "os-release" - -FILES_${PN}-zsh-completion += "${datadir}/zsh/" -# FIXME: zsh is broken in meta-oe so this cannot be enabled for now -#RDEPENDS_${PN}-zsh-completion += "zsh" diff --git a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb new file mode 100644 index 000000000..8fdaf848f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb @@ -0,0 +1,64 @@ +SUMMARY = "A 802.1ab implementation (LLDP) to help you locate neighbors of all your equipments" +SECTION = "net/misc" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" + +DEPENDS = "libbsd libevent" + +SRC_URI = "\ + http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \ + file://lldpd.init.d \ + file://lldpd.default \ + " + +SRC_URI[md5sum] = "33e8d58623f99184e4e709cbbfe45db3" +SRC_URI[sha256sum] = "5319bc032fabf1008d5d91e280276aa7f1bbfbb70129d8526cd4526d7c22724f" + +inherit autotools update-rc.d useradd systemd pkgconfig bash-completion + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system -g lldpd --shell /bin/false lldpd" +GROUPADD_PARAM_${PN} = "--system lldpd" + +EXTRA_OECONF += "--without-embedded-libevent \ + --disable-oldies \ + --with-privsep-user=lldpd \ + --with-privsep-group=lldpd \ + --with-systemdsystemunitdir=${systemd_system_unitdir} \ + --without-sysusersdir \ +" + +PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" +PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2" +PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" +PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp" +PACKAGECONFIG[cdp] = "--enable-cdp,--disable-cdp" +PACKAGECONFIG[fdp] = "--enable-fdp,--disable-fdp" +PACKAGECONFIG[edp] = "--enable-edp,--disable-edp" +PACKAGECONFIG[sonmp] = "--enable-sonmp,--disable-sonmp" +PACKAGECONFIG[lldpmed] = "--enable-lldpmed,--disable-lldpmed" +PACKAGECONFIG[dot1] = "--enable-dot1,--disable-dot1" +PACKAGECONFIG[dot3] = "--enable-dot3,--disable-dot3" +PACKAGECONFIG[custom] = "--enable-custom,--disable-custom" + +INITSCRIPT_NAME = "lldpd" +INITSCRIPT_PARAMS = "defaults" + +SYSTEMD_SERVICE_${PN} = "lldpd.service" + +do_install_append() { + install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd + install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd + # Make an empty configuration file + touch ${D}${sysconfdir}/lldpd.conf +} + +PACKAGES =+ "${PN}-zsh-completion" + +FILES_${PN} += "${libdir}/sysusers.d" +RDEPENDS_${PN} += "os-release" + +FILES_${PN}-zsh-completion += "${datadir}/zsh/" +# FIXME: zsh is broken in meta-oe so this cannot be enabled for now +#RDEPENDS_${PN}-zsh-completion += "zsh" diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch index 16a611e3c..2606a3667 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch @@ -8,30 +8,39 @@ Upstream-Status: Inappropriate [config] Signed-off-by: Yauhen Kharuzhy Signed-off-by: Tudor Florea +Update for 1.0.49. +Signed-off-by: Zheng Ruoqin + --- - configure.ac | 12 ------------ - 1 file changed, 12 deletions(-) + configure.ac | 15 --------------- + 1 file changed, 15 deletions(-) diff --git a/configure.ac b/configure.ac -index 3a4209b..695ce68 100644 +index 079e6f0..9a1ec06 100644 --- a/configure.ac +++ b/configure.ac -@@ -91,18 +91,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) +@@ -96,21 +96,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"]) AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"]) --if test -d /usr/local/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --if test -d /usr/kerberos/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" --fi -- --if test -d /usr/local/lib; then -- LDFLAGS="$LDFLAGS -L/usr/local/lib" +-if test "x$cross_compiling" != "xyes"; then +- for path in \ +- /usr/kerberos \ +- /usr/local /opt /usr/local/opt \ +- /usr/openssl@1.1 /opt/openssl@1.1 /usr/local/opt/openssl@1.1 \ +- /usr/openssl /opt/openssl /usr/local/opt/openssl; do +- if test -d $path/include; then +- CPPFLAGS="$CPPFLAGS -I${path}/include" +- fi +- if test -d $path/lib; then +- LDFLAGS="$LDFLAGS -L${path}/lib" +- fi +- done -fi - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" dnl Checks for header files +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb deleted file mode 100644 index e7c530be3..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.47.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "FTP Server with a strong focus on software security" -DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and standard-conformant FTP server." -HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" -SECTION = "net" -LICENSE = "BSD-0-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=0595b4261a04bc2d27f30b9c90796c1f" - -DEPENDS = "libcap virtual/crypt" - -SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.tar.gz \ - file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ - file://nostrip.patch \ -" -SRC_URI[md5sum] = "f000e519918682ee6b65090352177d4a" -SRC_URI[sha256sum] = "4740c316f5df879a2d68464489fb9b8b90113fe7dce58e2cdd2054a4768f27ad" - -inherit autotools - -EXTRA_OECONF = "--with-minimal" -PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ - ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.49.bb b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.49.bb new file mode 100644 index 000000000..5a8e9c130 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.49.bb @@ -0,0 +1,20 @@ +SUMMARY = "FTP Server with a strong focus on software security" +DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and standard-conformant FTP server." +HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" +SECTION = "net" +LICENSE = "BSD-0-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e25e28bc568d70eb26c3a91387c86ccb" + +DEPENDS = "libcap virtual/crypt" + +SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.tar.gz \ + file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ + file://nostrip.patch \ +" +SRC_URI[md5sum] = "451879495ba61c1d7dcfca8dd231119f" +SRC_URI[sha256sum] = "767bf458c70b24f80c0bb7a1bbc89823399e75a0a7da141d30051a2b8cc892a5" + +inherit autotools + +PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ + ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" diff --git a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb deleted file mode 100644 index 5cfa3aa82..000000000 --- a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "A high performance, open source, general-purpose RPC framework. \ -Provides gRPC libraries for multiple languages written on top of shared C core library \ -(C++, Node.js, Python, Ruby, Objective-C, PHP, C#)" -HOMEPAGE = "https://github.com/grpc/grpc" -SECTION = "libs" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -DEPENDS = "gflags c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl" -DEPENDS_append_class-target = " googletest grpc-native " -DEPENDS_append_class-nativesdk = " grpc-native " - -S = "${WORKDIR}/git" -SRCREV_grpc = "fe494ff4104b6f6a78117ab2da71d29c93053267" -SRCREV_upb = "9effcbcb27f0a665f9f345030188c0b291e32482" -BRANCH = "v1.24.x" -SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ - git://github.com/protocolbuffers/upb;name=upb;destsuffix=git/third_party/upb \ - file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ - " -SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch \ - " -SRC_URI_append_class-nativesdk = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch" - -# Fixes build with older compilers 4.8 especially on ubuntu 14.04 -CXXFLAGS_append_class-native = " -Wl,--no-as-needed" - -inherit cmake pkgconfig - -EXTRA_OECMAKE = " \ - -DgRPC_CARES_PROVIDER=package \ - -DgRPC_ZLIB_PROVIDER=package \ - -DgRPC_SSL_PROVIDER=package \ - -DgRPC_PROTOBUF_PROVIDER=package \ - -DgRPC_GFLAGS_PROVIDER=package \ - -DgRPC_INSTALL=ON \ - -DCMAKE_CROSSCOMPILING=ON \ - -DBUILD_SHARED_LIBS=ON \ - " - -do_configure_prepend_mipsarch() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -BBCLASSEXTEND = "native nativesdk" - -SYSROOT_DIRS_BLACKLIST_append_class-target = "${libdir}/cmake/grpc" - -FILES_${PN}-dev += "${bindir}" diff --git a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb new file mode 100644 index 000000000..2d7694a4f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "A high performance, open source, general-purpose RPC framework. \ +Provides gRPC libraries for multiple languages written on top of shared C core library \ +(C++, Node.js, Python, Ruby, Objective-C, PHP, C#)" +HOMEPAGE = "https://github.com/grpc/grpc" +SECTION = "libs" +LICENSE = "Apache-2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS = "gflags c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl" +DEPENDS_append_class-target = " googletest grpc-native " +DEPENDS_append_class-nativesdk = " grpc-native " + +S = "${WORKDIR}/git" +SRCREV_grpc = "2de2e8dd8921e1f7d043e01faf7fe8a291fbb072" +SRCREV_upb = "9effcbcb27f0a665f9f345030188c0b291e32482" +BRANCH = "v1.24.x" +SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ + git://github.com/protocolbuffers/upb;name=upb;destsuffix=git/third_party/upb \ + file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ + " +SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch \ + " +SRC_URI_append_class-nativesdk = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch" + +# Fixes build with older compilers 4.8 especially on ubuntu 14.04 +CXXFLAGS_append_class-native = " -Wl,--no-as-needed" + +inherit cmake pkgconfig + +EXTRA_OECMAKE = " \ + -DgRPC_CARES_PROVIDER=package \ + -DgRPC_ZLIB_PROVIDER=package \ + -DgRPC_SSL_PROVIDER=package \ + -DgRPC_PROTOBUF_PROVIDER=package \ + -DgRPC_GFLAGS_PROVIDER=package \ + -DgRPC_INSTALL=ON \ + -DCMAKE_CROSSCOMPILING=ON \ + -DBUILD_SHARED_LIBS=ON \ + " + +do_configure_prepend_mipsarch() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +BBCLASSEXTEND = "native nativesdk" + +SYSROOT_DIRS_BLACKLIST_append_class-target = "${libdir}/cmake/grpc" + +FILES_${PN}-dev += "${bindir}" diff --git a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb deleted file mode 100644 index e5fa16a13..000000000 --- a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "The Corosync Cluster Engine and Application Programming Interfaces" -DESCRIPTION = "This package contains the Corosync Cluster Engine Executive, several default \ -APIs and libraries, default configuration files, and an init script." -HOMEPAGE = "http://corosync.github.io/corosync/" - -SECTION = "base" - -inherit autotools pkgconfig systemd useradd - -SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \ - file://corosync.conf \ - " - -SRC_URI[md5sum] = "69db29ff4bc035936946be44fc8be5cd" -SRC_URI[sha256sum] = "9bd4707bb271df16f8d543ec782eb4c35ec0330b7be696b797da4bd8f058a25d" - -UPSTREAM_CHECK_REGEX = "(?P\d+\.(?!99)\d+(\.\d+)+)" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" - -DEPENDS = "groff-native nss libqb" - -SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \ - ${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'corosync-qnetd.service', '', d)} \ -" -SYSTEMD_AUTO_ENABLE = "disable" - -INITSCRIPT_NAME = "corosync-daemon" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - dbus qdevice qnetd snmp \ -" - -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" -PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices" -PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd" -PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma,librdmacm" -PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd" - -EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash ap_cv_cc_pie=no" -EXTRA_OEMAKE = "tmpfilesdir_DATA=" - -do_configure_prepend() { - ( cd ${S} - ${S}/autogen.sh ) -} - -do_install_append() { - install -D -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example - install -d ${D}${sysconfdir}/sysconfig/ - install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync - install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd - - rm -rf "${D}${localstatedir}/run" - - install -d ${D}${sysconfdir}/default/volatiles - echo "d root root 0755 ${localstatedir}/log/cluster none" > ${D}${sysconfdir}/default/volatiles/05_corosync - - if [ ${@bb.utils.filter('PACKAGECONFIG', 'qnetd', d)} ]; then - chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd - echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none" >> ${D}${sysconfdir}/default/volatiles/05_corosync - fi - - if [ ${@bb.utils.filter('DISTRO_FEATURES','systemd',d)} ]; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf - fi -} - -RDEPENDS_${PN} += "bash ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" - -FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" -FILES_${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system coroqnetd" -USERADD_PARAM_${PN} = "--system -d / -M -s /bin/nologin -c 'User for corosync-qnetd' -g coroqnetd coroqnetd" diff --git a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb new file mode 100644 index 000000000..1f4a3e1c6 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb @@ -0,0 +1,80 @@ +SUMMARY = "The Corosync Cluster Engine and Application Programming Interfaces" +DESCRIPTION = "This package contains the Corosync Cluster Engine Executive, several default \ +APIs and libraries, default configuration files, and an init script." +HOMEPAGE = "http://corosync.github.io/corosync/" + +SECTION = "base" + +inherit autotools pkgconfig systemd useradd + +SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \ + file://corosync.conf \ + " + +SRC_URI[md5sum] = "e36a056b893c313c4ec1fe0d7e6cdebd" +SRC_URI[sha256sum] = "ab6eafdb8f43a23794fc15d4c5198bbd6759060cb13c8d2d1e78a6c8360aba5f" + +UPSTREAM_CHECK_REGEX = "(?P\d+\.(?!99)\d+(\.\d+)+)" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" + +DEPENDS = "groff-native nss libqb" + +SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'corosync-qnetd.service', '', d)} \ +" +SYSTEMD_AUTO_ENABLE = "disable" + +INITSCRIPT_NAME = "corosync-daemon" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + dbus qdevice qnetd snmp \ +" + +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" +PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices" +PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd" +PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma,librdmacm" +PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd" + +EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash ap_cv_cc_pie=no" +EXTRA_OEMAKE = "tmpfilesdir_DATA=" + +do_configure_prepend() { + ( cd ${S} + ${S}/autogen.sh ) +} + +do_install_append() { + install -D -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example + install -d ${D}${sysconfdir}/sysconfig/ + install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync + install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd + + rm -rf "${D}${localstatedir}/run" + + install -d ${D}${sysconfdir}/default/volatiles + echo "d root root 0755 ${localstatedir}/log/cluster none" > ${D}${sysconfdir}/default/volatiles/05_corosync + + if [ ${@bb.utils.filter('PACKAGECONFIG', 'qnetd', d)} ]; then + chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd + echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none" >> ${D}${sysconfdir}/default/volatiles/05_corosync + fi + + if [ ${@bb.utils.filter('DISTRO_FEATURES','systemd',d)} ]; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf + fi +} + +RDEPENDS_${PN} += "bash ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" + +FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" +FILES_${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system coroqnetd" +USERADD_PARAM_${PN} = "--system -d / -M -s /bin/nologin -c 'User for corosync-qnetd' -g coroqnetd coroqnetd" diff --git a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.4.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.4.bb deleted file mode 100644 index 75860073a..000000000 --- a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.4.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "ZNC, an advanced IRC bouncer" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -DEPENDS = "openssl zlib icu" - -SRC_URI = "git://github.com/znc/znc.git;name=znc \ - git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket \ - " -SRCREV_znc = "e661cdf9a394e2afd1b97517efa21fa2fa757e22" -SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4" - -# This constructs a composite revision based on multiple SRCREV's. -# -SRCREV_FORMAT = "znc_Csocket" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail -do_configure_prepend() { - automake --add-missing || true -} - -do_install_append() { - sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc -} diff --git a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.5.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.5.bb new file mode 100644 index 000000000..a3d4b7cc5 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.7.5.bb @@ -0,0 +1,32 @@ +SUMMARY = "ZNC, an advanced IRC bouncer" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS = "openssl zlib icu" + +SRC_URI = "git://github.com/znc/znc.git;name=znc \ + git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket \ + " +SRCREV_znc = "c7f72f8bc800115ac985e7e13eace78031cb1b50" +SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4" + +# This constructs a composite revision based on multiple SRCREV's. +# +SRCREV_FORMAT = "znc_Csocket" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +# ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail +do_configure_prepend() { + automake --add-missing || true +} + +do_install_append() { + sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc +} diff --git a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.8.4.bb b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.8.4.bb deleted file mode 100644 index 550e126f7..000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.8.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Babel is a loop-avoiding distance-vector routing protocol" -DESCRIPTION = "\ -Babel is a loop-avoiding distance-vector routing protocol for IPv6 and \ -IPv4 with fast convergence properties. It is based on the ideas in DSDV, AODV \ -and Cisco's EIGRP, but is designed to work well not only in wired networks \ -but also in wireless mesh networks, and has been extended with support \ -for overlay networks. Babel is in the process of becoming an IETF Standard. \ -" -HOMEPAGE = "https://www.irif.fr/~jch/software/babel/" -SECTION = "net" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" - -SRC_URI = "git://github.com/jech/babeld.git;protocol=git" -SRCREV = "8627b6fcd4992f2e7992ecec97a4a4aa2d7ff099" - -S = "${WORKDIR}/git" - -do_compile () { - oe_runmake babeld -} - -do_install () { - oe_runmake install.minimal PREFIX=${D} -} - diff --git a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb new file mode 100644 index 000000000..27e7b4307 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb @@ -0,0 +1,27 @@ +SUMMARY = "Babel is a loop-avoiding distance-vector routing protocol" +DESCRIPTION = "\ +Babel is a loop-avoiding distance-vector routing protocol for IPv6 and \ +IPv4 with fast convergence properties. It is based on the ideas in DSDV, AODV \ +and Cisco's EIGRP, but is designed to work well not only in wired networks \ +but also in wireless mesh networks, and has been extended with support \ +for overlay networks. Babel is in the process of becoming an IETF Standard. \ +" +HOMEPAGE = "https://www.irif.fr/~jch/software/babel/" +SECTION = "net" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" + +SRC_URI = "git://github.com/jech/babeld.git;protocol=git" +SRCREV = "0835d5d894ea016ab7b81562466cade2c51a12d4" + +S = "${WORKDIR}/git" + +do_compile () { + oe_runmake babeld +} + +do_install () { + oe_runmake install.minimal PREFIX=${D} +} + diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch deleted file mode 100644 index 863866d18..000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d3082d2c606c810aa0a39378bf1e02575af3a301 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 2 Feb 2018 21:54:11 -0800 -Subject: [PATCH] nss_mdns: Do not include nss.h when libc != glibc - -Provide nss_status macro instead for non-glibc case -where nss.h is absent - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - mDNSPosix/nss_mdns.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c -index afadb3c..c469584 100755 ---- a/mDNSPosix/nss_mdns.c -+++ b/mDNSPosix/nss_mdns.c -@@ -378,8 +378,19 @@ init_config (); - - #define ENTNAME hostent - #define DATABASE "hosts" -- -+#ifdef __GLIBC__ - #include -+#else -+enum nss_status -+{ -+ NSS_STATUS_TRYAGAIN = -2, -+ NSS_STATUS_UNAVAIL, -+ NSS_STATUS_NOTFOUND, -+ NSS_STATUS_SUCCESS, -+ NSS_STATUS_RETURN -+}; -+#define NETDB_INTERNAL NULL -+#endif - // For nss_status - #include - // For hostent --- -2.16.1 - diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb index 1bd17031a..1353b2bed 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb @@ -4,12 +4,13 @@ HOMEPAGE = "http://developer.apple.com/networking/bonjour/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://../LICENSE;md5=31c50371921e0fb731003bbc665f29bf" +COMPATIBLE_HOST_libc-musl = 'null' + RPROVIDES_${PN} += "libdns_sd.so" SRC_URI = "https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ file://build.patch;patchdir=.. \ file://mdns.service \ - file://0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch;patchdir=.. \ " SRC_URI[md5sum] = "e773f290a7d29f1072247985d6add2ff" SRC_URI[sha256sum] = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0" diff --git a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch deleted file mode 100644 index b932ebbb4..000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 748bc693cf24baf42e459e12f152349e392b6737 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 20 Dec 2016 21:32:11 -0800 -Subject: [PATCH] Use foreign switch for automake - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 64cc9994..19ccd4a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,7 @@ dnl SUCH DAMAGE. - dnl - - AC_INIT([libusrsctp], [0.9.3.0]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - - AC_PROG_CC - AC_PROG_LIBTOOL --- -2.11.0 - diff --git a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb index 3ec746684..a5a5605da 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb @@ -2,9 +2,8 @@ DESCRIPTION = "This is a userland SCTP stack supporting FreeBSD, Linux, Mac OS X LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ffcf846341f3856d79a483eafa18e2a5" -SRCREV = "dbfc1b8c4cf1a46a4d8987ba542d5ff06bdaf14c" +SRCREV = "a10cd498d964508c0e6ec6bd2be9dd4afcbb4d86" SRC_URI = "git://github.com/sctplab/usrsctp;protocol=https;branch=master \ - file://0001-Use-foreign-switch-for-automake.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE deleted file mode 100644 index 54a28120e..000000000 --- a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 1998-2008 Distributed Management Task Force, Inc. (DMTF). -// All rights reserved. -// DMTF is a not-for-profit association of industry members dedicated -// to promoting enterprise and systems management and interoperability. -// DMTF specifications and documents may be reproduced by -// members and non-members, provided that correct attribution is given. -// As DMTF specifications may be revised from time to time, -// the particular version and release date should always be noted. -// -// Implementation of certain elements of this standard or proposed -// standard may be subject to third party patent rights, including -// provisional patent rights (herein "patent rights"). DMTF makes -// no representations to users of the standard as to the existence -// of such rights, and is not responsible to recognize, disclose, or -// identify any or all such third party patent right, owners or -// claimants, nor for any incomplete or inaccurate identification or -// disclosure of such rights, owners or claimants. DMTF shall have no -// liability to any party, in any manner or circumstance, under any -// legal theory whatsoever, for failure to recognize, disclose, or -// identify any such third party patent rights, or for such party's -// reliance on the standard or incorporation thereof in its product, -// protocols or testing procedures. DMTF shall have no liability to -// any party implementing such standard, whether such implementation -// is foreseeable or not, nor to any patent owner or claimant, and shall -// have no liability or responsibility for costs or losses incurred if -// a standard is withdrawn or modified after publication, and shall be -// indemnified and held harmless by any party implementing the -// standard from any and all claims of infringement by a patent owner -// for such implementations. -// -// For information about patents held by third-parties which have -// notified the DMTF that, in their opinion, such patent may relate to -// or impact implementations of DMTF standards, visit -// http://www.dmtf.org/about/policies/disclosures.php. diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.3.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.3.bb deleted file mode 100644 index be633e03b..000000000 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.3.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "Dovecot is an open source IMAP and POP3 email server" -HOMEPAGE = "https://www.dovecot.org/" -DESCRIPTION = "Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like systems, written with security primarily in mind. Dovecot is an excellent choice for both small and large installations. It's fast, simple to set up, requires no special administration and it uses very little memory." -SECTION = "mail" -LICENSE = "LGPLv2.1 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=a981379bd0f1c362f8d1d21515e5b30b" - -SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ - file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ - file://dovecot.service \ - file://dovecot.socket \ - file://0001-doveadm-Fix-parallel-build.patch \ - " - -SRC_URI[md5sum] = "80c1c271b1c4cbe26a793f4e3b09eb8e" -SRC_URI[sha256sum] = "992521305fa1d61f4726aac2619ccc65094a3cc2e5c80644455199764305863e" - -DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc" -CFLAGS += "-I${STAGING_INCDIR}/tirpc" -LDFLAGS += "-ltirpc" - -inherit autotools pkgconfig systemd useradd - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)}" - -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," -PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap," -PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," - -# From native build in armv7a-hf/eglibc -CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \ - i_cv_gmtime_max_time_t=32 \ - i_cv_signed_time_t=yes \ - i_cv_mmap_plays_with_write=yes \ - i_cv_fd_passing=yes \ - i_cv_c99_vsnprintf=yes \ - lib_cv___va_copy=yes \ - lib_cv_va_copy=yes \ - lib_cv_va_val_copy=yes \ - " - -# hardcode epoll() to avoid running unsafe tests -# BSD needs kqueue and uclibc poll() -EXTRA_OECONF = " --with-ioloop=epoll \ - --with-systemdsystemunitdir=${systemd_unitdir}/system" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "dovecot.service dovecot.socket" -SYSTEMD_AUTO_ENABLE = "disable" - -do_install_append () { - install -d 755 ${D}/etc/dovecot - touch 644 ${D}/etc/dovecot/dovecot.conf - install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovecot dovecot; \ - -r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovenull dovenull" -GROUPADD_PARAM_${PN} = "-f -r dovecot;-f -r dovenull" - -FILES_${PN} += "${libdir}/dovecot/*plugin.so \ - ${libdir}/dovecot/libfs_compress.so \ - ${libdir}/dovecot/libssl_iostream_openssl.so" -FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" -FILES_${PN}-dev += "${libdir}/dovecot/libdovecot*.so" -FILES_${PN}-dbg += "${libdir}/dovecot/*/.debug" diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb new file mode 100644 index 000000000..239a25273 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb @@ -0,0 +1,69 @@ +SUMMARY = "Dovecot is an open source IMAP and POP3 email server" +HOMEPAGE = "https://www.dovecot.org/" +DESCRIPTION = "Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like systems, written with security primarily in mind. Dovecot is an excellent choice for both small and large installations. It's fast, simple to set up, requires no special administration and it uses very little memory." +SECTION = "mail" +LICENSE = "LGPLv2.1 & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=a981379bd0f1c362f8d1d21515e5b30b" + +SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ + file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ + file://dovecot.service \ + file://dovecot.socket \ + file://0001-doveadm-Fix-parallel-build.patch \ + " + +SRC_URI[md5sum] = "66c4d71858b214afee5b390ee602dee2" +SRC_URI[sha256sum] = "777c61e264869e9b288b8d6603f4ed3ac3aac9ec573908067353f51269dce2fe" + +DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += "-ltirpc" + +inherit autotools pkgconfig systemd useradd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)}" + +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," +PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap," +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," + +# From native build in armv7a-hf/eglibc +CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \ + i_cv_gmtime_max_time_t=32 \ + i_cv_signed_time_t=yes \ + i_cv_mmap_plays_with_write=yes \ + i_cv_fd_passing=yes \ + i_cv_c99_vsnprintf=yes \ + lib_cv___va_copy=yes \ + lib_cv_va_copy=yes \ + lib_cv_va_val_copy=yes \ + " + +# hardcode epoll() to avoid running unsafe tests +# BSD needs kqueue and uclibc poll() +EXTRA_OECONF = " --with-ioloop=epoll \ + --with-systemdsystemunitdir=${systemd_unitdir}/system" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "dovecot.service dovecot.socket" +SYSTEMD_AUTO_ENABLE = "disable" + +do_install_append () { + install -d 755 ${D}/etc/dovecot + touch 644 ${D}/etc/dovecot/dovecot.conf + install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovecot dovecot; \ + -r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovenull dovenull" +GROUPADD_PARAM_${PN} = "-f -r dovecot;-f -r dovenull" + +FILES_${PN} += "${libdir}/dovecot/*plugin.so \ + ${libdir}/dovecot/libfs_compress.so \ + ${libdir}/dovecot/libssl_iostream_openssl.so" +FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" +FILES_${PN}-dev += "${libdir}/dovecot/libdovecot*.so" +FILES_${PN}-dbg += "${libdir}/dovecot/*/.debug" diff --git a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.1.bb b/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.1.bb deleted file mode 100644 index d4fd73e3d..000000000 --- a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2018 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "HTTP based time synchronization tool" - -DESCRIPTION = "The HTTP Time Protocol (HTP) is used to synchronize a computer's time with\ - web servers as reference time source. This program can be used instead\ - ntpdate or similar, in networks that has a firewall blocking the NTP port.\ - Htpdate will synchronize the computer time to Greenwich Mean Time (GMT),\ - using the timestamps from HTTP headers found in web servers response (the\ - HEAD method will be used to get the information).\ - Htpdate works through proxy servers. Accuracy of htpdate will be usually\ - within 0.5 seconds (better with multiple servers).\ -" - -HOMEPAGE = "http://www.vervest.org/htp/" - -LICENSE = "GPL-2.0+" -LIC_FILES_CHKSUM = "file://htpdate.c;beginline=26;endline=30;md5=d7018a4d2c5a6eab392709a05e5e168a" - -SRC_URI = "http://www.vervest.org/htp/archive/c/htpdate-${PV}.tar.xz \ - file://0001-Make-environment-variables-assignments-to-be-weak.patch \ - file://0001-Replace-ntp_adjtime-with-adjtimex.patch \ - " -SRC_URI[md5sum] = "cab01ddcb62bd84154670a37a7a0c31c" -SRC_URI[sha256sum] = "186c69509ba68178e2894cb8900e240bb688870ec25de2ac4676724e1e1d1cbf" - -do_configure () { - : -} - -do_compile () { - oe_runmake -} - -do_install () { - oe_runmake install 'INSTALL=install' 'STRIP=echo' 'DESTDIR=${D}' -} - diff --git a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb b/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb new file mode 100644 index 000000000..d9d726861 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb @@ -0,0 +1,39 @@ +# Copyright (C) 2018 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "HTTP based time synchronization tool" + +DESCRIPTION = "The HTTP Time Protocol (HTP) is used to synchronize a computer's time with\ + web servers as reference time source. This program can be used instead\ + ntpdate or similar, in networks that has a firewall blocking the NTP port.\ + Htpdate will synchronize the computer time to Greenwich Mean Time (GMT),\ + using the timestamps from HTTP headers found in web servers response (the\ + HEAD method will be used to get the information).\ + Htpdate works through proxy servers. Accuracy of htpdate will be usually\ + within 0.5 seconds (better with multiple servers).\ +" + +HOMEPAGE = "http://www.vervest.org/htp/" + +LICENSE = "GPL-2.0+" +LIC_FILES_CHKSUM = "file://htpdate.c;beginline=26;endline=30;md5=d7018a4d2c5a6eab392709a05e5e168a" + +SRC_URI = "http://www.vervest.org/htp/archive/c/htpdate-${PV}.tar.xz \ + file://0001-Make-environment-variables-assignments-to-be-weak.patch \ + file://0001-Replace-ntp_adjtime-with-adjtimex.patch \ + " +SRC_URI[md5sum] = "aad8c33933648532ac8716c809b15be1" +SRC_URI[sha256sum] = "5f1f959877852abb3153fa407e8532161a7abe916aa635796ef93f8e4119f955" + +do_configure () { + : +} + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake install 'INSTALL=install' 'STRIP=echo' 'DESTDIR=${D}' +} + diff --git a/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.92.bb b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.92.bb deleted file mode 100644 index 2bc7d9787..000000000 --- a/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.92.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Combined traceroute and ping utility" -DESCRIPTION = "mtr combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool." -HOMEPAGE = "http://www.bitwizard.nl/mtr/" -SECTION = "net" -DEPENDS = "ncurses" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://ui/mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106" - -PV .= "+git${SRCPV}" - -SRCREV = "6cddfc6e8f0e20af4af218b545f83d43b3f9a387" -SRC_URI = "git://github.com/traviscross/mtr" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--without-gtk" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -PACKAGES += "${PN}-bash-completions" - -FILES_${PN}-bash-completions = "${datadir}/bash-completion/" diff --git a/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb new file mode 100644 index 000000000..dd150700a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb @@ -0,0 +1,25 @@ +SUMMARY = "Combined traceroute and ping utility" +DESCRIPTION = "mtr combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool." +HOMEPAGE = "http://www.bitwizard.nl/mtr/" +SECTION = "net" +DEPENDS = "ncurses" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://ui/mtr.c;beginline=5;endline=16;md5=00a894a39d53726a27386534d1c4e468" + +SRCREV = "304349bad86229aedbc62c07d5e98a8292967991" +SRC_URI = "git://github.com/traviscross/mtr" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--without-gtk" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +PACKAGES += "${PN}-bash-completions" + +FILES_${PN}-bash-completions = "${datadir}/bash-completion/" diff --git a/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.19.bb b/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.19.bb deleted file mode 100644 index a6da18ea7..000000000 --- a/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.19.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Network Block Device" -HOMEPAGE = "http://nbd.sourceforge.net" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "glib-2.0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "162da84302abb5b9be06143c7943a642" -SRC_URI[sha256sum] = "b4466412f13e057659f25d35e1e8e181afd62c7179bff22a6add81445ecb8690" - -inherit autotools pkgconfig - -PACKAGES = "${PN}-client ${PN}-server ${PN}-dbg ${PN}-trdump ${PN}-doc" - -FILES_${PN}-client = "${sbindir}/${BPN}-client" -FILES_${PN}-server = "${bindir}/${BPN}-server" -FILES_${PN}-trdump = "${bindir}/${BPN}-trdump" diff --git a/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb b/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb new file mode 100644 index 000000000..12a82c25b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Network Block Device" +HOMEPAGE = "http://nbd.sourceforge.net" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "glib-2.0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "910fe6c152f8c30ad8608388e6a4ce89" +SRC_URI[sha256sum] = "e0e1b3538ab7ae5accf56180afd1a9887d415b98d21223b8ad42592b4af7d6cd" + +inherit autotools pkgconfig + +PACKAGES = "${PN}-client ${PN}-server ${PN}-dbg ${PN}-trdump ${PN}-doc" + +FILES_${PN}-client = "${sbindir}/${BPN}-client" +FILES_${PN}-server = "${bindir}/${BPN}-server" +FILES_${PN}-trdump = "${bindir}/${BPN}-trdump" diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.31.bb b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.31.bb deleted file mode 100644 index 4b072f7e7..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.31.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "reimplement libdjb" -DESCRIPTION = "libowfat is a library of general purpose APIs extracted from Dan \ -Bernstein's software (libdjb), reimplemented and covered by the GNU \ -General Public License Version 2 (no later versions)." -HOMEPAGE = "http://www.fefe.de/libowfat" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "120798fab86cfd72dc6b12284d248dd0" -SRC_URI[sha256sum] = "d1e4ac1cfccbb7dc51d77d96398e6302d229ba7538158826c84cb4254c7e8a12" - -EXTRA_OEMAKE = "\ - DIET= \ - CC='${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}' \ - CCC='${CC}' CFLAGS='${CFLAGS} -I.' CFLAGS_OPT='${CFLAGS} -I.' \ -" - -do_install() { - make install \ - DESTDIR=${D} \ - INCLUDEDIR=${includedir}/${BPN} \ - LIBDIR=${libdir} \ - MAN3DIR=${mandir}/man3 -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb new file mode 100644 index 000000000..a5e2c21cf --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb @@ -0,0 +1,27 @@ +SUMMARY = "reimplement libdjb" +DESCRIPTION = "libowfat is a library of general purpose APIs extracted from Dan \ +Bernstein's software (libdjb), reimplemented and covered by the GNU \ +General Public License Version 2 (no later versions)." +HOMEPAGE = "http://www.fefe.de/libowfat" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz" +SRC_URI[md5sum] = "ee015ccf45cb2bc61c942642038c2bdc" +SRC_URI[sha256sum] = "f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1" + +EXTRA_OEMAKE = "\ + DIET= \ + CC='${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}' \ + CCC='${CC}' CFLAGS='${CFLAGS} -I.' CFLAGS_OPT='${CFLAGS} -I.' \ +" + +do_install() { + make install \ + DESTDIR=${D} \ + INCLUDEDIR=${includedir} \ + LIBDIR=${libdir} \ + MAN3DIR=${mandir}/man3 +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.2.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.2.bb deleted file mode 100644 index 0607c9d77..000000000 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.2.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Unbound is a validating, recursive, and caching DNS resolver" -DESCRIPTION = "Unbound's design is a set of modular components which incorporate \ - features including enhanced security (DNSSEC) validation, Internet Protocol \ - Version 6 (IPv6), and a client resolver library API as an integral part of the \ - architecture" - -HOMEPAGE = "https://www.unbound.net/" -SECTION = "net" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" - -SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master \ - file://0001-contrib-add-yocto-compatible-startup-scripts.patch \ -" -SRCREV="ee06aaaad99dc4d6b73f915d98f05c506885b98a" - -inherit autotools pkgconfig systemd update-rc.d - -DEPENDS = "openssl libevent libtool-native bison-native expat" -RDEPENDS_${PN} = "bash openssl-bin daemonize" - -S = "${WORKDIR}/git" - -EXTRA_OECONF = "--with-libexpat=${STAGING_EXECPREFIXDIR} \ - --with-ssl=${STAGING_EXECPREFIXDIR} \ - libtool=${TARGET_PREFIX}libtool \ -" - - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile systemd', d)}" -PACKAGECONFIG[dnscrypt] = "--enable-dnscrypt, --disable-dnscrypt, libsodium" -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," -PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system - - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${S}/contrib/unbound.init ${D}${sysconfdir}/init.d/unbound -} - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -INITSCRIPT_NAME = "unbound" -INITSCRIPT_PARAMS = "defaults" diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.4.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.4.bb new file mode 100644 index 000000000..03eb2faec --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.9.4.bb @@ -0,0 +1,46 @@ +SUMMARY = "Unbound is a validating, recursive, and caching DNS resolver" +DESCRIPTION = "Unbound's design is a set of modular components which incorporate \ + features including enhanced security (DNSSEC) validation, Internet Protocol \ + Version 6 (IPv6), and a client resolver library API as an integral part of the \ + architecture" + +HOMEPAGE = "https://www.unbound.net/" +SECTION = "net" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" + +SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master \ + file://0001-contrib-add-yocto-compatible-startup-scripts.patch \ +" +SRCREV="b60c4a472c856f0a98120b7259e991b3a6507eb5" + +inherit autotools pkgconfig systemd update-rc.d + +DEPENDS = "openssl libevent libtool-native bison-native expat" +RDEPENDS_${PN} = "bash openssl-bin daemonize" + +S = "${WORKDIR}/git" + +EXTRA_OECONF = "--with-libexpat=${STAGING_EXECPREFIXDIR} \ + --with-ssl=${STAGING_EXECPREFIXDIR} \ + libtool=${TARGET_PREFIX}libtool \ +" + + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile systemd', d)}" +PACKAGECONFIG[dnscrypt] = "--enable-dnscrypt, --disable-dnscrypt, libsodium" +PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${S}/contrib/unbound.init ${D}${sysconfdir}/init.d/unbound +} + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" + +INITSCRIPT_NAME = "unbound" +INITSCRIPT_PARAMS = "defaults" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb deleted file mode 100644 index a3c0b4998..000000000 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb +++ /dev/null @@ -1,81 +0,0 @@ -DESCRIPTION = "wireshark - a popular network protocol analyzer" -HOMEPAGE = "http://www.wireshark.org" -SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" - -DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native" - -DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " - -SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" - -UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" - -SRC_URI[md5sum] = "e945d76a57db2c3e6cf776f95da2cf0e" -SRC_URI[sha256sum] = "af92729c781d870110885c31ebcbe4c4224ed51bb580d00c896fe9746994211c" - -PE = "1" - -inherit cmake pkgconfig python3native perlnative upstream-version-is-even - -PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" - -PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" - -PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" -PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" -PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" -PACKAGECONFIG[libnl] = ",,libnl" -PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" -PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" -PACKAGECONFIG[ssl] = ",,openssl" -PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" -PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" -PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" -PACKAGECONFIG[geoip] = ",, geoip" -PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" -PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" -PACKAGECONFIG[libssh] = ",,libssh2" -PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" - -# these next two options require addional layers -PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ - -DBUILD_mmdbresolve=OFF \ - -DBUILD_randpktdump=OFF \ - -DBUILD_androiddump=OFF \ - -DBUILD_dcerpcidl2wrs=OFF \ - -DM_INCLUDE_DIR=${includedir} \ - -DM_LIBRARY=${libdir} \ - " -CFLAGS_append = " -lm" - -do_install_append_class-native() { - install -d ${D}${bindir} - for f in lemon - do - install -m 0755 ${B}/run/$f ${D}${bindir} - done -} - -do_install_append_class-target() { - for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` - do - chrpath --delete $f - done -} - -PACKAGE_BEFORE_PN += "tshark" - -FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" - -FILES_${PN} += "${datadir}*" - -RDEPENDS_tshark = "wireshark" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb new file mode 100644 index 000000000..ccaa0c94a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb @@ -0,0 +1,81 @@ +DESCRIPTION = "wireshark - a popular network protocol analyzer" +HOMEPAGE = "http://www.wireshark.org" +SECTION = "net" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" + +DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native" + +DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " + +SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" + +UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" + +SRC_URI[md5sum] = "c6f8d12a3efe21cc7885f7cb0c4bd938" +SRC_URI[sha256sum] = "a87f4022a0c15ddbf1730bf1acafce9e75a4e657ce9fa494ceda0324c0c3e33e" + +PE = "1" + +inherit cmake pkgconfig python3native perlnative upstream-version-is-even + +PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" + +PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" + +PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" +PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" +PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" +PACKAGECONFIG[libnl] = ",,libnl" +PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" +PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" +PACKAGECONFIG[ssl] = ",,openssl" +PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" +PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" +PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" +PACKAGECONFIG[geoip] = ",, geoip" +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" +PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" +PACKAGECONFIG[libssh] = ",,libssh2" +PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" + +# these next two options require addional layers +PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ + -DBUILD_mmdbresolve=OFF \ + -DBUILD_randpktdump=OFF \ + -DBUILD_androiddump=OFF \ + -DBUILD_dcerpcidl2wrs=OFF \ + -DM_INCLUDE_DIR=${includedir} \ + -DM_LIBRARY=${libdir} \ + " +CFLAGS_append = " -lm" + +do_install_append_class-native() { + install -d ${D}${bindir} + for f in lemon + do + install -m 0755 ${B}/run/$f ${D}${bindir} + done +} + +do_install_append_class-target() { + for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` + do + chrpath --delete $f + done +} + +PACKAGE_BEFORE_PN += "tshark" + +FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" + +FILES_${PN} += "${datadir}*" + +RDEPENDS_tshark = "wireshark" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_484.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_484.bb deleted file mode 100644 index f218b87e9..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_484.bb +++ /dev/null @@ -1,119 +0,0 @@ -SUMMARY = "Filesystem and Disk Benchmarking Tool" -HOMEPAGE = "http://www.iozone.org/" -AUTHOR = "Don Capps , William D. Norcott " -SECTION = "console/tests" -LICENSE = "iozone3" -LIC_FILES_CHKSUM = "file://iozone.c;beginline=37;endline=48;md5=7331260091868dcad0f9edea735b5f4b \ - file://iozone.c;beginline=269;endline=275;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \ -" -SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ - file://parallelism.patch \ - file://copyright.txt \ -" -SRC_URI[md5sum] = "aa6b88ab83793cb6809ca06949a6ab01" -SRC_URI[sha256sum] = "e816e6ae2f02003f2a6d19d47fcd9a50fdd8078da4f35fe3d4b9caf91c3d7216" - -UPSTREAM_CHECK_REGEX = "iozone3_(?P\d+).tar" - -S = "${WORKDIR}/${BPN}_${PV}/src/current/" - -# -# All other arches can use the default OEMAKE except those -# explicitly listed below. Another, the iozone3 Makefile -# needs to be told about the cross-compiler explicitly here. -# -EXTRA_OEMAKE_powerpc = "linux-powerpc CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE_powerpc64 = "linux-powerpc64 CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE_x86-64 = "linux-AMD64 CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE_arm = "linux-arm CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE = "linux CC='${CC}' GCC='${CC}'" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - install -d ${D}${bindir} \ - ${D}${mandir}/man1 \ - ${D}${datadir}/doc/${BPN}/examples - - install -m 0755 ${S}/iozone ${D}${bindir} - install -m 0755 ${S}/fileop ${D}${bindir} - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/iozone.1 ${D}${mandir}/man1/ - install -m 0644 ${WORKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/ - - install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${BPN}/examples - install -m 0644 ${S}/client_list ${D}${datadir}/doc/${BPN}/examples - install -m 0644 ${S}/Gnuplot.txt ${D}${datadir}/doc/${BPN}/examples - - install -m 0755 ${S}/Generate_Graphs ${D}${datadir}/doc/${BPN}/examples - install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${BPN}/examples - install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${BPN}/examples - - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/ - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/ - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/ -} - -FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt" - -# LICENSE: -# -# Copyright 1991, 1992, 1994, 1998, 1999, 2002 William D. Norcott -# -# License to freely use and distribute this software is hereby granted -# by the author, subject to the condition that this copyright notice -# remains intact. The author retains the exclusive right to publish -# derivative works based on this work, including, but not limited to -# revised versions of this work. -# - -# -# Below is author reply to question about distributing iozone3 in -# OpenEmbedded: -# -# ======================================================================== -# -# Marcin, -# -# Re-distribution is permitted as long as the copyright is -# maintained and the source code is not changed. I do not -# see a problem with your mods to enable fileop for Linux-arm, -# as these mods have been returned to the Iozone folks, -# and they have been accepted for inclusion in the next -# release :-) -# -# Thank you for your contribution, -# Don Capps -# -# ----- Original Message ----- -# From: "Marcin Juszkiewicz" -# To: "Don Capps" ; "William D. Norcott" -# -# Sent: Sunday, October 29, 2006 4:55 PM -# Subject: iozone3 263 patch for arm and License question -# -# -# > Morning -# > -# > I want to include iozone3 in OpenEmbedded [1] metadata to give it for -# > other developers. Currently OE is used to build few distributions for -# > misc platforms: ARM, SH3, SH4, x86, PowerPC and different types of -# > machines (PDA, settopbox, devboards, desktops, thin clients, routers). -# > -# > According to your distribution of derivations is forbidden. Packaging -# > iozone3 in OpenEmbedded will not involve any source code changes. But -# > when I was building it for ARM I discovered that fileop binary was not -# > built - so I created patch for it (attached). Not yet tested it on target -# > device. -# > -# > Thus, I seek your written permission via e-mail to distribute a package of -# > the unmodified source code and also a package of the pre-compiled binary. -# > Your copyright statement will be included in the package. -# > -# > -# > 1. http://www.openembedded.org/ -# > -# > Regards -# > -- -# > JID: hrw-jabber.org -# > OpenEmbedded developer/consultant - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_487.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_487.bb new file mode 100644 index 000000000..42864bead --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_487.bb @@ -0,0 +1,119 @@ +SUMMARY = "Filesystem and Disk Benchmarking Tool" +HOMEPAGE = "http://www.iozone.org/" +AUTHOR = "Don Capps , William D. Norcott " +SECTION = "console/tests" +LICENSE = "iozone3" +LIC_FILES_CHKSUM = "file://iozone.c;beginline=37;endline=48;md5=7331260091868dcad0f9edea735b5f4b \ + file://iozone.c;beginline=276;endline=282;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \ +" +SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ + file://parallelism.patch \ + file://copyright.txt \ +" +SRC_URI[md5sum] = "2dbe035caf99c5367625352e158bb866" +SRC_URI[sha256sum] = "2c488a7ccddd624fd557af16e71442c367b131d6178e1b4023bbd532bacdda59" + +UPSTREAM_CHECK_REGEX = "iozone3_(?P\d+).tar" + +S = "${WORKDIR}/${BPN}_${PV}/src/current/" + +# +# All other arches can use the default OEMAKE except those +# explicitly listed below. Another, the iozone3 Makefile +# needs to be told about the cross-compiler explicitly here. +# +EXTRA_OEMAKE_powerpc = "linux-powerpc CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE_powerpc64 = "linux-powerpc64 CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE_x86-64 = "linux-AMD64 CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE_arm = "linux-arm CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE = "linux CC='${CC}' GCC='${CC}'" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install() { + install -d ${D}${bindir} \ + ${D}${mandir}/man1 \ + ${D}${datadir}/doc/${BPN}/examples + + install -m 0755 ${S}/iozone ${D}${bindir} + install -m 0755 ${S}/fileop ${D}${bindir} + install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/iozone.1 ${D}${mandir}/man1/ + install -m 0644 ${WORKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/ + + install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${BPN}/examples + install -m 0644 ${S}/client_list ${D}${datadir}/doc/${BPN}/examples + install -m 0644 ${S}/Gnuplot.txt ${D}${datadir}/doc/${BPN}/examples + + install -m 0755 ${S}/Generate_Graphs ${D}${datadir}/doc/${BPN}/examples + install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${BPN}/examples + install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${BPN}/examples + + install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/ +} + +FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt" + +# LICENSE: +# +# Copyright 1991, 1992, 1994, 1998, 1999, 2002 William D. Norcott +# +# License to freely use and distribute this software is hereby granted +# by the author, subject to the condition that this copyright notice +# remains intact. The author retains the exclusive right to publish +# derivative works based on this work, including, but not limited to +# revised versions of this work. +# + +# +# Below is author reply to question about distributing iozone3 in +# OpenEmbedded: +# +# ======================================================================== +# +# Marcin, +# +# Re-distribution is permitted as long as the copyright is +# maintained and the source code is not changed. I do not +# see a problem with your mods to enable fileop for Linux-arm, +# as these mods have been returned to the Iozone folks, +# and they have been accepted for inclusion in the next +# release :-) +# +# Thank you for your contribution, +# Don Capps +# +# ----- Original Message ----- +# From: "Marcin Juszkiewicz" +# To: "Don Capps" ; "William D. Norcott" +# +# Sent: Sunday, October 29, 2006 4:55 PM +# Subject: iozone3 263 patch for arm and License question +# +# +# > Morning +# > +# > I want to include iozone3 in OpenEmbedded [1] metadata to give it for +# > other developers. Currently OE is used to build few distributions for +# > misc platforms: ARM, SH3, SH4, x86, PowerPC and different types of +# > machines (PDA, settopbox, devboards, desktops, thin clients, routers). +# > +# > According to your distribution of derivations is forbidden. Packaging +# > iozone3 in OpenEmbedded will not involve any source code changes. But +# > when I was building it for ARM I discovered that fileop binary was not +# > built - so I created patch for it (attached). Not yet tested it on target +# > device. +# > +# > Thus, I seek your written permission via e-mail to distribute a package of +# > the unmodified source code and also a package of the pre-compiled binary. +# > Your copyright statement will be included in the package. +# > +# > +# > 1. http://www.openembedded.org/ +# > +# > Regards +# > -- +# > JID: hrw-jabber.org +# > OpenEmbedded developer/consultant + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch index 53f35abb7..34a62207e 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch @@ -10,15 +10,17 @@ Upstream-Status: Submitted Signed-off-by: Ting Liu +Update for 2.22. +Signed-off-by: Zheng Ruoqin --- tests/run_tests.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/run_tests.py b/tests/run_tests.py -index 3c95a03..560df6b 100755 +index 018264d..0aabcd1 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py -@@ -234,9 +234,19 @@ def get_pagesizes(): +@@ -245,9 +245,19 @@ def get_pagesizes(): Use libhugetlbfs' hugeadm utility to get a list of page sizes that have active mount points and at least one huge page allocated to the pool. """ @@ -36,6 +38,9 @@ index 3c95a03..560df6b 100755 + return sizes + out = p.stdout.read().strip() + - if rc != 0 or out == "": return sizes + if rc != 0 or out == "": + return sizes - for size in out.split("\n"): sizes.add(int(size)) +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch index 08174200d..e736cbc79 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch @@ -8,12 +8,14 @@ error: unknown type name 'ino_t'; did you mean 'int'? Signed-off-by: Khem Raj +Update for 2.22. +Signed-off-by: Zheng Ruoqin --- tests/hugetests.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/hugetests.h b/tests/hugetests.h -index 8b1d8d9..056042c 100644 +index bc4e16a..fbe4dc0 100644 --- a/tests/hugetests.h +++ b/tests/hugetests.h @@ -22,6 +22,7 @@ @@ -21,6 +23,9 @@ index 8b1d8d9..056042c 100644 #include #include +#include + #include #include "libhugetlbfs_privutils.h" - #include "libhugetlbfs_testprobes.h" +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 66fd8e21d..f25812279 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "sysfsutils" RDEPENDS_${PN} += "bash python python-io python-lang python-subprocess python-resource" -RDEPENDS_${PN}-tests += "bash" +RDEPENDS_${PN}-tests += "bash python3-core" -PV = "2.21" +PV = "2.22" PE = "1" -SRCREV = "73d06e69108f231696e9c5c44f4b42690fc5d752" +SRCREV = "e6499ff92b4a7dcffbd131d1f5d24933e48c3f20" SRC_URI = " \ git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ diff --git a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb deleted file mode 100644 index c4df1a90b..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Phoronix Test Suite" -DESCRIPTION = "The Phoronix Test Suite is designed to carry out both qualitative \ -and quantitative benchmarks in a clean, reproducible, and easy-to-use manner." -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SECTION = "console/tests" - -SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "08fc81d25a1c24c7b091ac78ef145da6" -SRC_URI[sha256sum] = "d6feeeafb6d636667480b6fbfd2a6537e3b354b2c7c72305784d14d38ab4bcd0" - -S = "${WORKDIR}/phoronix-test-suite" - -inherit systemd allarch - -do_install() { - DESTDIR=${D} ./install-sh ${exec_prefix} - - if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then - install -d ${D}/${systemd_unitdir}/system/ - mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/ - rm -rf ${D}/usr/lib/ - fi -} - -# It is not advisable to enable these services by default since they can cause -# continual target reboots if they encounter network problems. -# -SYSTEMD_AUTO_ENABLE = "disable" -SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service" - -RDEPENDS_${PN} += "bash python php-cli util-linux-lscpu os-release lsb-release" - -FILES_${PN} += " \ - ${datadir}/phoronix-test-suite \ - ${datadir}/appdata/phoronix-test-suite.appdata.xml \ - ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \ - ${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \ - ${datadir}/mime/packages/openbenchmarking-mime.xml \ - ${systemd_unitdir}/* \ -" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.0.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.0.1.bb new file mode 100644 index 000000000..89050e4f7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.0.1.bb @@ -0,0 +1,41 @@ +SUMMARY = "Phoronix Test Suite" +DESCRIPTION = "The Phoronix Test Suite is designed to carry out both qualitative \ +and quantitative benchmarks in a clean, reproducible, and easy-to-use manner." +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +SECTION = "console/tests" + +SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" +SRC_URI[md5sum] = "58023c8136a0206909552942660fe28a" +SRC_URI[sha256sum] = "a117a4350774e67989d90bf0b5e82a8072652f8caa60a62c3e5f64adc317ce14" + +S = "${WORKDIR}/phoronix-test-suite" + +inherit systemd allarch + +do_install() { + DESTDIR=${D} ./install-sh ${exec_prefix} + + if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then + install -d ${D}/${systemd_unitdir}/system/ + mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/ + rm -rf ${D}/usr/lib/ + fi +} + +# It is not advisable to enable these services by default since they can cause +# continual target reboots if they encounter network problems. +# +SYSTEMD_AUTO_ENABLE = "disable" +SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service" + +RDEPENDS_${PN} += "bash python php-cli util-linux-lscpu os-release lsb-release" + +FILES_${PN} += " \ + ${datadir}/phoronix-test-suite \ + ${datadir}/appdata/phoronix-test-suite.appdata.xml \ + ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \ + ${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \ + ${datadir}/mime/packages/openbenchmarking-mime.xml \ + ${systemd_unitdir}/* \ +" diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch deleted file mode 100644 index df8028627..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e5f68189ab3602b1042cc8423fd6a3a23abd5455 Mon Sep 17 00:00:00 2001 -From: Alex James -Date: Sat, 14 Apr 2018 22:59:57 -0500 -Subject: [PATCH] ch341a_spi: Avoid deprecated libusb functions - -libusb 1.0.22 marked libusb_set_debug as deprecated. For such versions -of libusb, use libusb_set_option instead. - -Change-Id: Ib71ebe812316eaf49136979a942a946ef9e4d487 -Signed-off-by: Alex James -Reviewed-on: https://review.coreboot.org/25681 -Tested-by: Nico Huber -Reviewed-by: David Hendricks ---- -Upstream-Status: Backport - ch341a_spi.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ch341a_spi.c b/ch341a_spi.c -index 6eb2804..d880510 100644 ---- a/ch341a_spi.c -+++ b/ch341a_spi.c -@@ -444,7 +444,12 @@ int ch341a_spi_init(void) - return -1; - } - -- libusb_set_debug(NULL, 3); // Enable information, warning and error messages (only). -+ /* Enable information, warning, and error messages (only). */ -+#if LIBUSB_API_VERSION < 0x01000106 -+ libusb_set_debug(NULL, 3); -+#else -+ libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); -+#endif - - uint16_t vid = devs_ch341a_spi[0].vendor_id; - uint16_t pid = devs_ch341a_spi[0].device_id; --- -2.17.0 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch deleted file mode 100644 index 7ba69a917..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d2a28dcdbd1051d2f48320e2eda3393581fe0519 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 17 Mar 2018 23:08:29 -0700 -Subject: [PATCH] platform: Add riscv to known platforms - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted [https://review.coreboot.org/#/c/flashrom/+/25260/] - platform.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/platform.h b/platform.h -index b2fdcd0..2cadbb3 100644 ---- a/platform.h -+++ b/platform.h -@@ -69,6 +69,9 @@ - #elif defined (__m68k__) - #define __FLASHROM_ARCH__ "m68k" - #define IS_M68K 1 -+#elif defined (__riscv) -+ #define __FLASHROM_ARCH__ "riscv" -+ #define IS_RISCV 1 - #elif defined (__sh__) - #define __FLASHROM_ARCH__ "sh" - #define IS_SH 1 -@@ -77,7 +80,7 @@ - #define IS_S390 1 - #endif - --#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_SH || IS_S390) -+#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_RISCV || IS_SH || IS_S390) - #error Unknown architecture - #endif - --- -2.16.2 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch deleted file mode 100644 index 46a01529f..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch +++ /dev/null @@ -1,198 +0,0 @@ ---- flashrom-0.9.9.orig/chipdrivers.h -+++ flashrom-0.9.9/chipdrivers.h -@@ -103,6 +103,7 @@ - int spi_prettyprint_status_register_sst25(struct flashctx *flash); - int spi_prettyprint_status_register_sst25vf016(struct flashctx *flash); - int spi_prettyprint_status_register_sst25vf040b(struct flashctx *flash); -+int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash); - - /* sfdp.c */ - int probe_spi_sfdp(struct flashctx *flash); ---- flashrom-0.9.9.orig/flashchips.c -+++ flashrom-0.9.9/flashchips.c -@@ -12564,6 +12564,120 @@ - - { - .vendor = "SST", -+ .name = "SST26VF016B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF016B, -+ .total_size = 2048, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_OK_PREW, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 512} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 30}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {2 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ { -+ .vendor = "SST", -+ .name = "SST26VF032B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF032B, -+ .total_size = 4096, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_UNTESTED, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 1024} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 62}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {4 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ -+ -+ { -+ .vendor = "SST", -+ .name = "SST26VF064B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF064B, -+ .total_size = 8192, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_OK_PREW, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 2048} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 126}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {8 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ -+ { -+ .vendor = "SST", - .name = "SST25WF512", - .bustype = BUS_SPI, - .manufacture_id = SST_ID, ---- flashrom-0.9.9.orig/flashchips.h -+++ flashrom-0.9.9/flashchips.h -@@ -697,6 +697,8 @@ - #define SST_SST25VF064C 0x254B - #define SST_SST26VF016 0x2601 - #define SST_SST26VF032 0x2602 -+#define SST_SST26VF016B 0x2641 -+#define SST_SST26VF032B 0x2642 - #define SST_SST26VF064B 0x2643 - #define SST_SST27SF512 0xA4 - #define SST_SST27SF010 0xA5 ---- flashrom-0.9.9.orig/linux_spi.c -+++ flashrom-0.9.9/linux_spi.c -@@ -141,6 +141,16 @@ - return 0; - } - -+static void print_hex(const char *msg, const void *buf, size_t len) -+{ -+ size_t i; -+ msg_pspew("%s:\n", msg); -+ for (i = 0; i < len; i++) { -+ msg_pspew(" %02x", ((uint8_t *)buf)[i]); -+ } -+ msg_pspew("\n"); -+} -+ - static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, - unsigned int readcnt, - const unsigned char *txbuf, -@@ -172,10 +182,12 @@ - else - iocontrol_code = SPI_IOC_MESSAGE(2); - -+ print_hex("Write", txbuf, writecnt); - if (ioctl(fd, iocontrol_code, msg) == -1) { - msg_cerr("%s: ioctl: %s\n", __func__, strerror(errno)); - return -1; - } -+ if (readcnt) print_hex("Got", rxbuf, readcnt); - return 0; - } - ---- flashrom-0.9.9.orig/spi25_statusreg.c -+++ flashrom-0.9.9/spi25_statusreg.c -@@ -196,6 +196,19 @@ - return spi_disable_blockprotect_generic(flash, 0x3C, 0, 0, 0xFF); - } - -+int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash) -+{ -+ int result = spi_write_enable(flash); -+ if (result) -+ return result; -+ -+ static const unsigned char cmd[] = { 0x98 }; /* ULBPR */ -+ result = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); -+ if (result) -+ msg_cerr("ULBPR failed\n"); -+ return result; -+} -+ - /* A common block protection disable that tries to unset the status register bits masked by 0x0C (BP0-1) and - * protected/locked by bit #7. Useful when bits 4-5 may be non-0). */ - int spi_disable_blockprotect_bp1_srwd(struct flashctx *flash) diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb deleted file mode 100644 index 1c1724668..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" -LICENSE = "GPLv2" -HOMEPAGE = "http://flashrom.org" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "pciutils libusb libusb-compat" - -SRC_URI = "https://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ - file://sst26.patch \ - file://0001-platform-Add-riscv-to-known-platforms.patch \ - file://0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch \ - " -SRC_URI[md5sum] = "42d999990c735d88653627cefcc13b9a" -SRC_URI[sha256sum] = "3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64" - -inherit pkgconfig - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -} diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb new file mode 100644 index 000000000..074a1a5f6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" +LICENSE = "GPLv2" +HOMEPAGE = "http://flashrom.org" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "pciutils libusb libusb-compat" + +SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ + " +SRC_URI[md5sum] = "91bab6c072e38a493bb4eb673e4fe0d6" +SRC_URI[sha256sum] = "aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19" + +S = "${WORKDIR}/flashrom-v${PV}" + +inherit pkgconfig + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install +} diff --git a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch new file mode 100644 index 000000000..b65f1a732 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch @@ -0,0 +1,29 @@ +Subject: [PATCH] Don't build with -Werror to fix compile error. + +| 550 | _dump_sgpio_amd(&amd_reg->amd); +| | ^~~~~~~~~~~~~ +| amd_sgpio.c: In function '_write_amd_register': +| amd_sgpio.c:558:18: error: taking address of packed member of 'struct amd_register' may result in an unaligned pointer value [-Werror=address-of-packed-member] + +Upstream-Status: Pending + +Signed-off-by: Zheng Ruoqin +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7bc20f8..7e01bd5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,6 @@ AX_AM_CFLAGS_ADD([-Werror=format-truncation=1]) + AX_AM_CFLAGS_ADD([-Werror=shift-negative-value]) + AX_AM_CFLAGS_ADD([-Werror=alloca]) + AX_AM_CFLAGS_ADD([-Werror=missing-field-initializers]) +-AX_AM_CFLAGS_ADD([-Werror]) + AX_AM_CFLAGS_ADD([-Werror=format-signedness]) + + AC_SUBST([AM_CFLAGS]) +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb index 74ae56c67..f9ae9aad9 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb @@ -11,15 +11,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ DEPENDS = "sg3-utils udev" -inherit systemd +inherit autotools systemd SYSTEMD_SERVICE_${PN} = "ledmon.service" +# 0.93 SRC_URI = "git://github.com/intel/ledmon;branch=master \ file://0002-include-sys-select.h-and-sys-types.h.patch \ + file://0001-Don-t-build-with-Werror-to-fix-compile-error.patch \ " -SRCREV = "ad1304ca1363d727425a1f23703c523e21feae4f" +SRCREV = "1d72f9cb5c9163b2ecdf19709935720e65f5b90e" COMPATIBLE_HOST = "(i.86|x86_64).*-linux" COMPATIBLE_HOST_libc-musl = "null" @@ -27,8 +29,13 @@ COMPATIBLE_HOST_libc-musl = "null" S = "${WORKDIR}/git" EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'" +# The ledmon sources include headers in ${S}/config to build but not in CFLAGS. +# We need to add this include path in CFLAGS. +CFLAGS += "-I${S}/config" + do_install_append() { - install -d ${D}/${systemd_unitdir}/system - oe_runmake DESTDIR=${D} install - oe_runmake DESTDIR=${D}${systemd_unitdir}/system install-systemd + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0755 ${S}/systemd/ledmon.service ${D}${systemd_unitdir}/system + fi } diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch deleted file mode 100644 index 337fb11dd..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 05a4d54e2adc4caed507baca529089ec01f48340 Mon Sep 17 00:00:00 2001 -From: Li Zhou -Date: Tue, 6 Sep 2016 14:04:29 +0800 -Subject: [PATCH 1/2] lmsensors: sensors-detect: print a special message when - there isn't enough cpu info - -When running sensors-detect, if there isn't enough information in -/proc/cpuinfo for this arch (e.g. ppc64), "Use of uninitialized value -in concatenation (.) or string at /usr/sbin/sensors-detect line 2867" -and incomplete "# Processor: (//)" will be printed. -Here print out a prompt for such a case. - -Upstream-Status: Pending - -Signed-off-by: Li Zhou ---- - prog/detect/sensors-detect | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index 0b3b0ff2..68594cd7 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -3119,7 +3119,12 @@ sub initialize_cpu_list - sub print_cpu_info - { - my $cpu = $cpu[0]; -- print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ if ( $cpu->{'model name'} && $cpu->{'cpu family'} && $cpu->{model} && $cpu->{stepping} ) { -+ print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; -+ } -+ else { -+ print "# Processor: There isn't enough cpu info for this arch!!!\n"; -+ } - } - - # @i2c_adapters is a list of references to hashes, one hash per I2C/SMBus --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch deleted file mode 100644 index 68f51f5a6..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 26742544bc9f136093b6be78259f4a891870aa3c Mon Sep 17 00:00:00 2001 -From: Dengke Du -Date: Wed, 21 Sep 2016 03:17:32 -0400 -Subject: [PATCH 2/2] lm-sensors: fix sensors-detect can't read the cpu - information on fsl-t4xxx - -This is because two reasons: - -1. The sensors-detect program in lm-sensors depends on the file '/proc/cpuinfo', - different arch write different infomation to it. That program supports x86 - and x86-64 well, but weak on ppc and arm. - -2. The sensors-detect program show the cpu information just design for intel's - cpu, when meets other arch, it can't output the correct information. - -So we need to add the ppc and arm support for this program: - -1. add the ppc cpu information field 'cpu' in initialize_cpu_list function. - -2. add the correspond case of ppc and arm when print cpu information in - print_cpu_info function. - -Upstream-Status: Pending - -Signed-off-by: Dengke Du ---- - prog/detect/sensors-detect | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index 68594cd7..efe2c1af 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -3088,6 +3088,7 @@ sub kernel_version_at_least - # model name and stepping, directly taken from /proc/cpuinfo. - use vars qw(@cpu); - -+# The added field 'cpu' is for support the ppc. - sub initialize_cpu_list - { - local $_; -@@ -3103,7 +3104,7 @@ sub initialize_cpu_list - }; - next; - } -- if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level)\s*:\s*(.+)$/) { -+ if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level|cpu|revision)\s*:\s*(.+)$/) { - my $k = $1; - my $v = $2; - $v =~ s/\s+/ /g; # Merge multiple spaces -@@ -3116,12 +3117,20 @@ sub initialize_cpu_list - push @cpu, $entry if scalar keys(%{$entry}); # Last entry - } - -+# The field 'model name' is for ARM. -+# The field 'cpu' is for ppc. - sub print_cpu_info - { - my $cpu = $cpu[0]; - if ( $cpu->{'model name'} && $cpu->{'cpu family'} && $cpu->{model} && $cpu->{stepping} ) { - print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; - } -+ elsif ( $cpu->{'model name'} ) { -+ print "# Processor: $cpu->{'model name'}\n"; -+ } -+ elsif ( $cpu->{'cpu'} && $cpu->{'revision'} ) { -+ print "# Processor: $cpu->{'cpu'} $cpu->{'revision'}\n"; -+ } - else { - print "# Processor: There isn't enough cpu info for this arch!!!\n"; - } --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb deleted file mode 100644 index ffafd17f8..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb +++ /dev/null @@ -1,170 +0,0 @@ -SUMMARY = "Hardware health monitoring applications" -HOMEPAGE = "https://hwmon.wiki.kernel.org/" -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = " \ - bison-native \ - flex-native \ - rrdtool \ - virtual/libiconv \ -" - -SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https \ - file://fancontrol.init \ - file://sensord.init \ - file://0001-lmsensors-sensors-detect-print-a-special-message-whe.patch \ - file://0002-lm-sensors-fix-sensors-detect-can-t-read-the-cpu-inf.patch \ -" -SRCREV = "e8afbda10fba571c816abddcb5c8180afc435bba" - -inherit update-rc.d systemd - -RDEPENDS_${PN}-dev = "" - -PACKAGECONFIG ??= "sensord" -PACKAGECONFIG[sensord] = "sensord,,rrdtool" - -INITSCRIPT_PACKAGES = "\ - ${PN}-fancontrol \ - ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ - " -INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol" -INITSCRIPT_NAME_${PN}-sensord = "sensord" -INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66" -INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" - -SYSTEMD_PACKAGES = "\ - ${PN} \ - ${PN}-fancontrol \ - ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ - " -SYSTEMD_SERVICE_${PN} = "lm_sensors.service" -SYSTEMD_SERVICE_${PN}-fancontrol = "fancontrol.service" -SYSTEMD_SERVICE_${PN}-sensord = "sensord.service" -SYSTEMD_AUTO_ENABLE = "disable" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = 'EXLDFLAGS="${LDFLAGS}" \ - MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ - LIBDIR=${libdir} \ - CC="${CC}" AR="${AR}"' - -do_compile() { - sed -i -e 's:^# \(PROG_EXTRA\):\1:' ${S}/Makefile - # Respect LDFLAGS - sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile - sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \ - ${S}/lib/Module.mk - oe_runmake user PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}" -} - -do_install() { - oe_runmake user_install DESTDIR=${D} - if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then - install -m 0755 ${S}/prog/sensord/sensord ${D}${sbindir} - install -m 0644 ${S}/prog/sensord/sensord.8 ${D}${mandir}/man8 - fi - - # Install directory - install -d ${D}${INIT_D_DIR} - - # Install fancontrol init script - install -m 0755 ${WORKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol - - if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then - # Install sensord init script - install -m 0755 ${WORKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord - fi - - # Insall sensord service script - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system - if ! ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then - rm ${D}${systemd_system_unitdir}/sensord.service - fi -} - -RPROVIDES_${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-sensord-dbg ${PN}-isatools-dbg" - -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += " \ - ${PN}-libsensors \ - ${PN}-sensors \ - ${PN}-sensord \ - ${PN}-fancontrol \ - ${PN}-sensorsdetect \ - ${PN}-sensorsconfconvert \ - ${PN}-pwmconfig \ - ${PN}-isatools \ -" - -# libsensors packages -PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${PN}-libsensors-doc" - -# sensors command packages -PACKAGES =+ "${PN}-sensors ${PN}-sensors-doc" - -# sensord logging daemon -PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord ${PN}-sensord-doc', '', d)}" - -# fancontrol script -PACKAGES =+ "${PN}-fancontrol ${PN}-fancontrol-doc" - -# sensors-detect script -PACKAGES =+ "${PN}-sensorsdetect ${PN}-sensorsdetect-doc" - -# sensors-conf-convert script -PACKAGES =+ "${PN}-sensorsconfconvert ${PN}-sensorsconfconvert-doc" - -# pwmconfig script -PACKAGES =+ "${PN}-pwmconfig ${PN}-pwmconfig-doc" - -# isadump and isaset helper program -PACKAGES =+ "${PN}-isatools ${PN}-isatools-doc" - - -# libsensors files -FILES_${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d" -FILES_${PN}-libsensors-dev = "${libdir}/libsensors.so ${includedir}" -FILES_${PN}-libsensors-staticdev = "${libdir}/libsensors.a" -FILES_${PN}-libsensors-doc = "${mandir}/man3" -RRECOMMENDS_${PN}-libsensors = "lmsensors-config-libsensors" - -# sensors command files -FILES_${PN}-sensors = "${bindir}/sensors" -FILES_${PN}-sensors-doc = "${mandir}/man1 ${mandir}/man5" -RDEPENDS_${PN}-sensors = "${PN}-libsensors" - -# sensord logging daemon -FILES_${PN}-sensord = "${sbindir}/sensord ${INIT_D_DIR}/sensord ${systemd_system_unitdir}/sensord.service" -FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8" -RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool" -RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord" - -# fancontrol script files -FILES_${PN}-fancontrol = "${sbindir}/fancontrol ${INIT_D_DIR}/fancontrol" -FILES_${PN}-fancontrol-doc = "${mandir}/man8/fancontrol.8" -RDEPENDS_${PN}-fancontrol = "bash" -RRECOMMENDS_${PN}-fancontrol = "lmsensors-config-fancontrol" - -# sensors-detect script files -FILES_${PN}-sensorsdetect = "${sbindir}/sensors-detect" -FILES_${PN}-sensorsdetect-doc = "${mandir}/man8/sensors-detect.8" -RDEPENDS_${PN}-sensorsdetect = "${PN}-sensors perl perl-modules" - -# sensors-conf-convert script files -FILES_${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert" -FILES_${PN}-sensorsconfconvert-doc = "${mandir}/man8/sensors-conf-convert.8" -RDEPENDS_${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules" - -# pwmconfig script files -FILES_${PN}-pwmconfig = "${sbindir}/pwmconfig" -FILES_${PN}-pwmconfig-doc = "${mandir}/man8/pwmconfig.8" -RDEPENDS_${PN}-pwmconfig = "${PN}-fancontrol bash" - -# isadump and isaset helper program files -FILES_${PN}-isatools = "${sbindir}/isa*" -FILES_${PN}-isatools-doc = "${mandir}/man8/isa*" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb new file mode 100644 index 000000000..48490e8d8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -0,0 +1,168 @@ +SUMMARY = "Hardware health monitoring applications" +HOMEPAGE = "https://hwmon.wiki.kernel.org/" +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + bison-native \ + flex-native \ + rrdtool \ + virtual/libiconv \ +" + +SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https \ + file://fancontrol.init \ + file://sensord.init \ +" +SRCREV = "1667b850a1ce38151dae17156276f981be6fb557" + +inherit update-rc.d systemd + +RDEPENDS_${PN}-dev = "" + +PACKAGECONFIG ??= "sensord" +PACKAGECONFIG[sensord] = "sensord,,rrdtool" + +INITSCRIPT_PACKAGES = "\ + ${PN}-fancontrol \ + ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ + " +INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol" +INITSCRIPT_NAME_${PN}-sensord = "sensord" +INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66" +INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" + +SYSTEMD_PACKAGES = "\ + ${PN} \ + ${PN}-fancontrol \ + ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ + " +SYSTEMD_SERVICE_${PN} = "lm_sensors.service" +SYSTEMD_SERVICE_${PN}-fancontrol = "fancontrol.service" +SYSTEMD_SERVICE_${PN}-sensord = "sensord.service" +SYSTEMD_AUTO_ENABLE = "disable" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = 'EXLDFLAGS="${LDFLAGS}" \ + MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ + LIBDIR=${libdir} \ + CC="${CC}" AR="${AR}"' + +do_compile() { + sed -i -e 's:^# \(PROG_EXTRA\):\1:' ${S}/Makefile + # Respect LDFLAGS + sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile + sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \ + ${S}/lib/Module.mk + oe_runmake user PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}" +} + +do_install() { + oe_runmake user_install DESTDIR=${D} + if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then + install -m 0755 ${S}/prog/sensord/sensord ${D}${sbindir} + install -m 0644 ${S}/prog/sensord/sensord.8 ${D}${mandir}/man8 + fi + + # Install directory + install -d ${D}${INIT_D_DIR} + + # Install fancontrol init script + install -m 0755 ${WORKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol + + if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then + # Install sensord init script + install -m 0755 ${WORKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord + fi + + # Insall sensord service script + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system + if ! ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then + rm ${D}${systemd_system_unitdir}/sensord.service + fi +} + +RPROVIDES_${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-sensord-dbg ${PN}-isatools-dbg" + +ALLOW_EMPTY_${PN} = "1" +RDEPENDS_${PN} += " \ + ${PN}-libsensors \ + ${PN}-sensors \ + ${PN}-sensord \ + ${PN}-fancontrol \ + ${PN}-sensorsdetect \ + ${PN}-sensorsconfconvert \ + ${PN}-pwmconfig \ + ${PN}-isatools \ +" + +# libsensors packages +PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${PN}-libsensors-doc" + +# sensors command packages +PACKAGES =+ "${PN}-sensors ${PN}-sensors-doc" + +# sensord logging daemon +PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord ${PN}-sensord-doc', '', d)}" + +# fancontrol script +PACKAGES =+ "${PN}-fancontrol ${PN}-fancontrol-doc" + +# sensors-detect script +PACKAGES =+ "${PN}-sensorsdetect ${PN}-sensorsdetect-doc" + +# sensors-conf-convert script +PACKAGES =+ "${PN}-sensorsconfconvert ${PN}-sensorsconfconvert-doc" + +# pwmconfig script +PACKAGES =+ "${PN}-pwmconfig ${PN}-pwmconfig-doc" + +# isadump and isaset helper program +PACKAGES =+ "${PN}-isatools ${PN}-isatools-doc" + + +# libsensors files +FILES_${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d" +FILES_${PN}-libsensors-dev = "${libdir}/libsensors.so ${includedir}" +FILES_${PN}-libsensors-staticdev = "${libdir}/libsensors.a" +FILES_${PN}-libsensors-doc = "${mandir}/man3" +RRECOMMENDS_${PN}-libsensors = "lmsensors-config-libsensors" + +# sensors command files +FILES_${PN}-sensors = "${bindir}/sensors" +FILES_${PN}-sensors-doc = "${mandir}/man1 ${mandir}/man5" +RDEPENDS_${PN}-sensors = "${PN}-libsensors" + +# sensord logging daemon +FILES_${PN}-sensord = "${sbindir}/sensord ${INIT_D_DIR}/sensord ${systemd_system_unitdir}/sensord.service" +FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8" +RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool" +RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord" + +# fancontrol script files +FILES_${PN}-fancontrol = "${sbindir}/fancontrol ${INIT_D_DIR}/fancontrol" +FILES_${PN}-fancontrol-doc = "${mandir}/man8/fancontrol.8" +RDEPENDS_${PN}-fancontrol = "bash" +RRECOMMENDS_${PN}-fancontrol = "lmsensors-config-fancontrol" + +# sensors-detect script files +FILES_${PN}-sensorsdetect = "${sbindir}/sensors-detect" +FILES_${PN}-sensorsdetect-doc = "${mandir}/man8/sensors-detect.8" +RDEPENDS_${PN}-sensorsdetect = "${PN}-sensors perl perl-modules" + +# sensors-conf-convert script files +FILES_${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert" +FILES_${PN}-sensorsconfconvert-doc = "${mandir}/man8/sensors-conf-convert.8" +RDEPENDS_${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules" + +# pwmconfig script files +FILES_${PN}-pwmconfig = "${sbindir}/pwmconfig" +FILES_${PN}-pwmconfig-doc = "${mandir}/man8/pwmconfig.8" +RDEPENDS_${PN}-pwmconfig = "${PN}-fancontrol bash" + +# isadump and isaset helper program files +FILES_${PN}-isatools = "${sbindir}/isa*" +FILES_${PN}-isatools-doc = "${mandir}/man8/isa*" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.20.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.20.bb deleted file mode 100644 index 42205034c..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.20.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Wireless daemon for Linux" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -inherit autotools pkgconfig systemd - -DEPENDS = "ell readline dbus" - -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "00f0039232cc73bbcf7a1875f8f9aae464d90a8f" -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" -PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" - -EXTRA_OECONF += "--enable-external-ell" - -do_configure_prepend () { - mkdir -p ${S}/build-aux -} - -do_install_append() { - mkdir --parents ${D}${docdir}/${BPN} - install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} -} - -FILES_${PN} += "${datadir}/dbus-1 ${libdir}/modules-load.d" - -SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}" - -RRECOMMENDS_${PN} = "\ - kernel-module-pkcs7-message \ - kernel-module-pkcs8-key-parser \ - kernel-module-x509-key-parser \ -" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb new file mode 100644 index 000000000..20c6d04f7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Wireless daemon for Linux" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +inherit autotools pkgconfig systemd python3native + +DEPENDS = "ell readline dbus python3-docutils-native" + +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" +SRCREV = "77f16ae26fc013477f6362a0c33f0e52e82863e0" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" +PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" + +EXTRA_OECONF += "--enable-external-ell" + +do_configure_prepend () { + mkdir -p ${S}/build-aux +} + +do_install_append() { + mkdir --parents ${D}${docdir}/${BPN} + install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} +} + +FILES_${PN} += "${datadir}/dbus-1 ${libdir}/modules-load.d" + +SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}" + +RRECOMMENDS_${PN} = "\ + kernel-module-pkcs7-message \ + kernel-module-pkcs8-key-parser \ + kernel-module-x509-key-parser \ +" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index b2dffcdb9..fa106ea41 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -11,9 +11,9 @@ SRC_URI = "git://github.com/rakshasa/libtorrent \ file://0001-implement-64bit-atomic-for-mips.patch \ file://0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch \ " -SRCREV = "074f6ec51a2e4bc5c6140b4dad13c9bb56f3f0dc" +SRCREV = "756f70010779927dc0691e1e722ed433d5d295e1" -PV = "0.13.7+git${SRCPV}" +PV = "0.13.8" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.32.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.32.0.bb deleted file mode 100644 index c7fa3c10f..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.32.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" -HOMEPAGE = "https://github.com/libuv/libuv" -BUGTRACKER = "https://github.com/libuv/libuv/issues" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" - -SRCREV = "697bea87b3a0b0e9b4e5ff86b39d1dedb70ee46d" -SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" - -S = "${WORKDIR}/git" - -inherit autotools - -do_configure() { - ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" - oe_runconf -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.33.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.33.1.bb new file mode 100644 index 000000000..604568e62 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.33.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" +HOMEPAGE = "https://github.com/libuv/libuv" +BUGTRACKER = "https://github.com/libuv/libuv/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" + +SRCREV = "07ad32138f4d2285ba2226b5e20462b27b091a59" +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" + +S = "${WORKDIR}/git" + +inherit autotools + +do_configure() { + ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" + oe_runconf +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.0.bb deleted file mode 100644 index f3086315d..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.0.bb +++ /dev/null @@ -1,30 +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-1.0 | EDL-1.0" - -LIC_FILES_CHKSUM = " \ - file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ - file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \ - file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ - file://about.html;md5=dcde438d73cf42393da9d40fabc0c9bc \ -" - -SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http" - -SRCREV = "9f715d0862a8e16099b5837c4e53a1bf6a6a0675" - -DEPENDS = "openssl" - -S = "${WORKDIR}/git" - -inherit cmake - -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.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.1.bb new file mode 100644 index 000000000..fa249677e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.1.bb @@ -0,0 +1,30 @@ +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-1.0 | EDL-1.0" + +LIC_FILES_CHKSUM = " \ + file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ + file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \ + file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ + file://about.html;md5=dcde438d73cf42393da9d40fabc0c9bc \ +" + +SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http" + +SRCREV = "d34c51214f4172f2e12bb17532c9f44f72a57dd4" + +DEPENDS = "openssl" + +S = "${WORKDIR}/git" + +inherit cmake + +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/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch index 79d4f29fa..7d09f4382 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch @@ -1,19 +1,26 @@ -Using AC_RUN_IFELSE prevent people from configuring package for -cross-compiling. Don't run code while configuring package. +Using AC_RUN_IFELSE prevent people from configuring package + for cross-compiling. Don't run code while configuring package. Upstream-Status: Pending Signed-off-by: Andrei Gherzan -Index: libtorrent-0.13.3/scripts/checks.m4 -=================================================================== ---- libtorrent-0.13.3.orig/scripts/checks.m4 2012-05-14 14:17:04.000000000 +0300 -+++ libtorrent-0.13.3/scripts/checks.m4 2013-02-10 15:28:37.414445524 +0200 -@@ -95,40 +95,6 @@ +Update for 0.9.8. +Signed-off-by: Zheng Ruoqin +--- + scripts/checks.m4 | 34 ---------------------------------- + scripts/common.m4 | 28 ---------------------------- + 2 files changed, 62 deletions(-) +diff --git a/scripts/checks.m4 b/scripts/checks.m4 +index 83be846..1af80f5 100644 +--- a/scripts/checks.m4 ++++ b/scripts/checks.m4 +@@ -95,40 +95,6 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ + AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ AC_MSG_CHECKING(whether kqueue supports pipes and ptys) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ +- AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - #include - #include @@ -47,18 +54,18 @@ Index: libtorrent-0.13.3/scripts/checks.m4 - AC_MSG_RESULT(no) - ]) ]) - + AC_DEFUN([TORRENT_WITH_KQUEUE], [ -Index: libtorrent-0.13.3/scripts/common.m4 -=================================================================== ---- libtorrent-0.13.3.orig/scripts/common.m4 2012-05-14 14:17:04.000000000 +0300 -+++ libtorrent-0.13.3/scripts/common.m4 2013-02-10 15:27:55.874446741 +0200 -@@ -222,38 +222,10 @@ - +diff --git a/scripts/common.m4 b/scripts/common.m4 +index aaf005e..42fb016 100644 +--- a/scripts/common.m4 ++++ b/scripts/common.m4 +@@ -152,38 +152,10 @@ dnl Need to fix this so that it uses the stuff defined by the system. + AC_DEFUN([TORRENT_CHECK_EXECINFO], [ AC_MSG_CHECKING(for execinfo.h) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], @@ -69,11 +76,11 @@ Index: libtorrent-0.13.3/scripts/common.m4 - AC_MSG_RESULT(no) - ]) ]) - + AC_DEFUN([TORRENT_CHECK_ALIGNED], [ AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ +- AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; @@ -90,5 +97,8 @@ Index: libtorrent-0.13.3/scripts/common.m4 - AC_MSG_RESULT(required) - ]) ]) - + + +-- +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index 9bb81c409..331f978f8 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -8,10 +8,10 @@ DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" SRC_URI = "git://github.com/rakshasa/rtorrent \ file://don-t-run-code-while-configuring-package.patch \ " -# v0.9.7 -SRCREV = "327164f9d86aafcd2500a317d485374df32ea622" +# v0.9.8 +SRCREV = "6154d1698756e0c4842b1c13a0e56db93f1aa947" -PV = "0.9.7+git${SRCPV}" +PV = "0.9.8" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.6.bb deleted file mode 100644 index 33c0a82b8..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.6.bb +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "Open-source monitoring solution for your IT infrastructure" -DESCRIPTION = "\ -ZABBIX is software that monitors numerous parameters of a network and the \ -health and integrity of servers. ZABBIX uses a flexible notification \ -mechanism that allows users to configure e-mail based alerts for virtually \ -any event. This allows a fast reaction to server problems. ZABBIX offers \ -excellent reporting and data visualisation features based on the stored \ -data. This makes ZABBIX ideal for capacity planning. \ -\ -ZABBIX supports both polling and trapping. All ZABBIX reports and \ -statistics, as well as configuration parameters are accessed through a \ -web-based front end. A web-based front end ensures that the status of \ -your network and the health of your servers can be assessed from any \ -location. Properly configured, ZABBIX can play an important role in \ -monitoring IT infrastructure. This is equally true for small \ -organisations with a few servers and for large companies with a \ -multitude of servers." -HOMEPAGE = "http://www.zabbix.com/" -SECTION = "Applications/Internet" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=300e938ad303147fede2294ed78fe02e" -DEPENDS = "libevent libpcre openldap virtual/libiconv zlib" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-Fix-configure.ac.patch \ - file://zabbix-agent.service \ -" - -SRC_URI[md5sum] = "6cd55cd743d416d9ffbf2e6fdee680ee" -SRC_URI[sha256sum] = "646b1f29a768e3123a00a9afadf382b4d0dfd54e20fb31023f0d6da066da0864" - -inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "zabbix-agent.service" -SYSTEMD_AUTO_ENABLE = "enable" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r zabbix" -USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ - -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \ -" - -KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}" - -EXTRA_OECONF = " \ - --enable-dependency-tracking \ - --enable-agent \ - --enable-ipv6 \ - --with-net-snmp \ - --with-ldap=${STAGING_EXECPREFIXDIR} \ - --with-jabber \ - --with-unixodbc \ - --with-ssh2 \ - --with-sqlite3 \ - --with-zlib \ - --with-libpthread \ - --with-libevent \ - --with-libpcre \ -" -CFLAGS_append = " -lldap -llber -pthread" - -do_configure_prepend() { - export KERNEL_VERSION="${KERNEL_VERSION}" -} - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service - fi -} - -FILES_${PN} += "${libdir}" - -RDEPENDS_${PN} = "logrotate" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb new file mode 100644 index 000000000..ed6c55bba --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb @@ -0,0 +1,79 @@ +SUMMARY = "Open-source monitoring solution for your IT infrastructure" +DESCRIPTION = "\ +ZABBIX is software that monitors numerous parameters of a network and the \ +health and integrity of servers. ZABBIX uses a flexible notification \ +mechanism that allows users to configure e-mail based alerts for virtually \ +any event. This allows a fast reaction to server problems. ZABBIX offers \ +excellent reporting and data visualisation features based on the stored \ +data. This makes ZABBIX ideal for capacity planning. \ +\ +ZABBIX supports both polling and trapping. All ZABBIX reports and \ +statistics, as well as configuration parameters are accessed through a \ +web-based front end. A web-based front end ensures that the status of \ +your network and the health of your servers can be assessed from any \ +location. Properly configured, ZABBIX can play an important role in \ +monitoring IT infrastructure. This is equally true for small \ +organisations with a few servers and for large companies with a \ +multitude of servers." +HOMEPAGE = "http://www.zabbix.com/" +SECTION = "Applications/Internet" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=300e938ad303147fede2294ed78fe02e" +DEPENDS = "libevent libpcre openldap virtual/libiconv zlib" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ + file://0001-Fix-configure.ac.patch \ + file://zabbix-agent.service \ +" + +SRC_URI[md5sum] = "601d3c29322c720c72018950ed969d0a" +SRC_URI[sha256sum] = "9d9bdf1d858048d72811de04269a429aba257fac2e4b6e782d5a2b1d3a82f627" + +inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "zabbix-agent.service" +SYSTEMD_AUTO_ENABLE = "enable" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "-r zabbix" +USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ + -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \ +" + +KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}" + +EXTRA_OECONF = " \ + --enable-dependency-tracking \ + --enable-agent \ + --enable-ipv6 \ + --with-net-snmp \ + --with-ldap=${STAGING_EXECPREFIXDIR} \ + --with-jabber \ + --with-unixodbc \ + --with-ssh2 \ + --with-sqlite3 \ + --with-zlib \ + --with-libpthread \ + --with-libevent \ + --with-libpcre \ +" +CFLAGS_append = " -lldap -llber -pthread" + +do_configure_prepend() { + export KERNEL_VERSION="${KERNEL_VERSION}" +} + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service + fi +} + +FILES_${PN} += "${libdir}" + +RDEPENDS_${PN} = "logrotate" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb index d2d051070..d639abb42 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb @@ -18,6 +18,7 @@ inherit meson pkgconfig systemd distro_features_check DEPENDS = "expat systemd" DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit', '', d)}" REQUIRED_DISTRO_FEATURES = "systemd" @@ -28,3 +29,4 @@ FILES_${PN} += "${systemd_user_unitdir}" FILES_${PN} += "${libdir}/systemd/catalog" EXTRA_OEMESON += " -Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" +EXTRA_OEMESON += " -Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch new file mode 100644 index 000000000..daf90ad44 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch @@ -0,0 +1,67 @@ +From a3eba0fcee5e96ef47a6d3fac7196a1074f0dc17 Mon Sep 17 00:00:00 2001 +From: Adrian Bunk +Date: Wed, 30 Oct 2019 11:07:23 +0200 +Subject: Avoid use of "mips" which is reserved on mips + +Upstream-Status: Submitted [https://github.com/brasko/gdbwire/pull/9] + +Signed-off-by: Adrian Bunk + +diff --git a/src/gdbwire_mi_parser.c b/src/gdbwire_mi_parser.c +index 3f6b563..24aa0cf 100644 +--- a/lib/tgdb/gdbwire.c ++++ b/lib/tgdb/gdbwire.c +@@ -40,7 +40,7 @@ struct gdbwire_mi_parser { + /* The GDB/MI lexer state */ + yyscan_t mils; + /* The GDB/MI push parser state */ +- gdbwire_mi_pstate *mips; ++ gdbwire_mi_pstate *mipst; + /* The client parser callbacks */ + struct gdbwire_mi_parser_callbacks callbacks; + }; +@@ -71,8 +71,8 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks) + } + + /* Create a new push parser state instance */ +- parser->mips = gdbwire_mi_pstate_new(); +- if (!parser->mips) { ++ parser->mipst = gdbwire_mi_pstate_new(); ++ if (!parser->mipst) { + gdbwire_mi_lex_destroy(parser->mils); + gdbwire_string_destroy(parser->buffer); + free(parser); +@@ -81,7 +81,7 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks) + + /* Ensure that the callbacks are non null */ + if (!callbacks.gdbwire_mi_output_callback) { +- gdbwire_mi_pstate_delete(parser->mips); ++ gdbwire_mi_pstate_delete(parser->mipst); + gdbwire_mi_lex_destroy(parser->mils); + gdbwire_string_destroy(parser->buffer); + free(parser); +@@ -109,9 +109,9 @@ void gdbwire_mi_parser_destroy(struct gdbwire_mi_parser *parser) + } + + /* Free the push parser instance */ +- if (parser->mips) { +- gdbwire_mi_pstate_delete(parser->mips); +- parser->mips = NULL; ++ if (parser->mipst) { ++ gdbwire_mi_pstate_delete(parser->mipst); ++ parser->mipst = NULL; + } + + free(parser); +@@ -162,7 +162,7 @@ gdbwire_mi_parser_parse_line(struct gdbwire_mi_parser *parser, + pattern = gdbwire_mi_lex(parser->mils); + if (pattern == 0) + break; +- mi_status = gdbwire_mi_push_parse(parser->mips, pattern, NULL, ++ mi_status = gdbwire_mi_push_parse(parser->mipst, pattern, NULL, + parser->mils, &output); + } while (mi_status == YYPUSH_MORE); + +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch deleted file mode 100644 index 4358629b7..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch +++ /dev/null @@ -1,47 +0,0 @@ -Disable building manpages so that make install doesn't fail due to lack of help2man - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Matthieu Crapet ---- - configure.ac | 3 --- - doc/Makefile.am | 5 ----- - 2 files changed, 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ee7eca0..1f0d924 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -134,9 +134,6 @@ dnl check that the required tools are available to generate documentation - if test "$HAS_MAKEINFO" != "yes" ; then - AC_MSG_ERROR([Please install makeinfo before installing]) - fi --if test "$HAS_HELP2MAN" != "yes" ; then -- AC_MSG_ERROR([Please install help2man]) --fi - - dnl Checking for log10 function in math - I would like to remove this - AC_CHECK_LIB(m, log10) -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 60662f6..0ae0013 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,15 +1,10 @@ - info_TEXINFOS = cgdb.texi - cgdb_TEXINFOS = gpl.texi - --dist_man_MANS = cgdb.1 - EXTRA_DIST = cgdb.txt - - dist_pkgdata_DATA = cgdb.txt - --# generate the man page using help2man. --cgdb.1: -- help2man --output=$(top_srcdir)/doc/cgdb.1 $(top_builddir)/cgdb/cgdb$(EXEEXT) -- - cgdb.txt: cgdb.texi $(srcdir)/version.texi $(cgdb_TEXINFOS) - TEXTS = cgdb.txt - text-am: $(TEXTS) --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb deleted file mode 100644 index 74019fb62..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "curses-based interface to GDB" -DESCRIPTION = "cgdb is a lightweight curses (terminal-based) interface to the GNU Debugger (GDB)." -HOMEPAGE = "http://cgdb.github.io/" -SECTION = "devel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "flex-native readline ncurses" - -inherit autotools - -SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \ - file://remove-help2man.patch" -SRC_URI[md5sum] = "7bd38c79bf4d794d239928fef401fca3" -SRC_URI[sha256sum] = "be203e29be295097439ab67efe3dc8261f742c55ff3647718d67d52891f4cf41" - -CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2" -EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR} \ - --with-ncurses=${STAGING_LIBDIR}" - -RDEPENDS_${PN} = "gdb" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb new file mode 100644 index 000000000..57e364e1c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "curses-based interface to GDB" +DESCRIPTION = "cgdb is a lightweight curses (terminal-based) interface to the GNU Debugger (GDB)." +HOMEPAGE = "http://cgdb.github.io/" +SECTION = "devel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "flex-native readline ncurses" + +inherit autotools + +SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \ + file://0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch \ +" +SRC_URI[md5sum] = "a104862ffd3145b076303992e9a3af26" +SRC_URI[sha256sum] = "bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198" + +CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes" +EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR} \ + --with-ncurses=${STAGING_LIBDIR}" + +RDEPENDS_${PN} = "gdb" diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch deleted file mode 100644 index bbebc4dc7..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 81b213b98f51ec3eed5774f6f797c074ac35db3e Mon Sep 17 00:00:00 2001 -From: Ton van den Heuvel -Date: Mon, 6 May 2019 15:17:28 +0200 -Subject: [PATCH] Fix #6906 - -Generate configvalues.h only as a dependency for the VHDL parser. Fixes -a problem in combination with Ninja v1.9.0 because of duplicate rules -for generating configvalues.h. - -Upstream-Status: Backport -Signed-off-by: Oleksandr Kravchuk ---- - addon/doxyapp/CMakeLists.txt | 8 -------- - addon/doxyparse/CMakeLists.txt | 8 -------- - src/CMakeLists.txt | 4 ++++ - vhdlparser/CMakeLists.txt | 12 +++--------- - 4 files changed, 7 insertions(+), 25 deletions(-) - -diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt -index a7377112..0aaf4655 100644 ---- a/addon/doxyapp/CMakeLists.txt -+++ b/addon/doxyapp/CMakeLists.txt -@@ -1,11 +1,3 @@ --# configvalues.h --add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h -- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py -- OUTPUT ${GENERATED_SRC}/configvalues.h --) --set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) -- - find_package(Iconv) - - include_directories( -diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt -index ff198fb4..1620c72e 100644 ---- a/addon/doxyparse/CMakeLists.txt -+++ b/addon/doxyparse/CMakeLists.txt -@@ -1,11 +1,3 @@ --# configvalues.h --add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h -- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py -- OUTPUT ${GENERATED_SRC}/configvalues.h --) --set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) -- - find_package(Iconv) - - include_directories( -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 92a302ab..37a21ff6 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -43,6 +43,10 @@ add_custom_command( - OUTPUT ${GENERATED_SRC}/configvalues.h - ) - set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) -+add_custom_target( -+ generate_configvalues_header -+ DEPENDS ${GENERATED_SRC}/configvalues.h -+) - - # configvalues.cpp - add_custom_command( -diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt -index 71e97df5..f89008c5 100644 ---- a/vhdlparser/CMakeLists.txt -+++ b/vhdlparser/CMakeLists.txt -@@ -1,14 +1,5 @@ --# configvalues.h --add_custom_command( -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h -- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py -- OUTPUT ${GENERATED_SRC}/configvalues.h --) --set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) -- - include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC}) - add_library(vhdlparser STATIC --${GENERATED_SRC}/configvalues.h - CharStream.cc - ParseException.cc - Token.cc -@@ -17,3 +8,6 @@ VhdlParser.cc - VhdlParserTokenManager.cc - VhdlParserIF.cpp - ) -+add_dependencies(vhdlparser -+ generate_configvalues_header -+) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb deleted file mode 100644 index b49fbd4d0..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Doxygen is the de facto standard tool for generating documentation from annotated C++ sources." -HOMEPAGE = "http://www.doxygen.org/" - -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ - file://0001-build-don-t-look-for-Iconv.patch \ - file://0001-Fix-6906.patch" -SRC_URI[md5sum] = "2c98c73eba392d334f5bbaf15e09bae3" -SRC_URI[sha256sum] = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d" - -inherit cmake python3native - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb new file mode 100644 index 000000000..4df994c75 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Doxygen is the de facto standard tool for generating documentation from annotated C++ sources." +HOMEPAGE = "http://www.doxygen.org/" + +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "flex-native bison-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ + file://0001-build-don-t-look-for-Iconv.patch \ +" +SRC_URI[md5sum] = "3ec5f8bfda38a05845161fbbd5d8b439" +SRC_URI[sha256sum] = "ff981fb6f5db4af9deb1dd0c0d9325e0f9ba807d17bd5750636595cf16da3c82" + +inherit cmake python3native + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch deleted file mode 100644 index ed3bac39b..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 20282b1cb0389553421c4c5b14de198c5dfff50b Mon Sep 17 00:00:00 2001 -From: Anna Henningsen -Date: Sat, 20 Oct 2018 05:24:54 +0200 -Subject: [PATCH] src: use more explicit return type in Sign::SignFinal() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Using the non-indexed variant of `std::get<>` broke Travis CI. -Also, this allows us to be a bit more concise when returning -from `SignFinal()` due to some error condition. - -Refs: https://github.com/nodejs/node/pull/23427 - -PR-URL: https://github.com/nodejs/node/pull/23779 -Reviewed-By: Joyee Cheung -Reviewed-By: Tobias Nießen -Reviewed-By: Refael Ackermann -Reviewed-By: Colin Ihrig ---- - src/node_crypto.cc | 23 +++++++++++------------ - src/node_crypto.h | 12 +++++++++++- - 2 files changed, 22 insertions(+), 13 deletions(-) - -diff --git a/src/node_crypto.cc b/src/node_crypto.cc -index bd8d9e032554..ec7d4f2bb5be 100644 ---- a/src/node_crypto.cc -+++ b/src/node_crypto.cc -@@ -3562,22 +3562,20 @@ static MallocedBuffer Node_SignFinal(EVPMDPointer&& mdctx, - return MallocedBuffer(); - } - --std::pair> Sign::SignFinal( -+Sign::SignResult Sign::SignFinal( - const char* key_pem, - int key_pem_len, - const char* passphrase, - int padding, - int salt_len) { -- MallocedBuffer buffer; -- - if (!mdctx_) -- return std::make_pair(kSignNotInitialised, std::move(buffer)); -+ return SignResult(kSignNotInitialised); - - EVPMDPointer mdctx = std::move(mdctx_); - - BIOPointer bp(BIO_new_mem_buf(const_cast(key_pem), key_pem_len)); - if (!bp) -- return std::make_pair(kSignPrivateKey, std::move(buffer)); -+ return SignResult(kSignPrivateKey); - - EVPKeyPointer pkey(PEM_read_bio_PrivateKey(bp.get(), - nullptr, -@@ -3588,7 +3586,7 @@ std::pair> Sign::SignFinal( - // without `pkey` being set to nullptr; - // cf. the test of `test_bad_rsa_privkey.pem` for an example. - if (!pkey || 0 != ERR_peek_error()) -- return std::make_pair(kSignPrivateKey, std::move(buffer)); -+ return SignResult(kSignPrivateKey); - - #ifdef NODE_FIPS_MODE - /* Validate DSA2 parameters from FIPS 186-4 */ -@@ -3612,9 +3610,10 @@ std::pair> Sign::SignFinal( - } - #endif // NODE_FIPS_MODE - -- buffer = Node_SignFinal(std::move(mdctx), pkey, padding, salt_len); -+ MallocedBuffer buffer = -+ Node_SignFinal(std::move(mdctx), pkey, padding, salt_len); - Error error = buffer.is_empty() ? kSignPrivateKey : kSignOk; -- return std::make_pair(error, std::move(buffer)); -+ return SignResult(error, std::move(buffer)); - } - - -@@ -3639,18 +3638,18 @@ void Sign::SignFinal(const FunctionCallbackInfo& args) { - - ClearErrorOnReturn clear_error_on_return; - -- std::pair> ret = sign->SignFinal( -+ SignResult ret = sign->SignFinal( - buf, - buf_len, - len >= 2 && !args[1]->IsNull() ? *passphrase : nullptr, - padding, - salt_len); - -- if (std::get(ret) != kSignOk) -- return sign->CheckThrow(std::get(ret)); -+ if (ret.error != kSignOk) -+ return sign->CheckThrow(ret.error); - - MallocedBuffer sig = -- std::move(std::get>(ret)); -+ std::move(ret.signature); - - Local rc = - Buffer::New(env, reinterpret_cast(sig.release()), sig.size) -diff --git a/src/node_crypto.h b/src/node_crypto.h -index 6fcf737f6c43..0c26c1f6ff1d 100644 ---- a/src/node_crypto.h -+++ b/src/node_crypto.h -@@ -518,7 +518,17 @@ class Sign : public SignBase { - public: - static void Initialize(Environment* env, v8::Local target); - -- std::pair> SignFinal( -+ struct SignResult { -+ Error error; -+ MallocedBuffer signature; -+ -+ explicit SignResult( -+ Error err, -+ MallocedBuffer&& sig = MallocedBuffer()) -+ : error(err), signature(std::move(sig)) {} -+ }; -+ -+ SignResult SignFinal( - const char* key_pem, - int key_pem_len, - const char* passphrase, diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb deleted file mode 100644 index a978eebe4..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb +++ /dev/null @@ -1,113 +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=be980eb7ccafe287cb438076a65e888c" - -DEPENDS = "openssl" -DEPENDS_append_class-target = " nodejs-native" - -inherit pkgconfig - -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-Crypto-reduce-memory-usage-of-SignFinal.patch \ - file://0004-Make-compatibility-with-gcc-4.8.patch \ - file://0005-Link-atomic-library.patch \ - file://0006-Use-target-ldflags.patch \ - " -SRC_URI_append_class-target = " \ - file://0002-Using-native-torque.patch \ - " - -SRC_URI[md5sum] = "b41275a018e670947c1950b12f050a2f" -SRC_URI[sha256sum] = "7bf1123d7415964775b8f81fe6ec6dd5c3c08abb42bb71dfe4409dbeeba26bbd" - -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 ??= "zlib icu" -PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" -PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" - -# 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 () { - rm -rf ${S}/deps/openssl - export LD="${CXX}" - GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES - # $TARGET_ARCH settings don't match --dest-cpu settings - ./configure --prefix=${prefix} --without-snapshot --shared-openssl \ - --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ - --dest-os=linux \ - ${ARCHFLAGS} \ - ${PACKAGECONFIG_CONFARGS} -} - -do_compile () { - export LD="${CXX}" - oe_runmake BUILDTYPE=Release -} - -do_install () { - oe_runmake install DESTDIR=${D} -} - -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 torque to provide it within sysroot for the target compilation - install -d ${D}${bindir} - install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque -} - -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 python-core python-shell python-datetime python-subprocess python-textutils \ - python-compiler python-misc python-multiprocessing" - -PACKAGES =+ "${PN}-systemtap" -FILES_${PN}-systemtap = "${datadir}/systemtap" - - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb new file mode 100644 index 000000000..4afe341f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb @@ -0,0 +1,114 @@ +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" +HOMEPAGE = "http://nodejs.org" +LICENSE = "MIT & BSD & Artistic-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=be980eb7ccafe287cb438076a65e888c" + +DEPENDS = "openssl" +DEPENDS_append_class-target = " nodejs-native" + +inherit pkgconfig + +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://0004-Make-compatibility-with-gcc-4.8.patch \ + file://0005-Link-atomic-library.patch \ + file://0006-Use-target-ldflags.patch \ + " +SRC_URI_append_class-target = " \ + file://0002-Using-native-torque.patch \ + " + +SRC_URI[md5sum] = "d5a56d0abf764a91f627f0690cd4b9f3" +SRC_URI[sha256sum] = "412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e" + +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 icu libuv zlib" +PACKAGECONFIG[ares] = "--shared-cares,,c-ares" +PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" +PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" +PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" + +# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi +do_configure () { + rm -rf ${S}/deps/openssl + export LD="${CXX}" + GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES + # $TARGET_ARCH settings don't match --dest-cpu settings + ./configure --prefix=${prefix} --without-snapshot --shared-openssl \ + --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ + --dest-os=linux \ + ${ARCHFLAGS} \ + ${PACKAGECONFIG_CONFARGS} +} + +do_compile () { + export LD="${CXX}" + oe_runmake BUILDTYPE=Release +} + +do_install () { + oe_runmake install DESTDIR=${D} +} + +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 torque to provide it within sysroot for the target compilation + install -d ${D}${bindir} + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque +} + +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 python-core python-shell python-datetime python-subprocess python-textutils \ + python-compiler python-misc python-multiprocessing" + +PACKAGES =+ "${PN}-systemtap" +FILES_${PN}-systemtap = "${datadir}/systemtap" + + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc deleted file mode 100644 index 3d537e5b6..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc +++ /dev/null @@ -1,263 +0,0 @@ -SUMMARY = "A server-side, HTML-embedded scripting language" -HOMEPAGE = "http://www.php.net" -SECTION = "console/network" - -LICENSE = "PHP-3.0" - -BBCLASSEXTEND = "native" -DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native" -DEPENDS_class-native = "zlib-native libxml2-native" - -PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}" - -SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ - file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ - " - -SRC_URI_append_class-target = " \ - file://iconv.patch \ - file://imap-fix-autofoo.patch \ - file://php_exec_native.patch \ - file://php-fpm.conf \ - file://php-fpm-apache.conf \ - file://70_mod_php${PHP_MAJOR_VERSION}.conf \ - file://php-fpm.service \ - " -S = "${WORKDIR}/php-${PV}" - -inherit autotools pkgconfig pythonnative gettext - -# phpize is not scanned for absolute paths by default (but php-config is). -# -SSTATE_SCAN_FILES += "phpize" -SSTATE_SCAN_FILES += "build-defs.h" - -PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}" - -# Common EXTRA_OECONF -COMMON_EXTRA_OECONF = "--enable-sockets \ - --enable-pcntl \ - --enable-shared \ - --disable-rpath \ - --with-pic \ - --libdir=${PHP_LIBDIR} \ -" -EXTRA_OECONF = "--enable-mbstring \ - --enable-wddx \ - --enable-fpm \ - --with-libdir=${baselib} \ - --with-gettext=${STAGING_LIBDIR}/.. \ - --with-zlib=${STAGING_LIBDIR}/.. \ - --with-iconv=${STAGING_LIBDIR}/.. \ - --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ - --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ - ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \ - ${COMMON_EXTRA_OECONF} \ -" - -EXTRA_OECONF_append_riscv64 = " --with-pcre-jit=no" -EXTRA_OECONF_append_riscv32 = " --with-pcre-jit=no" - -CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=yes" - -EXTRA_OECONF_class-native = " \ - --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \ - --without-iconv \ - ${COMMON_EXTRA_OECONF} \ -" - -PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ -" -PACKAGECONFIG_class-native = "" - -PACKAGECONFIG[zip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip" - -PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ - --with-pdo-mysql=mysqlnd \ - ,--without-mysqli --without-pdo-mysql \ - ,mysql5" - -PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \ - --with-pdo-sqlite=${STAGING_LIBDIR}/.. \ - ,--without-sqlite3 --without-pdo-sqlite \ - ,sqlite3" -PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" -PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2" -PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" -PACKAGECONFIG[pam] = ",,libpam" -PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ - --with-imap-ssl=${STAGING_DIR_HOST} \ - ,--without-imap --without-imap-ssl \ - ,uw-imap" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache" -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" -PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" - -export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" -export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" -CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" - -EXTRA_OEMAKE = "INSTALL_ROOT=${D}" - -acpaths = "" - -do_configure_prepend () { - rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4 - find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!' -} - -do_configure_append() { - # No, libtool, we really don't want rpath set... - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${HOST_SYS}-libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${HOST_SYS}-libtool -} - -do_install_append_class-native() { - rm -rf ${D}/${PHP_LIBDIR}/php/.registry - rm -rf ${D}/${PHP_LIBDIR}/php/.channels - rm -rf ${D}/${PHP_LIBDIR}/php/.[a-z]* -} - -do_install_prepend() { - cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \ - ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4 -} - -do_install_prepend_class-target() { - if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then - # Install dummy config file so apxs doesn't fail - install -d ${D}${sysconfdir}/apache2 - printf "\nLoadModule dummy_module modules/mod_dummy.so\n" > ${D}${sysconfdir}/apache2/httpd.conf - fi -} - -# fixme -do_install_append_class-target() { - install -d ${D}${sysconfdir}/ - if [ -d ${RECIPE_SYSROOT_NATIVE}${sysconfdir} ];then - install -m 0644 ${RECIPE_SYSROOT_NATIVE}${sysconfdir}/pear.conf ${D}${sysconfdir}/ - fi - rm -rf ${D}/${TMPDIR} - rm -rf ${D}/.registry - rm -rf ${D}/.channels - rm -rf ${D}/.[a-z]* - rm -rf ${D}/var - rm -f ${D}/${sysconfdir}/php-fpm.conf.default - sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}${sysconfdir}/pear.conf - install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf - install -d ${D}/${sysconfdir}/apache2/conf.d - install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf - install -d ${D}${sysconfdir}/init.d - sed -i 's:=/usr/sbin:=${sbindir}:g' ${B}/sapi/fpm/init.d.php-fpm - sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm - sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm - install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm - install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/php-fpm.service ${D}${systemd_unitdir}/system/ - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ - ${D}${systemd_unitdir}/system/php-fpm.service - fi - - TMP=`dirname ${D}/${TMPDIR}` - while test ${TMP} != ${D}; do - if [ -d ${TMP} ]; then - rmdir ${TMP} - fi - TMP=`dirname ${TMP}`; - done - - if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/apache2/modules.d - install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} - install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d - sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf - cat ${S}/php.ini-production | \ - sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ - > ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}/php.ini - rm -f ${D}${sysconfdir}/apache2/httpd.conf* - fi -} - -SYSROOT_PREPROCESS_FUNCS += "php_sysroot_preprocess" - -php_sysroot_preprocess () { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/phpize ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/php-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - - sed -i 's!eval echo /!eval echo ${STAGING_DIR_HOST}/!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/phpize - sed -i 's!^include_dir=.*!include_dir=${STAGING_INCDIR}/php!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/php-config -} - -MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp', '', d)}" - -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-opcache ${PN}" - -RDEPENDS_${PN} += "libgcc" -RDEPENDS_${PN}-pear = "${PN}" -RDEPENDS_${PN}-phar = "${PN}-cli" -RDEPENDS_${PN}-cli = "${PN}" -RDEPENDS_${PN}-modphp = "${PN} apache2" -RDEPENDS_${PN}-opcache = "${PN}" - -INITSCRIPT_PACKAGES = "${PN}-fpm" -inherit update-rc.d - -FILES_${PN}-dbg =+ "${bindir}/.debug \ - ${libexecdir}/apache2/modules/.debug" -FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc" -FILES_${PN}-cli = "${bindir}/php" -FILES_${PN}-phar = "${bindir}/phar*" -FILES_${PN}-cgi = "${bindir}/php-cgi" -FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${systemd_unitdir}/system/php-fpm.service ${sysconfdir}/php-fpm.d/www.conf.default" -FILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" -CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf" -CONFFILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" -INITSCRIPT_NAME_${PN}-fpm = "php-fpm" -INITSCRIPT_PARAMS_${PN}-fpm = "defaults 60" -FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl ${PHP_LIBDIR}/php/PEAR \ - ${PHP_LIBDIR}/php/PEAR*.php ${PHP_LIBDIR}/php/System.php \ - ${PHP_LIBDIR}/php/peclcmd.php ${PHP_LIBDIR}/php/pearcmd.php \ - ${PHP_LIBDIR}/php/.channels ${PHP_LIBDIR}/php/.channels/.alias \ - ${PHP_LIBDIR}/php/.registry ${PHP_LIBDIR}/php/Archive/Tar.php \ - ${PHP_LIBDIR}/php/Console/Getopt.php ${PHP_LIBDIR}/php/OS/Guess.php \ - ${PHP_LIBDIR}/php/data/PEAR \ - ${sysconfdir}/pear.conf" -FILES_${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ - ${bindir}/php-config ${PHP_LIBDIR}/php/.depdb \ - ${PHP_LIBDIR}/php/.depdblock ${PHP_LIBDIR}/php/.filemap \ - ${PHP_LIBDIR}/php/.lock ${PHP_LIBDIR}/php/test" -FILES_${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" -FILES_${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" -FILES_${PN} = "${PHP_LIBDIR}/php" -FILES_${PN} += "${bindir} ${libexecdir}/apache2" - -SUMMARY_${PN}-modphp = "PHP module for the Apache HTTP server" -FILES_${PN}-modphp = "${libdir}/apache2 ${sysconfdir}" - -MODPHP_OLDPACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'modphp', '', d)}" -RPROVIDES_${PN}-modphp = "${MODPHP_OLDPACKAGE}" -RREPLACES_${PN}-modphp = "${MODPHP_OLDPACKAGE}" -RCONFLICTS_${PN}-modphp = "${MODPHP_OLDPACKAGE}" - -do_install_append_class-native() { - create_wrapper ${D}${bindir}/php \ - PHP_PEAR_SYSCONF_DIR=${sysconfdir}/ -} - - -# Fails to build with thumb-1 (qemuarm) -# | {standard input}: Assembler messages: -# | {standard input}:3719: Error: selected processor does not support Thumb mode `smull r0,r2,r9,r3' -# | {standard input}:3720: Error: unshifted register required -- `sub r2,r2,r0,asr#31' -# | {standard input}:3796: Error: selected processor does not support Thumb mode `smull r0,r2,r3,r3' -# | {standard input}:3797: Error: unshifted register required -- `sub r2,r2,r0,asr#31' -# | make: *** [ext/standard/math.lo] Error 1 -ARM_INSTRUCTION_SET = "arm" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch deleted file mode 100644 index 2258c4c7f..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 03fecab78f9fa747ad8ab3484e7ca00c0148321d Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Sun, 28 Apr 2019 16:45:02 +0800 -Subject: [PATCH] From: Hugh McMaster Date: Wed, 5 - Dec 2018 23:27:30 +1100 Subject: ext/intl: Use pkg-config to detect icu - -The developers of icu recommend using pkg-config to detect icu, -because icu-config is deprecated. - -Upstream-Status: Pending - -update to version 7.3.4 -Signed-off-by: Changqing Li ---- - acinclude.m4 | 95 ++++++------------------------------------------------ - ext/intl/config.m4 | 16 ++++----- - 2 files changed, 15 insertions(+), 96 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 7d77c33..86b0ecc 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2158,92 +2158,15 @@ dnl - dnl Common setup macro for ICU - dnl - AC_DEFUN([PHP_SETUP_ICU],[ -- PHP_ARG_WITH(icu-dir,, -- [ --with-icu-dir=DIR Specify where ICU libraries and headers can be found], DEFAULT, no) -- -- if test "$PHP_ICU_DIR" = "no"; then -- PHP_ICU_DIR=DEFAULT -- fi -- -- AC_MSG_CHECKING([for location of ICU headers and libraries]) -- found_icu=no -- -- dnl First try to find pkg-config -- if test -z "$PKG_CONFIG"; then -- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -- fi -- -- dnl If pkg-config is found try using it -- if test "$PHP_ICU_DIR" = "DEFAULT" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists icu-uc icu-io icu-i18n; then -- if $PKG_CONFIG --atleast-version=40 icu-uc; then -- found_icu=yes -- icu_version_full=`$PKG_CONFIG --modversion icu-uc` -- ac_IFS=$IFS -- IFS="." -- set $icu_version_full -- IFS=$ac_IFS -- icu_version=`expr [$]1 \* 1000 + [$]2` -- AC_MSG_RESULT([found $icu_version_full]) -- -- ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io icu-i18n` -- ICU_INCS=`$PKG_CONFIG --cflags-only-I icu-uc icu-io icu-i18n` -- ICU_CXXFLAGS="-DU_USING_ICU_NAMESPACE=1" -- -- AC_MSG_RESULT([found $ICU_VERSION]) -- -- PHP_EVAL_LIBLINE($ICU_LIBS, $1) -- PHP_EVAL_INCLINE($ICU_INCS) -- else -- AC_MSG_ERROR([ICU version 4.0 or later required.]) -- fi -- fi -- -- dnl If pkg-config fails for some reason, revert to the old method -- if test "$found_icu" = "no"; then -- if test "$PHP_ICU_DIR" = "DEFAULT"; then -- dnl Try to find icu-config -- AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin]) -- else -- ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config" -- fi -- -- dnl Trust icu-config to know better what the install prefix is.. -- icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` -- if test "$?" != "0" || test -z "$icu_install_prefix"; then -- AC_MSG_RESULT([not found]) -- AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works.]) -- else -- AC_MSG_RESULT([$icu_install_prefix]) -- -- dnl Check ICU version -- AC_MSG_CHECKING([for ICU 4.0 or greater]) -- icu_version_full=`$ICU_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $icu_version_full -- IFS=$ac_IFS -- icu_version=`expr [$]1 \* 1000 + [$]2` -- AC_MSG_RESULT([found $icu_version_full]) -- -- if test "$icu_version" -lt "4000"; then -- AC_MSG_ERROR([ICU version 4.0 or later is required]) -- fi -- -- ICU_VERSION=$icu_version -- ICU_INCS=`$ICU_CONFIG --cppflags-searchpath` -- ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` -- PHP_EVAL_INCLINE($ICU_INCS) -- PHP_EVAL_LIBLINE($ICU_LIBS, $1) -- -- ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags` -- if test "$icu_version" -ge "49000"; then -- ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" -- ICU_CFLAGS="-DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" -- fi -- if test "$icu_version" -ge "60000"; then -- ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1" -- fi -- fi -+ PKG_CHECK_MODULES([ICU], [icu-io >= 50.1]) -+ PHP_EVAL_INCLINE($ICU_CFLAGS) -+ PHP_EVAL_LIBLINE($ICU_LIBS, $1) -+ -+ ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" -+ ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" -+ -+ if $PKG_CONFIG icu-io --atleast-version=60; then -+ ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1" - fi - ]) - -diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 -index 4b9f469..fdae88a 100644 ---- a/ext/intl/config.m4 -+++ b/ext/intl/config.m4 -@@ -9,15 +9,7 @@ if test "$PHP_INTL" != "no"; then - PHP_SETUP_ICU(INTL_SHARED_LIBADD) - PHP_SUBST(INTL_SHARED_LIBADD) - PHP_REQUIRE_CXX() -- INTL_COMMON_FLAGS="$ICU_INCS $ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" -- if test "$icu_version" -ge "4002"; then -- icu_spoof_src=" spoofchecker/spoofchecker_class.c \ -- spoofchecker/spoofchecker.c\ -- spoofchecker/spoofchecker_create.c\ -- spoofchecker/spoofchecker_main.c" -- else -- icu_spoof_src="" -- fi -+ INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" - PHP_NEW_EXTENSION(intl, php_intl.c \ - intl_error.c \ - intl_convert.c \ -@@ -68,7 +60,11 @@ if test "$PHP_INTL" != "no"; then - transliterator/transliterator_methods.c \ - uchar/uchar.c \ - idn/idn.c \ -- $icu_spoof_src, $ext_shared,,$INTL_COMMON_FLAGS,cxx) -+ spoofchecker/spoofchecker_class.c \ -+ spoofchecker/spoofchecker.c\ -+ spoofchecker/spoofchecker_create.c\ -+ spoofchecker/spoofchecker_main.c \ -+ , $ext_shared,,$INTL_COMMON_FLAGS,cxx) - - PHP_INTL_CXX_SOURCES="intl_convertcpp.cpp \ - common/common_enum.cpp \ --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.11.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.11.bb new file mode 100644 index 000000000..e7fb847fa --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.11.bb @@ -0,0 +1,275 @@ +SUMMARY = "A server-side, HTML-embedded scripting language" +HOMEPAGE = "http://www.php.net" +SECTION = "console/network" + +LICENSE = "PHP-3.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e" + +BBCLASSEXTEND = "native" +DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native" +DEPENDS_class-native = "zlib-native libxml2-native" + +PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}" + +SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ + file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ + file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ + file://0048-Use-pkg-config-for-FreeType2-detection.patch \ + file://0001-Use-pkg-config-for-libxml2-detection.patch \ + file://debian-php-fixheader.patch \ + file://CVE-2019-6978.patch \ + " + +SRC_URI_append_class-target = " \ + file://iconv.patch \ + file://imap-fix-autofoo.patch \ + file://php_exec_native.patch \ + file://php-fpm.conf \ + file://php-fpm-apache.conf \ + file://70_mod_php${PHP_MAJOR_VERSION}.conf \ + file://php-fpm.service \ + file://pear-makefile.patch \ + file://phar-makefile.patch \ + file://0001-opcache-config.m4-enable-opcache.patch \ + file://xfail_two_bug_tests.patch \ + " +S = "${WORKDIR}/php-${PV}" +SRC_URI[md5sum] = "21b710b4126d4d54714de9693a6c7b0d" +SRC_URI[sha256sum] = "92d1ff4b13c7093635f1ec338a5e6891ca99b10e65fbcadd527e5bb84d11b5e7" + +inherit autotools pkgconfig pythonnative gettext + +# phpize is not scanned for absolute paths by default (but php-config is). +# +SSTATE_SCAN_FILES += "phpize" +SSTATE_SCAN_FILES += "build-defs.h" + +PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}" + +# Common EXTRA_OECONF +COMMON_EXTRA_OECONF = "--enable-sockets \ + --enable-pcntl \ + --enable-shared \ + --disable-rpath \ + --with-pic \ + --libdir=${PHP_LIBDIR} \ +" +EXTRA_OECONF = "--enable-mbstring \ + --enable-wddx \ + --enable-fpm \ + --with-libdir=${baselib} \ + --with-gettext=${STAGING_LIBDIR}/.. \ + --with-zlib=${STAGING_LIBDIR}/.. \ + --with-iconv=${STAGING_LIBDIR}/.. \ + --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ + --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ + ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \ + ${COMMON_EXTRA_OECONF} \ +" + +EXTRA_OECONF_append_riscv64 = " --with-pcre-jit=no" +EXTRA_OECONF_append_riscv32 = " --with-pcre-jit=no" + +CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=yes" + +EXTRA_OECONF_class-native = " \ + --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \ + --without-iconv \ + ${COMMON_EXTRA_OECONF} \ +" + +PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ +" +PACKAGECONFIG_class-native = "" + +PACKAGECONFIG[zip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip" + +PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ + --with-pdo-mysql=mysqlnd \ + ,--without-mysqli --without-pdo-mysql \ + ,mysql5" + +PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \ + --with-pdo-sqlite=${STAGING_LIBDIR}/.. \ + ,--without-sqlite3 --without-pdo-sqlite \ + ,sqlite3" +PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" +PACKAGECONFIG[soap] = "--enable-libxml --enable-soap, --disable-soap, libxml2" +PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" +PACKAGECONFIG[pam] = ",,libpam" +PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ + --with-imap-ssl=${STAGING_DIR_HOST} \ + ,--without-imap --without-imap-ssl \ + ,uw-imap" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache" +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" +PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" + +export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" +export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" +CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" + +EXTRA_OEMAKE = "INSTALL_ROOT=${D}" + +acpaths = "" + +do_configure_prepend () { + rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4 + find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!' +} + +do_configure_append() { + # No, libtool, we really don't want rpath set... + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${HOST_SYS}-libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${HOST_SYS}-libtool +} + +do_install_append_class-native() { + rm -rf ${D}/${PHP_LIBDIR}/php/.registry + rm -rf ${D}/${PHP_LIBDIR}/php/.channels + rm -rf ${D}/${PHP_LIBDIR}/php/.[a-z]* +} + +do_install_prepend() { + cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \ + ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4 +} + +do_install_prepend_class-target() { + if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then + # Install dummy config file so apxs doesn't fail + install -d ${D}${sysconfdir}/apache2 + printf "\nLoadModule dummy_module modules/mod_dummy.so\n" > ${D}${sysconfdir}/apache2/httpd.conf + fi +} + +# fixme +do_install_append_class-target() { + install -d ${D}${sysconfdir}/ + if [ -d ${RECIPE_SYSROOT_NATIVE}${sysconfdir} ];then + install -m 0644 ${RECIPE_SYSROOT_NATIVE}${sysconfdir}/pear.conf ${D}${sysconfdir}/ + fi + rm -rf ${D}/${TMPDIR} + rm -rf ${D}/.registry + rm -rf ${D}/.channels + rm -rf ${D}/.[a-z]* + rm -rf ${D}/var + rm -f ${D}/${sysconfdir}/php-fpm.conf.default + sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}${sysconfdir}/pear.conf + install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf + install -d ${D}/${sysconfdir}/apache2/conf.d + install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf + install -d ${D}${sysconfdir}/init.d + sed -i 's:=/usr/sbin:=${sbindir}:g' ${B}/sapi/fpm/init.d.php-fpm + sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm + sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm + install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm + install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/php-fpm.service ${D}${systemd_unitdir}/system/ + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ + ${D}${systemd_unitdir}/system/php-fpm.service + fi + + TMP=`dirname ${D}/${TMPDIR}` + while test ${TMP} != ${D}; do + if [ -d ${TMP} ]; then + rmdir ${TMP} + fi + TMP=`dirname ${TMP}`; + done + + if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/apache2/modules.d + install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} + install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d + sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf + cat ${S}/php.ini-production | \ + sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ + > ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}/php.ini + rm -f ${D}${sysconfdir}/apache2/httpd.conf* + fi +} + +SYSROOT_PREPROCESS_FUNCS += "php_sysroot_preprocess" + +php_sysroot_preprocess () { + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/phpize ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/php-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + + sed -i 's!eval echo /!eval echo ${STAGING_DIR_HOST}/!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/phpize + sed -i 's!^include_dir=.*!include_dir=${STAGING_INCDIR}/php!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/php-config +} + +MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp', '', d)}" + +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-opcache ${PN}" + +RDEPENDS_${PN} += "libgcc" +RDEPENDS_${PN}-pear = "${PN}" +RDEPENDS_${PN}-phar = "${PN}-cli" +RDEPENDS_${PN}-cli = "${PN}" +RDEPENDS_${PN}-modphp = "${PN} apache2" +RDEPENDS_${PN}-opcache = "${PN}" + +INITSCRIPT_PACKAGES = "${PN}-fpm" +inherit update-rc.d + +FILES_${PN}-dbg =+ "${bindir}/.debug \ + ${libexecdir}/apache2/modules/.debug" +FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc" +FILES_${PN}-cli = "${bindir}/php" +FILES_${PN}-phar = "${bindir}/phar*" +FILES_${PN}-cgi = "${bindir}/php-cgi" +FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${systemd_unitdir}/system/php-fpm.service ${sysconfdir}/php-fpm.d/www.conf.default" +FILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" +CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf" +CONFFILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" +INITSCRIPT_NAME_${PN}-fpm = "php-fpm" +INITSCRIPT_PARAMS_${PN}-fpm = "defaults 60" +FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl ${PHP_LIBDIR}/php/PEAR \ + ${PHP_LIBDIR}/php/PEAR*.php ${PHP_LIBDIR}/php/System.php \ + ${PHP_LIBDIR}/php/peclcmd.php ${PHP_LIBDIR}/php/pearcmd.php \ + ${PHP_LIBDIR}/php/.channels ${PHP_LIBDIR}/php/.channels/.alias \ + ${PHP_LIBDIR}/php/.registry ${PHP_LIBDIR}/php/Archive/Tar.php \ + ${PHP_LIBDIR}/php/Console/Getopt.php ${PHP_LIBDIR}/php/OS/Guess.php \ + ${PHP_LIBDIR}/php/data/PEAR \ + ${sysconfdir}/pear.conf" +FILES_${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ + ${bindir}/php-config ${PHP_LIBDIR}/php/.depdb \ + ${PHP_LIBDIR}/php/.depdblock ${PHP_LIBDIR}/php/.filemap \ + ${PHP_LIBDIR}/php/.lock ${PHP_LIBDIR}/php/test" +FILES_${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" +FILES_${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" +FILES_${PN} = "${PHP_LIBDIR}/php" +FILES_${PN} += "${bindir} ${libexecdir}/apache2" + +SUMMARY_${PN}-modphp = "PHP module for the Apache HTTP server" +FILES_${PN}-modphp = "${libdir}/apache2 ${sysconfdir}" + +MODPHP_OLDPACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'modphp', '', d)}" +RPROVIDES_${PN}-modphp = "${MODPHP_OLDPACKAGE}" +RREPLACES_${PN}-modphp = "${MODPHP_OLDPACKAGE}" +RCONFLICTS_${PN}-modphp = "${MODPHP_OLDPACKAGE}" + +do_install_append_class-native() { + create_wrapper ${D}${bindir}/php \ + PHP_PEAR_SYSCONF_DIR=${sysconfdir}/ +} + + +# Fails to build with thumb-1 (qemuarm) +# | {standard input}: Assembler messages: +# | {standard input}:3719: Error: selected processor does not support Thumb mode `smull r0,r2,r9,r3' +# | {standard input}:3720: Error: unshifted register required -- `sub r2,r2,r0,asr#31' +# | {standard input}:3796: Error: selected processor does not support Thumb mode `smull r0,r2,r3,r3' +# | {standard input}:3797: Error: unshifted register required -- `sub r2,r2,r0,asr#31' +# | make: *** [ext/standard/math.lo] Error 1 +ARM_INSTRUCTION_SET = "arm" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb deleted file mode 100644 index a5c7b9b6b..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb +++ /dev/null @@ -1,20 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e" - -SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ - file://0048-Use-pkg-config-for-FreeType2-detection.patch \ - file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \ - file://0001-Use-pkg-config-for-libxml2-detection.patch \ - file://debian-php-fixheader.patch \ - file://CVE-2019-6978.patch \ - " -SRC_URI_append_class-target = " \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ - file://0001-opcache-config.m4-enable-opcache.patch \ - file://xfail_two_bug_tests.patch \ - " - -SRC_URI[md5sum] = "bcc37749815009c9201e4c126e1ab8ee" -SRC_URI[sha256sum] = "a39c9709a8c9eb7ea8ac4933ef7a78b92f7e5735a405c8b8e42ee39541d963c4" diff --git a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch deleted file mode 100644 index f65d26aae..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -56,6 +56,7 @@ AM_CONDITIONAL([ENABLE_EXAMPLES], [test - # Checks for programs. - AC_PROG_CC - AC_PROG_CC_C99 -+AM_PROG_AR - - # Enable automake silent build rules. - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb index 6c4f4a072..b7c1958ee 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb @@ -8,11 +8,10 @@ DEPENDS = "libusb1" inherit autotools pkgconfig -PV = "0.4.2+gitr${SRCPV}" +PV = "0.6.0" -SRCREV = "5f765f91430f16932d96b3777404420aa2dd4c7c" -SRC_URI = "git://git.libdivecomputer.org/libdivecomputer.git \ - file://fix-ar.patch \ +SRCREV = "1195abc2f4acc7b10175d570ec73549d0938c83e" +SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb index 3a0a87eea..c9d259b1a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb @@ -15,10 +15,9 @@ DEPENDS += "libtirpc libnsl2" PV = "1.3+git${SRCPV}" -SRCREV = "c6934373c7bac91499ff7bbe7d2439599325ca63" +SRCREV = "116219e215858f4af9370171d3ead63baca8fdb4" SRC_URI = "git://github.com/thkukuk/libnss_nisplus \ - file://0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch deleted file mode 100644 index cf380ddf4..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus/0001-nisplus-hosts-Remove-use-of-RES_USE_INET6.patch +++ /dev/null @@ -1,245 +0,0 @@ -From 184bda40e05053cd2df61c28bec0baa7353697bb Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 28 Aug 2019 09:49:10 -0700 -Subject: [PATCH] nisplus-hosts: Remove use of RES_USE_INET6 - -Upstream glibc dropped it starting glibc 2.30 -see -https://sourceware.org/git/?p=glibc.git;a=commit;h=3f8b44be0a658266adff5ece1e4bc3ce097a5dbe - -Upstream-Status: Submitted [https://github.com/thkukuk/libnss_nisplus/pull/2] -Signed-off-by: Khem Raj ---- - src/Makefile.am | 3 +- - src/mapv4v6addr.h | 69 --------------------------------------------- - src/nisplus-hosts.c | 58 ++++++++----------------------------- - 3 files changed, 13 insertions(+), 117 deletions(-) - delete mode 100644 src/mapv4v6addr.h - -diff --git a/src/Makefile.am b/src/Makefile.am -index e879d5c..37ef86c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -15,8 +15,7 @@ AM_CPPFLAGS = -I$(srcdir) @TIRPC_CFLAGS@ @LIBNSL_CFLAGS@ - - lib_LTLIBRARIES = libnss_nisplus.la - --noinst_HEADERS = libc-lock.h nss-nisplus.h netgroup.h nisplus-parser.h \ -- mapv4v6addr.h -+noinst_HEADERS = libc-lock.h nss-nisplus.h netgroup.h nisplus-parser.h - check_PROGRAMS = nss_loader-test - nss_loader_test_LDADD = -ldl - -diff --git a/src/mapv4v6addr.h b/src/mapv4v6addr.h -deleted file mode 100644 -index 7f85f7d..0000000 ---- a/src/mapv4v6addr.h -+++ /dev/null -@@ -1,69 +0,0 @@ --/* -- * ++Copyright++ 1985, 1988, 1993 -- * - -- * Copyright (c) 1985, 1988, 1993 -- * The Regents of the University of California. All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 4. Neither the name of the University nor the names of its contributors -- * may be used to endorse or promote products derived from this software -- * without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -- * - -- * Portions Copyright (c) 1993 by Digital Equipment Corporation. -- * -- * Permission to use, copy, modify, and distribute this software for any -- * purpose with or without fee is hereby granted, provided that the above -- * copyright notice and this permission notice appear in all copies, and that -- * the name of Digital Equipment Corporation not be used in advertising or -- * publicity pertaining to distribution of the document or software without -- * specific, written prior permission. -- * -- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL -- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES -- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT -- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -- * SOFTWARE. -- * - -- * --Copyright-- -- */ -- --#include --#include -- --static void --map_v4v6_address (const char *src, char *dst) --{ -- u_char *p = (u_char *) dst; -- int i; -- -- /* Move the IPv4 part to the right position. */ -- memcpy (dst + 12, src, INADDRSZ); -- -- /* Mark this ipv6 addr as a mapped ipv4. */ -- for (i = 0; i < 10; i++) -- *p++ = 0x00; -- *p++ = 0xff; -- *p = 0xff; --} -diff --git a/src/nisplus-hosts.c b/src/nisplus-hosts.c -index cc00aa2..d37b209 100644 ---- a/src/nisplus-hosts.c -+++ b/src/nisplus-hosts.c -@@ -42,14 +42,9 @@ static u_long tablename_len; - #define NISENTRYLEN(idx, col, res) \ - (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len) - --/* Get implementation for some internal functions. */ --#include "mapv4v6addr.h" -- -- - static int - _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host, -- char *buffer, size_t buflen, int *errnop, -- int flags) -+ char *buffer, size_t buflen, int *errnop) - { - unsigned int i; - char *first_unused = buffer; -@@ -66,8 +61,7 @@ _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host, - - char *data = first_unused; - -- if (room_left < (af != AF_INET || (flags & AI_V4MAPPED) != 0 -- ? IN6ADDRSZ : INADDRSZ)) -+ if (room_left < INADDRSZ) - { - no_more_room: - *errnop = ERANGE; -@@ -78,18 +72,8 @@ _nss_nisplus_parse_hostent (nis_result *result, int af, struct hostent *host, - if (af != AF_INET6 - && inet_pton (AF_INET, NISENTRYVAL (0, 2, result), data) > 0) - { -- assert ((flags & AI_V4MAPPED) == 0 || af != AF_UNSPEC); -- if (flags & AI_V4MAPPED) -- { -- map_v4v6_address (data, data); -- host->h_addrtype = AF_INET6; -- host->h_length = IN6ADDRSZ; -- } -- else -- { -- host->h_addrtype = AF_INET; -- host->h_length = INADDRSZ; -- } -+ host->h_addrtype = AF_INET; -+ host->h_length = INADDRSZ; - } - else if (af != AF_INET - && inet_pton (AF_INET6, NISENTRYVAL (0, 2, result), data) > 0) -@@ -319,12 +303,8 @@ internal_nisplus_gethostent_r (struct hostent *host, char *buffer, - } - } - -- if (_res.options & RES_USE_INET6) -- parse_res = _nss_nisplus_parse_hostent (result, AF_INET6, host, buffer, -- buflen, errnop, AI_V4MAPPED); -- else -- parse_res = _nss_nisplus_parse_hostent (result, AF_INET, host, buffer, -- buflen, errnop, 0); -+ parse_res = _nss_nisplus_parse_hostent (result, AF_INET, host, buffer, -+ buflen, errnop); - - if (parse_res == -1) - { -@@ -379,7 +359,7 @@ get_tablename (int *herrnop) - static enum nss_status - internal_gethostbyname2_r (const char *name, int af, struct hostent *host, - char *buffer, size_t buflen, int *errnop, -- int *herrnop, int flags) -+ int *herrnop) - { - if (tablename_val == NULL) - { -@@ -454,7 +434,7 @@ internal_gethostbyname2_r (const char *name, int af, struct hostent *host, - } - - int parse_res = _nss_nisplus_parse_hostent (result, af, host, buffer, -- buflen, errnop, flags); -+ buflen, errnop); - - nis_freeresult (result); - -@@ -485,8 +465,7 @@ _nss_nisplus_gethostbyname2_r (const char *name, int af, struct hostent *host, - } - - return internal_gethostbyname2_r (name, af, host, buffer, buflen, errnop, -- herrnop, -- ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0)); -+ herrnop); - } - - -@@ -495,19 +474,8 @@ _nss_nisplus_gethostbyname_r (const char *name, struct hostent *host, - char *buffer, size_t buflen, int *errnop, - int *h_errnop) - { -- if (_res.options & RES_USE_INET6) -- { -- enum nss_status status; -- -- status = internal_gethostbyname2_r (name, AF_INET6, host, buffer, -- buflen, errnop, h_errnop, -- AI_V4MAPPED); -- if (status == NSS_STATUS_SUCCESS) -- return status; -- } -- - return internal_gethostbyname2_r (name, AF_INET, host, buffer, -- buflen, errnop, h_errnop, 0); -+ buflen, errnop, h_errnop); - } - - -@@ -555,9 +523,7 @@ _nss_nisplus_gethostbyaddr_r (const void *addr, socklen_t addrlen, int af, - } - - parse_res = _nss_nisplus_parse_hostent (result, af, host, -- buffer, buflen, errnop, -- ((_res.options & RES_USE_INET6) -- ? AI_V4MAPPED : 0)); -+ buffer, buflen, errnop); - nis_freeresult (result); - - if (parse_res > 0) -@@ -584,7 +550,7 @@ _nss_nisplus_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, - - enum nss_status status = internal_gethostbyname2_r (name, AF_UNSPEC, &host, - buffer, buflen, -- errnop, herrnop, 0); -+ errnop, herrnop); - if (status == NSS_STATUS_SUCCESS) - { - if (*pat == NULL) --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb new file mode 100644 index 000000000..16a83a4be --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb @@ -0,0 +1,72 @@ +SUMMARY = "Opensource Implementation of WS-Management" +DESCRIPTION = "Openwsman is a project intended to provide an open-source \ +implementation of the Web Services Management specipication \ +(WS-Management) and to expose system management information on the \ +Linux operating system using the WS-Management protocol. WS-Management \ +is based on a suite of web services specifications and usage \ +requirements that exposes a set of operations focused on and covers \ +all system management aspects. \ +Openwsman Server and service libraries" +HOMEPAGE = "http://www.openwsman.org/" +SECTION = "Applications/System" + +DEPENDS = "curl libxml2 openssl libpam" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + +SRCREV = "d8eba6cb6682b59d84ca1da67a523520b879ade6" + +SRC_URI = "git://github.com/Openwsman/openwsman.git \ + file://libssl-is-required-if-eventint-supported.patch \ + file://openwsmand.service \ + file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ + " + +S = "${WORKDIR}/git" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba" + +inherit systemd cmake pkgconfig python3native perlnative + +SYSTEMD_SERVICE_${PN} = "openwsmand.service" +SYSTEMD_AUTO_ENABLE = "disable" + +LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd ", '', d)}" + +EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \ + -DBUILD_LIBCIM=NO \ + -DBUILD_PERL=YES \ + -DBUILD_PYTHON3=YES \ + -DBUILD_PYTHON=NO \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DLIB=${baselib} \ + " + +do_configure_prepend() { + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} + +do_install_append() { + install -d ${D}/${sysconfdir}/init.d + install -m 755 ${B}/etc/init/openwsmand.sh ${D}/${sysconfdir}/init.d/openwsmand + ln -sf ${sysconfdir}/init.d/openwsmand ${D}/${sbindir}/rcopenwsmand + chmod 755 ${D}/${sysconfdir}/openwsman/owsmangencert.sh + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system + + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/openwsmand.service + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/openwsmand.service + sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_unitdir}/system/openwsmand.service + fi +} + +FILES_${PN}-dbg += "${libdir}/openwsman/plugins/.debug/ \ + ${libdir}/openwsman/authenticators/.debug/ \ + " + +INSANE_SKIP_${PN} = "dev-so" +RDEPENDS_${PN} = "ruby" diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb deleted file mode 100644 index f9292790c..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.9.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "Opensource Implementation of WS-Management" -DESCRIPTION = "Openwsman is a project intended to provide an open-source \ -implementation of the Web Services Management specipication \ -(WS-Management) and to expose system management information on the \ -Linux operating system using the WS-Management protocol. WS-Management \ -is based on a suite of web services specifications and usage \ -requirements that exposes a set of operations focused on and covers \ -all system management aspects. \ -Openwsman Server and service libraries" -HOMEPAGE = "http://www.openwsman.org/" -SECTION = "Applications/System" - -DEPENDS = "curl libxml2 openssl libpam" - -inherit distro_features_check -REQUIRED_DISTRO_FEATURES = "pam" - -# v2.6.9 -SRCREV = "5efb1545dbac7e6d1e0a992f3e84ca12cea1c18e" - -SRC_URI = "git://github.com/Openwsman/openwsman.git \ - file://libssl-is-required-if-eventint-supported.patch \ - file://openwsmand.service \ - file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ - " - -S = "${WORKDIR}/git" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba" - -inherit systemd cmake pkgconfig python3native perlnative - -SYSTEMD_SERVICE_${PN} = "openwsmand.service" -SYSTEMD_AUTO_ENABLE = "disable" - -LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd ", '', d)}" - -EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \ - -DBUILD_LIBCIM=NO \ - -DBUILD_PERL=YES \ - -DBUILD_PYTHON3=YES \ - -DBUILD_PYTHON=NO \ - -DCMAKE_INSTALL_PREFIX=${prefix} \ - -DLIB=${baselib} \ - " - -do_configure_prepend() { - export STAGING_INCDIR=${STAGING_INCDIR} - export STAGING_LIBDIR=${STAGING_LIBDIR} -} - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -m 755 ${B}/etc/init/openwsmand.sh ${D}/${sysconfdir}/init.d/openwsmand - ln -sf ${sysconfdir}/init.d/openwsmand ${D}/${sbindir}/rcopenwsmand - chmod 755 ${D}/${sysconfdir}/openwsman/owsmangencert.sh - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system - - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/openwsmand.service - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/openwsmand.service - sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_unitdir}/system/openwsmand.service - fi -} - -FILES_${PN}-dbg += "${libdir}/openwsman/plugins/.debug/ \ - ${libdir}/openwsman/authenticators/.debug/ \ - " - -INSANE_SKIP_${PN} = "dev-so" -RDEPENDS_${PN} = "ruby" diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch deleted file mode 100644 index 0c79c4c09..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 340110292b35d367205953a59e7eab28e1f4a0bb Mon Sep 17 00:00:00 2001 -From: Daniel Frey -Date: Sat, 7 Apr 2018 09:13:51 +0200 -Subject: [PATCH] Fix clang-warning about non-virtual dtor - -Upstream-Status: Backport [https://github.com/taocpp/PEGTL/commit/340110292b35d367205953a59e7eab28e1f4a0bb] -Signed-off-by: Khem Raj ---- - src/example/pegtl/json_classes.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/example/pegtl/json_classes.hpp -+++ b/src/example/pegtl/json_classes.hpp -@@ -34,10 +34,7 @@ namespace examples - : type( in_type ) - { - } -- -- ~json_base() -- { -- } -+ virtual ~json_base() = default; - }; - - inline std::ostream& operator<<( std::ostream& o, const json_base& j ) diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb deleted file mode 100644 index 344a80524..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" -HOMEPAGE="https://github.com/taocpp/PEGTL" -LICENSE="MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=80cb066ab204c7fe022f1cfe0c2c6818" - -SRCREV = "776fa4a1e8bda860008524f6dd9473967c8375b1" -SRC_URI = "git://git@github.com/taocpp/PEGTL.git;protocol=https;branch=master \ - file://0001-Fix-clang-warning-about-non-virtual-dtor.patch \ - " - -inherit cmake - -S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.1.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.1.bb new file mode 100644 index 000000000..7333363ec --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" +HOMEPAGE="https://github.com/taocpp/PEGTL" +LICENSE="MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae77b0d903a788cb48f4f0926ffc468b" + +SRCREV = "7aff80da2ca4fcb0b47f32ba684ff2e1cd48c579" +SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=2.x \ + " + +inherit cmake + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi deleted file mode 100644 index 3977064fe..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi +++ /dev/null @@ -1,9533 +0,0 @@ - - - - - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - camera - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - portable_audio_player - - - - - diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi deleted file mode 100644 index 00427e7d9..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi +++ /dev/null @@ -1,19018 +0,0 @@ - - - - - - - - - camera - camera - proprietary - JL2005B/C/D camera - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer E350 Liquid Gallant Duo (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer E350 Liquid Gallant Duo (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer E39 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia A1-810 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia A1-840FHD - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia A3-A11 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A100 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A100 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A101 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A110 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A200 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A200 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A210 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A500 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A500 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A501 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A501 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A510 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A510 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Iconia TAB A700 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Liquid E2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Liquid E3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer liquid e700 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Liquid S56 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Liquid X1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Liquid Z120 MT65xx Android Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Liquid Z130 MT65xx Android Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer One 7 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer S500 CloudMobile - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Z150 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acer Z160 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acromag Inc. XO Learning Tablet (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Acromag Inc. XO Learning Tablet (MTP+ADB) - true - - - - - camera - camera - proprietary - AEG Snap 300 - true - - - - - camera - camera - proprietary - Agfa ePhoto CL18 - true - - - - - camera - camera - proprietary - Agfa ePhoto CL20 - true - - - - - camera - camera - proprietary - Aiptek 1.3 mega PocketCam - true - - - - - camera - camera - proprietary - Aiptek PalmCam Trio - true - - - - - camera - camera - proprietary - Aiptek Pencam - true - - - - - camera - camera - proprietary - Aiptek PenCam Trio - true - - - - - camera - camera - proprietary - Aiptek PenCam VGA+ - true - - - - - camera - camera - proprietary - Aiptek Pencam without flash - true - - - - - camera - camera - proprietary - Aiptek Smart Megacam - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Alcatel 6030a - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Alcatel One Touch 997D (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Alcatel One Touch 997D (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Alcatel OneTouch 5042D (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Alcatel OneTouch 6034R - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Alcatel/Bouygues BS472 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Alcatel/TCT 6010D/TCL S950 - true - - - - - camera - camera - proprietary - Amazing Spiderman - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Amazon Fire Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Amazon Kindle Fire (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Amazon Kindle Fire (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Amazon Kindle Fire (ID3) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Amazon Kindle Fire (ID4) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Amazon Kindle Fire (ID5) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Amazon Kindle Fire (ID6) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Amazon Kindle Fire (ID7) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Amazon Kindle Fire 2G (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Amazon Kindle Fire HD6 - true - - - - - camera - camera - proprietary - American Idol Keychain Camera - true - - - - - - - - camera - camera - ptp - Apple iPad (PTP mode) - true - - - - - - - - - - - camera - camera - ptp - Apple iPad Air - true - - - - - - - - - - - camera - camera - ptp - Apple iPhone (PTP mode) - true - - - - - - - - - - - camera - camera - ptp - Apple iPhone 3G (PTP mode) - true - - - - - - - - - - - camera - camera - ptp - Apple iPhone 3GS (PTP mode) - true - - - - - - - - - - - camera - camera - ptp - Apple iPhone 4 (PTP mode) - true - - - - - - - - - - - camera - camera - ptp - Apple iPhone 4S (PTP mode) - true - - - - - - - - - - - camera - camera - ptp - Apple iPhone 5 (PTP mode) - true - - - - - - - - - - - camera - camera - ptp - Apple iPod Touch (PTP mode) - true - - - - - - - - - - - camera - camera - ptp - Apple iPod Touch 2G (PTP mode) - true - - - - - - - - - - - camera - camera - ptp - Apple iPod Touch 3rd Gen (PTP mode) - true - - - - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos (for Tesco) Hudl (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos (for Tesco) Hudl (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 101 G4 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 101 G9 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 101 G9 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 101 G9 Turbo - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 101 G9 Turbo 250 HD - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 101 Titanium - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 101 XS - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 104 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 105 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 204 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 404 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 404CAM (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 405 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 405HDD (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 45 Neon - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 5 (MTP mode 1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 5 (MTP mode 2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 50 Diamond - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 504 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 50c - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 5H IT (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 5S IT (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 604 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 604WIFI (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 605 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 605F (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 7 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 704 mobile dvr - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 704TV (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 705 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 70b Titanium - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 70it2 (ID 1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 70it2 (ID 2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 80 Titanium - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 80G9 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 8o G9 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 8o G9 Turbo (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 97 Titanium - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos 97 Xenon - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos Arnova 10bG3 Tablet - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos Arnova 8c G3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos Arnova Childpad - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos C40 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos Gmini XS100 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos SPOD (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos TV+ (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Archos XS202 (MTP mode) - true - - - - - camera - camera - proprietary - Argus Bean Sprout - true - - - - - camera - camera - proprietary - Argus DC-1500 - true - - - - - camera - camera - proprietary - Argus DC-1510 - true - - - - - camera - camera - proprietary - Argus DC-1610 - true - - - - - camera - camera - proprietary - Argus DC-1620 - true - - - - - camera - camera - proprietary - Argus DC-1730 - true - - - - - camera - camera - proprietary - Argus DC-2200 - true - - - - - camera - camera - proprietary - Argus DC1512e - true - - - - - camera - camera - proprietary - Argus QuickClix - true - - - - - camera - camera - proprietary - Aries ATC-0017 - true - - - - - camera - camera - proprietary - Aries Digital Keychain Camera, I - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus A450CG (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Asus Fonepad Note 6 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Asus Fonepad Note 6 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Fonepad - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Fonepad 7 (FE375CXG) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Fonepad 7 LTE ME372CL (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Fonepad 7 LTE ME372CL (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus K00E (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus K010 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ME301T MeMo Pad Smart 10 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ME301T MeMo Pad Smart 10 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ME302C MemoPad (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ME302C MemoPad (MTP+?) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ME302KL MeMo Pad FHD10 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ME302KL MeMo Pad FHD10 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Memo K00F (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Memo K00F (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Memo ME172V (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Memo ME173X (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Memo ME173X (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Memo Pad 8 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus MemoPad 7 (ME572CL) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus MemoPad 7 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus MemoPad 8 ME181 CX (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus PadFone (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus PadFone (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus PadFone 2 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus PadFone 2 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus PadFone 2 (PTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus PadFone Infinity (2nd ID) (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus PadFone Infinity (2nd ID) (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus PadFone Infinity (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus PadFone Infinity (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus SL101 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus SL101 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus TF101 Eeepad Transformer (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus TF101 Eeepad Transformer (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus TF201 Transformer Prime (keyboard dock) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus TF201 Transformer Prime (tablet only) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus TF300 Transformer (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus TF300 Transformer (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus TF700 Transformer (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus TF700 Transformer (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus TF701T Transformer Pad (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus TF701T Transformer Pad (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus TX201LA (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus Zenfone 2 ZE550ML (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ZenFone 4 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ZenFone 4 A400CG (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ZenFone 5 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ZenFone 5 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ZenFone 5 A500KL (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ZenFone 6 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Asus ZenFone 6 (MTP+ADB) - true - - - - - camera - camera - proprietary - Barbie Camera (Digital Blue) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Barnes&Noble Nook HD - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Barnes&Noble Nook HD+ - true - - - - - camera - camera - proprietary - Benq DC1300 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - BenQ F5 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - bq Aquarius E5-4G - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - bq Krillin (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - bq Krillin (MTP+ADB) - true - - - - - camera - camera - proprietary - Canon Digital IXUS - true - - - - - camera - camera - ptp - Canon Digital IXUS 100 IS - true - - - - - camera - camera - ptp - Canon Digital IXUS 110 IS - true - - - - - camera - camera - ptp - Canon Digital IXUS 120 IS - true - - - - - camera - camera - ptp - Canon Digital IXUS 130 - true - - - - - camera - camera - ptp - Canon Digital IXUS 255HS - true - - - - - camera - camera - ptp - Canon Digital IXUS 30 (PTP mode) - true - - - - - camera - camera - proprietary - Canon Digital IXUS 300 - true - - - - - camera - camera - ptp - Canon Digital IXUS 300 HS - true - - - - - camera - camera - proprietary - Canon Digital IXUS 330 - true - - - - - camera - camera - ptp - Canon Digital IXUS 40 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 400 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 430 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 50 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 500 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 55 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 60 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 65 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 70 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 700 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 75 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 750 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 80 IS - true - - - - - camera - camera - ptp - Canon Digital IXUS 800 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 85 IS - true - - - - - camera - camera - ptp - Canon Digital IXUS 850 IS (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 860 IS - true - - - - - camera - camera - ptp - Canon Digital IXUS 90 IS - true - - - - - camera - camera - ptp - Canon Digital IXUS 900Ti (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 95 IS - true - - - - - camera - camera - ptp - Canon Digital IXUS 950 IS (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 960 IS (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS 970 IS - true - - - - - camera - camera - ptp - Canon Digital IXUS 980 IS - true - - - - - camera - camera - ptp - Canon Digital IXUS 990 IS - true - - - - - camera - camera - proprietary - Canon Digital IXUS i (normal mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS i (PTP mode) - true - - - - - camera - camera - proprietary - Canon Digital IXUS i5 (normal mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS II (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS IIs (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS iZ (PTP mode) - true - - - - - camera - camera - proprietary - Canon Digital IXUS v - true - - - - - camera - camera - proprietary - Canon Digital IXUS v2 - true - - - - - camera - camera - proprietary - Canon Digital IXUS v3 (normal mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS v3 (PTP mode) - true - - - - - camera - camera - ptp - Canon Digital IXUS Wireless (PTP mode) - true - - - - - camera - camera - proprietary - Canon Digital Rebel XT (normal mode) - true - - - - - camera - camera - proprietary - Canon Digital unknown 3 - true - - - - - camera - camera - proprietary - Canon Elura 50 (normal mode) - true - - - - - camera - camera - ptp - Canon Elura 50 (PTP mode) - true - - - - - camera - camera - ptp - Canon Elura 65 (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS 1000D - true - - - - - camera - camera - ptp - Canon EOS 100D - true - - - - - camera - camera - proprietary - Canon EOS 10D - true - - - - - camera - camera - ptp - Canon EOS 10D (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS 1100D - true - - - - - camera - camera - ptp - Canon EOS 1200D - true - - - - - camera - camera - ptp - Canon EOS 1D Mark II (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS 1D Mark III (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS 1D Mark IV - true - - - - - camera - camera - ptp - Canon EOS 1D X - true - - - - - camera - camera - proprietary - Canon EOS 20D (normal mode) - true - - - - - camera - camera - ptp - Canon EOS 20D (PTP mode) - true - - - - - camera - camera - proprietary - Canon EOS 300D (normal mode) - true - - - - - camera - camera - ptp - Canon EOS 300D (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS 30D (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS 350D - true - - - - - camera - camera - proprietary - Canon EOS 350D (normal mode) - true - - - - - camera - camera - ptp - Canon EOS 350D (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS 400D (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS 40D (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS 450D (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS 500D - true - - - - - camera - camera - ptp - Canon EOS 50D - true - - - - - camera - camera - ptp - Canon EOS 550D - true - - - - - camera - camera - proprietary - Canon EOS 5D (normal mode) - true - - - - - camera - camera - ptp - Canon EOS 5D (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS 5D Mark II - true - - - - - camera - camera - ptp - Canon EOS 5D Mark III - true - - - - - camera - camera - ptp - Canon EOS 600D - true - - - - - camera - camera - ptp - Canon EOS 60D - true - - - - - camera - camera - ptp - Canon EOS 650D - true - - - - - camera - camera - ptp - Canon EOS 6D - true - - - - - camera - camera - ptp - Canon EOS 700D - true - - - - - camera - camera - ptp - Canon EOS 70D - true - - - - - camera - camera - ptp - Canon EOS 7D - true - - - - - camera - camera - ptp - Canon EOS 7D MarkII - true - - - - - camera - camera - proprietary - Canon EOS D30 - true - - - - - camera - camera - proprietary - Canon EOS D60 - true - - - - - camera - camera - proprietary - Canon EOS Digital Rebel (normal mode) - true - - - - - camera - camera - ptp - Canon EOS Digital Rebel (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS Digital Rebel XTi (PTP mode) - true - - - - - camera - camera - proprietary - Canon EOS Kiss Digital (normal mode) - true - - - - - camera - camera - ptp - Canon EOS Kiss Digital (PTP mode) - true - - - - - camera - camera - proprietary - Canon EOS Kiss Digital N (normal mode) - true - - - - - camera - camera - ptp - Canon EOS Kiss Digital X (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS Kiss X2 (PTP mode) - true - - - - - camera - camera - ptp - Canon EOS Kiss X3 - true - - - - - camera - camera - ptp - Canon EOS M - true - - - - - camera - camera - ptp - Canon EOS M3 - true - - - - - camera - camera - ptp - Canon EOS Rebel T1i - true - - - - - camera - camera - ptp - Canon EOS Rebel XSi (PTP mode) - true - - - - - camera - camera - proprietary - Canon FV M1 (normal mode) - true - - - - - camera - camera - ptp - Canon IXUS 125HS - true - - - - - camera - camera - ptp - Canon IXUS 165 - true - - - - - camera - camera - ptp - Canon IXUS 310IS - true - - - - - camera - camera - ptp - Canon IXY 220 IS - true - - - - - camera - camera - ptp - Canon IXY 3000 IS - true - - - - - camera - camera - proprietary - Canon IXY DIGITAL - true - - - - - camera - camera - proprietary - Canon IXY DIGITAL 300 - true - - - - - camera - camera - proprietary - Canon IXY Digital L2 (normal mode) - true - - - - - camera - camera - proprietary - Canon IXY DV M - true - - - - - camera - camera - proprietary - Canon IXY DV M2 (normal mode) - true - - - - - camera - camera - proprietary - Canon MV630i (normal mode) - true - - - - - camera - camera - proprietary - Canon MV650i (normal mode) - true - - - - - camera - camera - ptp - Canon MV750i (PTP mode) - true - - - - - camera - camera - proprietary - Canon MVX 10i (normal mode) - true - - - - - camera - camera - proprietary - Canon MVX 3i (normal mode) - true - - - - - camera - camera - proprietary - Canon MVX100i - true - - - - - camera - camera - proprietary - Canon MVX150i (normal mode) - true - - - - - camera - camera - proprietary - Canon MVX25i (normal mode) - true - - - - - camera - camera - proprietary - Canon MVX2i - true - - - - - camera - camera - ptp - Canon MVX3i (PTP mode) - true - - - - - camera - camera - proprietary - Canon Optura 10 - true - - - - - camera - camera - proprietary - Canon Optura 20 - true - - - - - camera - camera - proprietary - Canon Optura 20 (normal mode) - true - - - - - camera - camera - proprietary - Canon Optura 200 MC - true - - - - - camera - camera - proprietary - Canon Optura 300 (normal mode) - true - - - - - camera - camera - proprietary - Canon Optura 40 (normal mode) - true - - - - - camera - camera - ptp - Canon Optura 600 (PTP mode) - true - - - - - camera - camera - proprietary - Canon Optura Xi (normal mode) - true - - - - - camera - camera - proprietary - Canon PowerShot A10 - true - - - - - camera - camera - proprietary - Canon PowerShot A100 - true - - - - - camera - camera - ptp - Canon PowerShot A1000 IS - true - - - - - camera - camera - ptp - Canon PowerShot A1100 IS - true - - - - - camera - camera - ptp - Canon PowerShot A1300IS - true - - - - - camera - camera - ptp - Canon PowerShot A1400 - true - - - - - camera - camera - proprietary - Canon PowerShot A20 - true - - - - - camera - camera - proprietary - Canon PowerShot A200 - true - - - - - camera - camera - ptp - Canon PowerShot A2000 IS - true - - - - - camera - camera - ptp - Canon PowerShot A2100 IS - true - - - - - camera - camera - ptp - Canon PowerShot A2200 - true - - - - - camera - camera - ptp - Canon PowerShot A2300IS - true - - - - - camera - camera - ptp - Canon PowerShot A2400IS - true - - - - - camera - camera - ptp - Canon PowerShot A2500 - true - - - - - camera - camera - ptp - Canon PowerShot A2600 - true - - - - - camera - camera - proprietary - Canon PowerShot A30 - true - - - - - camera - camera - ptp - Canon PowerShot A300 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A3000 IS - true - - - - - camera - camera - ptp - Canon PowerShot A310 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A3100 IS - true - - - - - camera - camera - ptp - Canon PowerShot A3500IS - true - - - - - camera - camera - proprietary - Canon PowerShot A40 - true - - - - - camera - camera - ptp - Canon PowerShot A400 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A4000IS - true - - - - - camera - camera - ptp - Canon PowerShot A410 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A420 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A430 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A450 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A460 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A470 - true - - - - - camera - camera - ptp - Canon PowerShot A480 - true - - - - - camera - camera - ptp - Canon Powershot A495 - true - - - - - camera - camera - ptp - Canon PowerShot A510 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A520 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A530 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A540 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A550 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A560 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A570 IS (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A580 - true - - - - - camera - camera - ptp - Canon PowerShot A590 IS - true - - - - - camera - camera - ptp - Canon PowerShot A60 (PTP) - true - - - - - camera - camera - ptp - Canon PowerShot A610 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A620 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A630 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A640 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A650IS (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A70 (PTP) - true - - - - - camera - camera - ptp - Canon PowerShot A700 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A710 IS (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A720 IS (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A75 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A80 (PTP) - true - - - - - camera - camera - ptp - Canon PowerShot A800 - true - - - - - camera - camera - ptp - Canon PowerShot A810 - true - - - - - camera - camera - ptp - Canon PowerShot A85 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot A95 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot D10 - true - - - - - camera - camera - ptp - Canon PowerShot Elph135 - true - - - - - camera - camera - ptp - Canon PowerShot Elph340HS - true - - - - - camera - camera - proprietary - Canon PowerShot G1 - true - - - - - camera - camera - ptp - Canon PowerShot G1 X - true - - - - - camera - camera - ptp - Canon PowerShot G10 - true - - - - - camera - camera - ptp - Canon PowerShot G11 - true - - - - - camera - camera - ptp - Canon PowerShot G15 - true - - - - - camera - camera - proprietary - Canon PowerShot G2 - true - - - - - camera - camera - proprietary - Canon PowerShot G3 (normal mode) - true - - - - - camera - camera - ptp - Canon PowerShot G3 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot G5 (PTP mode) - true - - - - - camera - camera - ptp - Canon Powershot G6 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot G7 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot G9 (PTP mode) - true - - - - - camera - camera - proprietary - Canon PowerShot IXY Digital L (normal mode) - true - - - - - camera - camera - proprietary - Canon PowerShot Pro90 IS - true - - - - - camera - camera - ptp - Canon PowerShot S1 IS (PTP mode) - true - - - - - camera - camera - proprietary - Canon PowerShot S10 - true - - - - - camera - camera - ptp - Canon PowerShot S100 - true - - - - - camera - camera - proprietary - Canon PowerShot S100 (2000) - true - - - - - camera - camera - proprietary - Canon PowerShot S110 (2001) - true - - - - - camera - camera - ptp - Canon PowerShot S110 (PTP Mode) - true - - - - - camera - camera - ptp - Canon PowerShot S120 - true - - - - - camera - camera - ptp - Canon PowerShot S2 IS (PTP mode) - true - - - - - camera - camera - proprietary - Canon PowerShot S20 - true - - - - - camera - camera - proprietary - Canon PowerShot S200 - true - - - - - camera - camera - proprietary - Canon PowerShot S230 (normal mode) - true - - - - - camera - camera - ptp - Canon PowerShot S230 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot S3 IS (PTP mode) - true - - - - - camera - camera - proprietary - Canon PowerShot S30 - true - - - - - camera - camera - proprietary - Canon PowerShot S300 - true - - - - - camera - camera - proprietary - Canon PowerShot S330 - true - - - - - camera - camera - proprietary - Canon PowerShot S40 - true - - - - - camera - camera - ptp - Canon PowerShot S400 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot S410 (PTP mode) - true - - - - - camera - camera - proprietary - Canon PowerShot S45 (normal mode) - true - - - - - camera - camera - ptp - Canon PowerShot S45 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot S5 IS (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot S50 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot S500 (PTP mode) - true - - - - - camera - camera - ptp - Canon Powershot S60 (PTP mode) - true - - - - - camera - camera - ptp - Canon Powershot S70 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot S80 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot S95 - true - - - - - camera - camera - proprietary - Canon PowerShot SD10 Digital ELPH (normal mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD100 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD1000 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD110 (PTP mode) - true - - - - - camera - camera - ptp - Canon Powershot SD1100 IS - true - - - - - camera - camera - ptp - Canon Powershot SD1200 IS - true - - - - - camera - camera - ptp - Canon PowerShot SD1300 IS - true - - - - - camera - camera - proprietary - Canon PowerShot SD20 (normal mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD200 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD40 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD430 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD450 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD500 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD600 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD630 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD700 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD750 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD770 IS - true - - - - - camera - camera - ptp - Canon PowerShot SD780 IS - true - - - - - camera - camera - ptp - Canon Powershot SD790 IS - true - - - - - camera - camera - ptp - Canon PowerShot SD850 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD880 IS - true - - - - - camera - camera - ptp - Canon PowerShot SD900 (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SD940 IS - true - - - - - camera - camera - ptp - Canon PowerShot SD970 IS - true - - - - - camera - camera - ptp - Canon PowerShot SD990 - true - - - - - camera - camera - ptp - Canon PowerShot SX10 IS - true - - - - - camera - camera - ptp - Canon Powershot SX100 IS (PTP mode) - true - - - - - camera - camera - ptp - Canon PowerShot SX110 IS - true - - - - - camera - camera - ptp - Canon PowerShot SX120 IS - true - - - - - camera - camera - ptp - Canon PowerShot SX130 IS - true - - - - - camera - camera - ptp - Canon PowerShot SX150 IS - true - - - - - camera - camera - ptp - Canon PowerShot SX160IS - true - - - - - camera - camera - ptp - Canon PowerShot SX170 IS - true - - - - - camera - camera - ptp - Canon PowerShot SX20 IS - true - - - - - camera - camera - ptp - Canon PowerShot SX200 IS - true - - - - - camera - camera - ptp - Canon PowerShot SX210 IS - true - - - - - camera - camera - ptp - Canon PowerShot SX220HS - true - - - - - camera - camera - ptp - Canon PowerShot SX230HS - true - - - - - camera - camera - ptp - Canon PowerShot SX240HS - true - - - - - camera - camera - ptp - Canon PowerShot SX260HS - true - - - - - camera - camera - ptp - Canon PowerShot SX280HS - true - - - - - camera - camera - ptp - Canon PowerShot SX40HS - true - - - - - camera - camera - ptp - Canon PowerShot SX500IS - true - - - - - camera - camera - ptp - Canon PowerShot SX510 HS - true - - - - - camera - camera - ptp - Canon PowerShot SX520 HS - true - - - - - camera - camera - proprietary - Canon PowerShot unknown 1 - true - - - - - camera - camera - proprietary - Canon PowerShot unknown 2 - true - - - - - camera - camera - ptp - Canon Rebel T2i - true - - - - - camera - camera - ptp - Canon Rebel T3 - true - - - - - camera - camera - ptp - Canon Rebel T4i - true - - - - - camera - camera - proprietary - Canon ZR70MC (normal mode) - true - - - - - camera - camera - ptp - Casio EX-S770 - true - - - - - camera - camera - ptp - Casio EX-Z120 - true - - - - - camera - camera - ptp - Casio EX-Z65 - true - - - - - camera - camera - ptp - Casio EX-Z700 - true - - - - - camera - camera - ptp - Casio EX-ZR700 - true - - - - - camera - camera - proprietary - Casio LV 10 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Caterpillar Cat S50 - true - - - - - camera - camera - proprietary - Che-ez Snap - true - - - - - camera - camera - proprietary - Che-Ez Snap SNAP-U - true - - - - - camera - camera - proprietary - Che-ez! Babe - true - - - - - camera - camera - proprietary - Che-ez! Splash - true - - - - - camera - camera - proprietary - Che-ez! SPYZ - true - - - - - camera - camera - proprietary - Clever CAM 360 - true - - - - - camera - camera - proprietary - Cobra DC125 - true - - - - - camera - camera - proprietary - Cobra Digital Camera DC150 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Coby COBY MP705 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Conceptronic CMTD2 - true - - - - - camera - camera - proprietary - Concord Eye-Q Duo - true - - - - - camera - camera - proprietary - Concord Eye-Q Easy - true - - - - - camera - camera - proprietary - Concord EyeQ 4330 - true - - - - - camera - camera - proprietary - Concord EyeQMini_1 - true - - - - - camera - camera - proprietary - Concord EyeQMini_2 - true - - - - - camera - camera - proprietary - CoolCam CP086 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio 10 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio 6 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio 7 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio 9 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio C2 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio D2 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio D2+ DAB FW 4.x (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio D2+ DMB FW 1.x (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio D2+ FW 2.x (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio D2+ FW 3.x (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio J3 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio S9 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio U3 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio U5 (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Cowon iAudio X7 (MTP mode) - true - - - - - camera - camera - proprietary - Creative CardCam - true - - - - - camera - camera - proprietary - Creative Go Mini - true - - - - - camera - camera - proprietary - Creative PC-CAM 300 - true - - - - - camera - camera - proprietary - Creative PC-CAM350 - true - - - - - camera - camera - proprietary - Creative PC-CAM600 - true - - - - - camera - camera - proprietary - Creative PC-CAM750 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative Portable Media Center - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN Micro (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN MicroPhoto - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN MicroPhoto (alternate version) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN Mozaic - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN Sleek (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN Sleek Photo - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN Touch (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN V - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN V 2GB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN V Plus - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN Vision - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN Vision W - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN Vision:M - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN Vision:M (DVP-HD0004) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN X-Fi - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN X-Fi 3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Creative ZEN Xtra (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Curitel Communications, Inc. Verizon Wireless Device - true - - - - - camera - camera - proprietary - D-Link DSC 350+ - true - - - - - camera - camera - proprietary - D-Link DSC 350F - true - - - - - camera - camera - proprietary - D-MAX DM3588 - true - - - - - camera - camera - proprietary - DC-N130t - true - - - - - camera - camera - proprietary - DC-N130ta - true - - - - - camera - camera - proprietary - DC31VC - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Dell Dell Pocket DJ (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Dell DJ (2nd generation) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Dell Inc Dell Streak 7 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Dell Inc Dell Venue 7 inch - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Dell Inc Dell Venue 7 inch (2nd ID) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Dell Inc DJ Itty - true - - - - - camera - camera - proprietary - Digigr8 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - DigiLand DL701Q - true - - - - - camera - camera - proprietary - Digital camera, CD302N - true - - - - - camera - camera - proprietary - DIGITAL MID#0020509 (no-name camera) - true - - - - - camera - camera - proprietary - DigitalDream Enigma1.3 - true - - - - - camera - camera - proprietary - DigitalDream l'elegante - true - - - - - camera - camera - proprietary - DigitalDream l'elite - true - - - - - camera - camera - proprietary - DigitalDream l'espion - true - - - - - camera - camera - proprietary - DigitalDream l'espion XS - true - - - - - camera - camera - proprietary - DigitalDream l'espion xtra - true - - - - - camera - camera - proprietary - DigitalDream l'esprit - true - - - - - camera - camera - proprietary - DigitalDream la ronde - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Disney MixMax - true - - - - - camera - camera - proprietary - Disney pix micro - true - - - - - camera - camera - proprietary - Disney pix micro 2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Dunlop MP3 player 1GB / EGOMAN MD223AFD - true - - - - - camera - camera - proprietary - Elta Medi@ digi-cam - true - - - - - camera - camera - proprietary - Emprex PCD3600 - true - - - - - camera - camera - proprietary - Epson PhotoPC 3000z - true - - - - - camera - camera - proprietary - Epson PhotoPC 850z - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Fly Evo Tech 4 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Fly iq4415 era style 3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Fly iq449 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - FOMA D905i - true - - - - - camera - camera - proprietary - Fuji Axia Eyeplate - true - - - - - camera - camera - proprietary - Fuji Axia Slimshot - true - - - - - camera - camera - ptp - Fuji FinePix A330 - true - - - - - camera - camera - ptp - Fuji FinePix A800 - true - - - - - camera - camera - ptp - Fuji FinePix A820 - true - - - - - camera - camera - ptp - Fuji FinePix A920 - true - - - - - camera - camera - ptp - Fuji FinePix AV-150 - true - - - - - camera - camera - ptp - Fuji FinePix E900 - true - - - - - camera - camera - ptp - Fuji FinePix F100fd - true - - - - - camera - camera - ptp - Fuji FinePix F20 - true - - - - - camera - camera - ptp - Fuji FinePix F200 EXR - true - - - - - camera - camera - ptp - Fuji FinePix F30 - true - - - - - camera - camera - ptp - Fuji FinePix F31fd - true - - - - - camera - camera - ptp - Fuji FinePix F40fd - true - - - - - camera - camera - ptp - Fuji FinePix F50fd - true - - - - - camera - camera - ptp - Fuji FinePix F60fd - true - - - - - camera - camera - ptp - Fuji FinePix F70 EXR - true - - - - - camera - camera - ptp - Fuji FinePix F80EXR - true - - - - - camera - camera - ptp - Fuji FinePix H20EXR - true - - - - - camera - camera - ptp - Fuji FinePix HS30EXR - true - - - - - camera - camera - ptp - Fuji FinePix JX370 - true - - - - - camera - camera - ptp - Fuji FinePix S1000fd - true - - - - - camera - camera - ptp - Fuji FinePix S100fs - true - - - - - camera - camera - ptp - Fuji FinePix S1500 - true - - - - - camera - camera - ptp - Fuji FinePix S1800 - true - - - - - camera - camera - ptp - Fuji FinePix S2000HD - true - - - - - camera - camera - ptp - Fuji FinePix S2500HD - true - - - - - camera - camera - ptp - Fuji FinePix S2950 - true - - - - - camera - camera - ptp - Fuji FinePix S2980 - true - - - - - camera - camera - ptp - Fuji FinePix S4300 - true - - - - - camera - camera - ptp - Fuji FinePix S4850 - true - - - - - camera - camera - ptp - Fuji FinePix S5700 - true - - - - - camera - camera - ptp - Fuji FinePix S5800 - true - - - - - camera - camera - ptp - Fuji FinePix S6500fd - true - - - - - camera - camera - ptp - Fuji FinePix S7000 - true - - - - - camera - camera - ptp - Fuji FinePix S9500 - true - - - - - camera - camera - ptp - Fuji FinePix SL1000 - true - - - - - camera - camera - ptp - Fuji FinePix T200 - true - - - - - camera - camera - ptp - Fuji FinePix X-S1 - true - - - - - camera - camera - ptp - Fuji FinePix X10 - true - - - - - camera - camera - ptp - Fuji FinePix X20 - true - - - - - camera - camera - ptp - Fuji FinePix XF1 - true - - - - - camera - camera - ptp - Fuji FinePix Z100fd - true - - - - - camera - camera - ptp - Fuji FinePix Z35 - true - - - - - camera - camera - ptp - Fuji FinePix Z700EXR - true - - - - - camera - camera - ptp - Fuji Fujifilm A220 - true - - - - - camera - camera - ptp - Fuji Fujifilm X-E2 - true - - - - - camera - camera - proprietary - Fuji IX-1 - true - - - - - camera - camera - ptp - Fuji S5 Pro - true - - - - - camera - camera - proprietary - FujiFilm @xia ix-100 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Fujitsu, Ltd F903iX HIGH-SPEED - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Fujitsu, Ltd STYLISTIC M532 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Garmin Monterra - true - - - - - camera - camera - proprietary - Gear to go - true - - - - - camera - camera - proprietary - Generic SoundVision Clarity2 - true - - - - - camera - camera - proprietary - Genius Smart 300, version 2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Gensis GT-7305 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Gigabyte RCT6773W22 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Gigabyte RCT6773W22 (MTP+ADB) - true - - - - - camera - camera - proprietary - Global Point 3 in 1 Digital Fun Graffiti 00044 - true - - - - - camera - camera - proprietary - Global Point Clipster - true - - - - - camera - camera - proprietary - Global Point Splash Mini (underwater camera) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Ainol Novo) Fire/Flame - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Allwinner) A31 SoC - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Asus) Nexus 7 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Asus) Nexus 7 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Asus) TF101 Transformer - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Asus) TF201 Transformer - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Barnes & Noble) Nook Color - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Lenovo) Ideapad K1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for LG Electronics) P990/Optimus - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for LG Electronics) P990/Optimus (Cyanogen) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for LG Electronics/Samsung) Nexus 4/5/7/10 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for LG Electronics/Samsung) Nexus 4/5/7/10 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Medion) MD99000 (P9514) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Motorola) Xoom (MZ604) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Samsung) Nexus S (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Samsung) Nexus S (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Sony) S1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Inc (for Toshiba) Thrive 7/AT105 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Google Nexus 5 (MTP) - true - - - - - camera - camera - ptp - GoPro HERO3+ - true - - - - - camera - camera - proprietary - GrandTek ScopeCam - true - - - - - camera - camera - proprietary - GTW Electronics - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Haier Ibiza Rhapsody 1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Haier Ibiza Rhapsody 2 - true - - - - - camera - camera - proprietary - Haimei Electronics HE-501A - true - - - - - camera - camera - proprietary - Hawking DC120 Pocketcam - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Hewlett-Packard Slate 10 HD - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Hewlett-Packard Slate 7 2800 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Hewlett-Packard Slate 7 4600 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Hisense E860 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Hisense E860 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HiSense Sero 7 Pro - true - - - - - camera - camera - ptp - HP PhotoSmart 120 (PTP mode) - true - - - - - camera - camera - proprietary - HP PhotoSmart 215 - true - - - - - camera - camera - ptp - HP PhotoSmart 217 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 317 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 318 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 320 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 407 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 417 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 43x (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 507 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 517 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 607 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 612 (PTP mode) - true - - - - - camera - camera - proprietary - HP PhotoSmart 618 - true - - - - - camera - camera - ptp - HP PhotoSmart 620 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 635 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 707 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 715 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 717 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 720 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 733 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 735 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 812 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 817 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 818 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 850 (PTP mode) - true - - - - - camera - camera - proprietary - HP PhotoSmart 912 - true - - - - - camera - camera - ptp - HP PhotoSmart 935 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart 945 (PTP mode) - true - - - - - camera - camera - proprietary - HP PhotoSmart C500 - true - - - - - camera - camera - ptp - HP PhotoSmart C500 (PTP mode) - true - - - - - camera - camera - proprietary - HP PhotoSmart C500 2 - true - - - - - camera - camera - ptp - HP PhotoSmart E327 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart E427 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart M22 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart M23 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart M307 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart M415 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart M425 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart M525 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart M527 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart M547 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart M725 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart M727 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart M737 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart R742 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart R927 (PTP mode) - true - - - - - camera - camera - ptp - HP PhotoSmart R967 (PTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC (for Hewlett-Packard) HP Touchpad (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC (for Hewlett-Packard) HP Touchpad (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC Android Device ID1 (Zopo, HD2, Bird...) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC Android Device ID2 (Zopo, HD2...) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC Desire 310 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC Droid DNA (MTP+UMS) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC Droid DNA (MTP+UMS+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC EVO 4G LTE/One V (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC EVO 4G LTE/One V (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC Butterfly (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC Butterfly X290d - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC Desire 510 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC Desire X - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC Droid Incredible 4G LTE (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC Droid Incredible 4G LTE (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC Evo 4G LTE (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One (HTC6500LVW) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One (ID3) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One (MTP+ADB+?) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One (MTP+ADB+CDC) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One (MTP+CDC) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One (MTP+UMS+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One 802w (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One M8 (HTC6525LVW) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One M8 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One M8 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One M8 (MTP+ADB+UMS) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One M8 (MTP+UMS) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One M8 (Verizon) (HTC6525LVW) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One Remix (HTC6515LVW) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One S (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One S (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One S (ID3) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One X (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One X (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One X (ID3) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC One X (ID4) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC HTC6515LVW/One Remix - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC Motorola Razr D1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC One M8 Google Play Edition (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC One Mini (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC Windows Phone 8s ID1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC Windows Phone 8X ID1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - HTC Windows Phone 8X ID2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Huawei Ascend P8 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Huawei Mediapad (mode 0) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Huawei Mediapad (mode 1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Huawei MTP device (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Huawei MTP device (ID2) - true - - - - - camera - camera - proprietary - iClick 5X - true - - - - - camera - camera - proprietary - iConcepts digital camera - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - InFocus M810 - true - - - - - camera - camera - proprietary - INNOVAGE Mini Digital, CD302N - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Insignia NS-DV45 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Insignia Pilot 4GB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Insignia Sport Player - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Intel Chuwi vi8 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Intel Foxconn iView i700 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Intel Noblex T7A21 - true - - - - - camera - camera - proprietary - Intel Pocket PC Camera - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Intel Telcast Air 3G - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Intel Xolo 900/AZ210A - true - - - - - camera - camera - proprietary - IOMagic MagicImage 400 - true - - - - - camera - camera - proprietary - ION digital camera - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver Clix - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver Clix2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver E100 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver E100 v2/Lplayer - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver E150 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver E30 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver E50 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver H10 20GB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver H10 5.6GB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver H10 5GB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver H300 Series MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver iFP-880 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver N12 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver Portable Media Center 1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver Portable Media Center 2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver Spinn - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver T10 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver T10 2GB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver T10b - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver T20 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver T20 FM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver T20b - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver T30 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver T5 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver T60 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver T7 Volcano - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver Tolino Tab 7 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver U10 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - iRiver X20 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Isabella Her Prototype - true - - - - - camera - camera - proprietary - Ixla DualCam 640 - true - - - - - camera - camera - proprietary - Jazwares Star Wars no. 15256 - true - - - - - camera - camera - proprietary - Jazz JDC9 - true - - - - - camera - camera - proprietary - Jazz JDK235 - true - - - - - camera - camera - proprietary - Jenoptik JD-3300z3 - true - - - - - camera - camera - proprietary - Jenoptik JD-4100z3 - true - - - - - camera - camera - proprietary - Jenoptik JD350 entrance - true - - - - - camera - camera - proprietary - Jenoptik JD350 video - true - - - - - camera - camera - proprietary - Jenoptik JDC 350 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Jolla Sailfish (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Jolla Sailfish (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - JVC Alneo XA-HD500 - true - - - - - camera - camera - proprietary - KBGear JamCam - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Kenwood Media Keg HD10GB7 Sport Player - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Kobo Arc (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Kobo Arc (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Kobo Arc 7 HD - true - - - - - camera - camera - ptp - Kodak C1530 - true - - - - - camera - camera - ptp - Kodak C183 - true - - - - - camera - camera - ptp - Kodak C300 - true - - - - - camera - camera - ptp - Kodak C310 - true - - - - - camera - camera - ptp - Kodak C330 - true - - - - - camera - camera - ptp - Kodak C340 - true - - - - - camera - camera - ptp - Kodak C360 - true - - - - - camera - camera - ptp - Kodak C433 - true - - - - - camera - camera - ptp - Kodak C530 - true - - - - - camera - camera - ptp - Kodak C533 - true - - - - - camera - camera - ptp - Kodak C613 - true - - - - - camera - camera - ptp - Kodak C633 - true - - - - - camera - camera - ptp - Kodak C643 - true - - - - - camera - camera - ptp - Kodak C653 - true - - - - - camera - camera - ptp - Kodak C743 - true - - - - - camera - camera - ptp - Kodak C813 - true - - - - - camera - camera - ptp - Kodak C875 - true - - - - - camera - camera - ptp - Kodak C913 - true - - - - - camera - camera - ptp - Kodak CD33 - true - - - - - camera - camera - ptp - Kodak CX4200 - true - - - - - camera - camera - ptp - Kodak CX4210 - true - - - - - camera - camera - ptp - Kodak CX4230 - true - - - - - camera - camera - ptp - Kodak CX4300 - true - - - - - camera - camera - ptp - Kodak CX4310 - true - - - - - camera - camera - ptp - Kodak CX6200 - true - - - - - camera - camera - ptp - Kodak CX6230 - true - - - - - camera - camera - ptp - Kodak CX6330 - true - - - - - camera - camera - ptp - Kodak CX6445 - true - - - - - camera - camera - ptp - Kodak CX7220 - true - - - - - camera - camera - ptp - Kodak CX7300 - true - - - - - camera - camera - ptp - Kodak CX7310 - true - - - - - camera - camera - ptp - Kodak CX7330 - true - - - - - camera - camera - ptp - Kodak CX7430 - true - - - - - camera - camera - ptp - Kodak CX7525 - true - - - - - camera - camera - ptp - Kodak CX7530 - true - - - - - camera - camera - proprietary - Kodak DC220 - true - - - - - camera - camera - proprietary - Kodak DC240 - true - - - - - camera - camera - ptp - Kodak DC240 (PTP mode) - true - - - - - camera - camera - proprietary - Kodak DC260 - true - - - - - camera - camera - proprietary - Kodak DC265 - true - - - - - camera - camera - proprietary - Kodak DC280 - true - - - - - camera - camera - proprietary - Kodak DC290 - true - - - - - camera - camera - proprietary - Kodak DC3400 - true - - - - - camera - camera - ptp - Kodak DC4800 - true - - - - - camera - camera - proprietary - Kodak DC5000 - true - - - - - camera - camera - ptp - Kodak DX3215 - true - - - - - camera - camera - ptp - Kodak DX3500 - true - - - - - camera - camera - ptp - Kodak DX3600 - true - - - - - camera - camera - ptp - Kodak DX3700 - true - - - - - camera - camera - ptp - Kodak DX3900 - true - - - - - camera - camera - ptp - Kodak DX4330 - true - - - - - camera - camera - ptp - Kodak DX4530 - true - - - - - camera - camera - ptp - Kodak DX4900 - true - - - - - camera - camera - ptp - Kodak DX6340 - true - - - - - camera - camera - ptp - Kodak DX6440 - true - - - - - camera - camera - ptp - Kodak DX6490 - true - - - - - camera - camera - ptp - Kodak DX7440 - true - - - - - camera - camera - ptp - Kodak DX7590 - true - - - - - camera - camera - ptp - Kodak DX7630 - true - - - - - camera - camera - proprietary - Kodak EZ200 - true - - - - - camera - camera - ptp - Kodak LS420 - true - - - - - camera - camera - ptp - Kodak LS443 - true - - - - - camera - camera - ptp - Kodak LS663 - true - - - - - camera - camera - ptp - Kodak LS743 - true - - - - - camera - camera - ptp - Kodak LS753 - true - - - - - camera - camera - ptp - Kodak M1063 - true - - - - - camera - camera - ptp - Kodak M531 - true - - - - - camera - camera - ptp - Kodak M753 - true - - - - - camera - camera - ptp - Kodak M863 - true - - - - - camera - camera - ptp - Kodak M883 - true - - - - - camera - camera - ptp - Kodak M893 IS - true - - - - - camera - camera - ptp - Kodak MC3 - true - - - - - camera - camera - ptp - Kodak P850 - true - - - - - camera - camera - ptp - Kodak P880 - true - - - - - camera - camera - ptp - Kodak V530 - true - - - - - camera - camera - ptp - Kodak V550 - true - - - - - camera - camera - ptp - Kodak V570 - true - - - - - camera - camera - ptp - Kodak V603 - true - - - - - camera - camera - ptp - Kodak V610 - true - - - - - camera - camera - ptp - Kodak V705 - true - - - - - camera - camera - ptp - Kodak V803 - true - - - - - camera - camera - ptp - Kodak Z612 - true - - - - - camera - camera - ptp - Kodak Z650 - true - - - - - camera - camera - ptp - Kodak Z700 - true - - - - - camera - camera - ptp - Kodak Z710 - true - - - - - camera - camera - ptp - Kodak Z712 IS - true - - - - - camera - camera - ptp - Kodak Z730 - true - - - - - camera - camera - ptp - Kodak Z740 - true - - - - - camera - camera - ptp - Kodak Z7590 - true - - - - - camera - camera - ptp - Kodak Z812 IS - true - - - - - camera - camera - ptp - Kodak Z8612 IS - true - - - - - camera - camera - ptp - Kodak Z915 - true - - - - - camera - camera - ptp - Kodak Z950 - true - - - - - camera - camera - ptp - Kodak ZD710 - true - - - - - camera - camera - proprietary - Konica e-mini - true - - - - - camera - camera - ptp - Konica-Minolta DiMAGE A2 (PTP mode) - true - - - - - camera - camera - ptp - Konica-Minolta DiMAGE A200 (PictBridge mode) - true - - - - - camera - camera - ptp - Konica-Minolta DiMAGE X21 (PictBridge mode) - true - - - - - camera - camera - ptp - Konica-Minolta DiMAGE Z2 (PictBridge mode) - true - - - - - camera - camera - ptp - Konica-Minolta DiMAGE Z3 (PictBridge mode) - true - - - - - camera - camera - ptp - Konica-Minolta DiMAGE Z5 (PictBridge mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Kurio 7S - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Kyocera DuraForce - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Kyocera KYL22 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Kyocera Rise - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Kyocera Torque Model E6715 - true - - - - - camera - camera - proprietary - Lego Bionicle - true - - - - - camera - camera - ptp - Leica D-LUX 2 - true - - - - - camera - camera - ptp - Leica M9 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo A3500-F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo A5500-F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo A820 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo IdeaPad A3000 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo IdeaPad A3000 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo IdeaTab A2109A - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo IdeaTab S2210a - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo IdeaTab S5000 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo K1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo K3 Note - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo K900 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo LifeTab E733X - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo Lifetab S9512 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo P70-A - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo P700 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo P780 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo S660 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo S930 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo ThinkPad Tablet - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo Toga Tablet B6000-F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo Vibe Z2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo Yoga Tablet 10 B8000-H - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Lenovo Yoga Tablet 2 Pro - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. Android phone (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. Android phone (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. G3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. G3 (VS985) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. GR-500 Music Player - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. KC910 Renoir Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. KM900 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. LG G Flex 2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. LG VS870 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. LG VS890 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. LG VS980 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. LG2 Optimus - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. LG8575 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. T54 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. UP3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. Various E and P models - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. VK810 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - LG Electronics Inc. VX8550 V CAST Mobile Phone - true - - - - - camera - camera - proprietary - LG T5100 - true - - - - - camera - camera - proprietary - Lifetec LT 5995 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Logik LOG DAX MP3 and DAB Player - true - - - - - camera - camera - proprietary - Logitech Clicksmart 310 - true - - - - - camera - camera - proprietary - Logitech Pocket Digital - true - - - - - camera - camera - proprietary - Maginon SX-410z - true - - - - - camera - camera - proprietary - Maginon SX330z - true - - - - - camera - camera - proprietary - Magpix B350 - true - - - - - camera - camera - proprietary - Maxell Max Pocket - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Maxfield G-Flash NG 1GB - true - - - - - camera - camera - proprietary - Media-Tech mt-406 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - MediaTek Inc MT5xx and MT6xx SoCs - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Medion Lifetab P9514 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Medion Lifetab P9516 - true - - - - - camera - camera - proprietary - Medion MD 5319 - true - - - - - camera - camera - proprietary - Medion MD 6000 - true - - - - - camera - camera - proprietary - Medion MD 6126 - true - - - - - camera - camera - proprietary - Medion MD 9700 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Medion MD8333 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Medion MD8333 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Medion MD99000 (P9514)/Olivetti Olipad 110 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Megafon Login+ - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Megafon MFLogin3T - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Meizu MX Phone (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Meizu MX Phone (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Memorex or iRiver MMP 8585/8586 or iRiver E200 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Micro-Star International P610/Model MS-5557 - true - - - - - camera - camera - proprietary - Micromaxx Digital Camera - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Microsoft Kin 1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Microsoft Windows MTP Simulator - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Microsoft Windows Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Microsoft Zune - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Microsoft Zune HD - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Microsoft/HTC HTC 8S - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Microsoft/Intel Bandon Portable Media Center - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Microsoft/Sharp/nVidia Kin TwoM - true - - - - - camera - camera - proprietary - Mini Shotz ms-350 - true - - - - - camera - camera - proprietary - Minton S-Cam F5 - true - - - - - camera - camera - proprietary - Mitek CD10 - true - - - - - camera - camera - proprietary - Mitek CD30P - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola A1200 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Atrix MB860 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Atrix XT687 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Atrix/Razr HD (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Atrix/Razr HD (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Droid Maxx (XT1080) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Droid Turbo (XT1254) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Droid Turbo Verizon - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Droid Ultra - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Droid X/MB525 (Defy) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola DROID2 (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola DROID2 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola DROID4 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola DROID4 (PTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola IdeaPad K1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Milestone / Verizon Droid - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Milestone X2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Moto G (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Moto G (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Moto G (XT1032) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Moto X (XT1053) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Moto X (XT1058) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Moto X (XT1080) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola MTP Test Command Interface - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Razr D1/D3/i (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Razr D1/D3/i (MTP+?) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola RAZR M XT907 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola RAZR M XT907 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola RAZR2 V8/U9/Z6 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola V3m/V750 verizon - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Xoom (Factory test) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Xoom (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Xoom (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Xoom 2 Media Edition - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Xoom 2 Media Edition (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola Xoom 2 Media Edition (ID3) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola XT890/907/Razr (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola XT890/907/Razr (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Motorola XT912/XT928 - true - - - - - camera - camera - proprietary - Mustek gSmart 300 - true - - - - - camera - camera - proprietary - Mustek gSmart 350 - true - - - - - camera - camera - proprietary - Mustek gSmart mini - true - - - - - camera - camera - proprietary - Mustek gSmart mini 2 - true - - - - - camera - camera - proprietary - Mustek gSmart mini 3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - MyMusix PD-6070 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - NEC Casio C811 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - NEC Casio CA-201L - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - NEC FOMA N01A - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nextar MA715A-8R - true - - - - - camera - camera - proprietary - Nexxtech Mini Digital Camera - true - - - - - camera - camera - ptp - Nikon Coolpix 2000 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 2100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 2200 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 2200v1.1 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 2500 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 3100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 3200 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 3500 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 3700 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 4100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 4200 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 4300 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 4500 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 4600 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 4600a (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 4800 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 5000 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 5200 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 5400 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 5600 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 5700 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 5900 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 7600 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 7900 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 8700 (PTP mode) - true - - - - - camera - camera - proprietary - Nikon CoolPix 880 - true - - - - - camera - camera - ptp - Nikon Coolpix 8800 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 885 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix 9400 (PTP mode) - true - - - - - camera - camera - proprietary - Nikon CoolPix 990 - true - - - - - camera - camera - ptp - Nikon Coolpix A (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix AW100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L1 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L10 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L11 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L110 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L12 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L120 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L16 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L19 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L20 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L23 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L27 - true - - - - - camera - camera - ptp - Nikon Coolpix L4 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix L820 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P1 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P2 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P300 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P330 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P4 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P50 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P500 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P5000 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P510 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P5100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P520 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P60 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P6000 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P7000 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P7100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P7700 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P7800 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P80 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P80 v1.1 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix P90 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S01 - true - - - - - camera - camera - ptp - Nikon Coolpix S02 - true - - - - - camera - camera - ptp - Nikon Coolpix S2 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S200 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S220 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S225 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S2500 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S2600 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S2700 - true - - - - - camera - camera - ptp - Nikon Coolpix S3000 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S3100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S3200 - true - - - - - camera - camera - ptp - Nikon Coolpix S3300 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S4 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S4300 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S500 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S5100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S6 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S60 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S6000 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S620 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S7c (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S8000 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S8200 - true - - - - - camera - camera - ptp - Nikon Coolpix S9100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S9500 (PTP mode) - true - - - - - camera - camera - ptp - Nikon Coolpix S9700 - true - - - - - camera - camera - ptp - Nikon Coolpix SQ (PTP mode) - true - - - - - camera - camera - ptp - Nikon D2H SLR (PTP mode) - true - - - - - camera - camera - ptp - Nikon D2Hs (PTP mode) - true - - - - - camera - camera - ptp - Nikon D2X SLR (PTP mode) - true - - - - - camera - camera - ptp - Nikon D3 (PTP mode) - true - - - - - camera - camera - ptp - Nikon D50 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D200 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D2Xs (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D300 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D3000 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D300s (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D3100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D3200 - true - - - - - camera - camera - ptp - Nikon DSC D3300 - true - - - - - camera - camera - ptp - Nikon DSC D3s (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D3x (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D4 - true - - - - - camera - camera - ptp - Nikon DSC D40 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D40x (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D4s - true - - - - - camera - camera - ptp - Nikon DSC D5000 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D5100 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D5200 - true - - - - - camera - camera - ptp - Nikon DSC D5300 - true - - - - - camera - camera - ptp - Nikon DSC D60 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D600 - true - - - - - camera - camera - ptp - Nikon DSC D610 - true - - - - - camera - camera - ptp - Nikon DSC D70 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D700 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D7000 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D70s (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D7100 - true - - - - - camera - camera - ptp - Nikon DSC D750 - true - - - - - camera - camera - ptp - Nikon DSC D80 (PTP mode) - true - - - - - camera - camera - ptp - Nikon DSC D800 - true - - - - - camera - camera - ptp - Nikon DSC D800E - true - - - - - camera - camera - ptp - Nikon DSC D810 - true - - - - - camera - camera - ptp - Nikon DSC D90 (PTP mode) - true - - - - - camera - camera - ptp - Nikon J1 - true - - - - - camera - camera - ptp - Nikon J2 - true - - - - - camera - camera - ptp - Nikon J3 - true - - - - - camera - camera - ptp - Nikon J4 - true - - - - - camera - camera - ptp - Nikon S1 - true - - - - - camera - camera - ptp - Nikon V1 - true - - - - - camera - camera - ptp - Nikon V2 - true - - - - - camera - camera - proprietary - nisis Quickpix Qp3 - true - - - - - camera - camera - proprietary - NogaNet TDC-15 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 2710 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 3109c Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 3110c Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 3250 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 3710 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5130 XpressMusic - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5200 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5230 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5300 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5310 XpressMusic - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5320 XpressMusic - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5500 Sport Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5530 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5700 XpressMusic Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5800 XpressMusic - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5800 XpressMusic v2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 5800 XpressMusic v3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 6120c Classic Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 6210 Navigator - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 6220 Classic - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 6500c Classic Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 6600i - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia 808 PureView - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia C5-00 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia C7 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia C7 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia E52 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia E6 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia E63 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia E66 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia E7 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia E7 (Ovi mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia E71 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia E71x - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia E72 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia Lumia (RM-975) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia Lumia 301 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia Lumia WP8 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N300 - true - - - - - camera - camera - ptp - Nokia N73 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N73 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N75 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N78 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N79 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N8 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N8 (Ovi mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N80 Internet Edition (Media Player) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N81 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N82 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N85 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N9 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N91 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N93 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N93i Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N95 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N95 Mobile Phone 8GB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N950 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N96 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N97 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N97 mini - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia N97-1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia X6 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Nokia XL - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - NormSoft, Inc. Pocket Tunes - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - NormSoft, Inc. Pocket Tunes 4 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - nVidia CM9-Adam - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - nVidia Shield (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - nVidia Shield (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - nVidia Tegra Note - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - nVidia Various tablets (ID1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - nVidia Various tablets (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - O2 Sistemas ZoltarTV - true - - - - - camera - camera - proprietary - Olympus C-2100UZ - true - - - - - camera - camera - proprietary - Olympus C-3000Z - true - - - - - camera - camera - proprietary - Olympus C-3030Z - true - - - - - camera - camera - ptp - Olympus C-310Z - true - - - - - camera - camera - ptp - Olympus C-350Z - true - - - - - camera - camera - ptp - Olympus C-5500Z - true - - - - - camera - camera - ptp - Olympus C-55Z - true - - - - - camera - camera - ptp - Olympus D-540Z - true - - - - - camera - camera - ptp - Olympus D-560Z - true - - - - - camera - camera - ptp - Olympus E series (Control) - true - - - - - camera - camera - ptp - Olympus E-M5 - true - - - - - camera - camera - ptp - Olympus E-PL5 - true - - - - - camera - camera - ptp - Olympus FE4000 - true - - - - - camera - camera - ptp - Olympus IR-300 - true - - - - - camera - camera - ptp - Olympus mju 500 - true - - - - - camera - camera - ptp - Olympus SP-720UZ - true - - - - - camera - camera - ptp - Olympus X-100 - true - - - - - camera - camera - ptp - Olympus X-250 - true - - - - - camera - camera - ptp - Olympus X920 - true - - - - - camera - camera - ptp - Olympus X925 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Oppo Find 7 (ID 1) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Oppo Find 7 (ID 2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Oppo X9006 - true - - - - - camera - camera - proprietary - Oregon Scientific DShot II - true - - - - - camera - camera - proprietary - Oregon Scientific DShot III - true - - - - - camera - camera - ptp - Panasonic DMC-FS62 - true - - - - - camera - camera - ptp - Panasonic DMC-FZ20 - true - - - - - camera - camera - ptp - Panasonic DMC-FZ38 - true - - - - - camera - camera - ptp - Panasonic DMC-FZ45 - true - - - - - camera - camera - ptp - Panasonic DMC-FZ50 - true - - - - - camera - camera - ptp - Panasonic DMC-GF1 - true - - - - - camera - camera - ptp - Panasonic DMC-LS2 - true - - - - - camera - camera - ptp - Panasonic DMC-LS3 - true - - - - - camera - camera - ptp - Panasonic DMC-LX7 - true - - - - - camera - camera - ptp - Panasonic DMC-TZ15 - true - - - - - camera - camera - ptp - Panasonic DMC-TZ18 - true - - - - - camera - camera - ptp - Panasonic DMC-TZ8 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Panasonic P905i - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Panasonic P906i - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Pantech Crux - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Pegatron Chagall - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Pegatron Chagall (ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Pegatron Hudl 2 - true - - - - - camera - camera - proprietary - Pencam TEVION MD 9456 - true - - - - - camera - camera - ptp - Pentax K3 (PTP Mode) - true - - - - - camera - camera - ptp - Pentax Optio 43WR - true - - - - - camera - camera - ptp - Pentax Optio W90 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Perception Digital, Ltd Gigaware GX400 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear Aria - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear Ariaz - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear Ariaz/97 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear Audio - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear Muse - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear SA1VBE08KX/78 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear SA3345 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear SA5145 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear SA6014/SA6015/SA6024/SA6025/SA6044/SA6045 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear SA6125/SA6145/SA6185 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear SA9200 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear ViBE SA1VBE04 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear ViBE SA1VBE04/08 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear VIBE SA2VBE[08|16]K/02 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips GoGear Vibe/02 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips HDD085/00 or HDD082/17 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips HDD14XX,HDD1620 or HDD1630/17 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips HDD6320 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips HDD6320/00 or HDD6330/17 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips i908 - true - - - - - camera - camera - proprietary - Philips P44417B keychain camera - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips PI3900B2/58 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips PSA235 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips PSA610 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips SA1115/55 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips SA5285 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Philips Shoqbox - true - - - - - camera - camera - proprietary - Phoebe Smartcam - true - - - - - camera - camera - ptp - Pioneer DVR-LX60D - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Pioneer XMP3 - true - - - - - camera - camera - proprietary - Pixart Gemini Keychain Camera - true - - - - - camera - camera - proprietary - Pixie Princess Jelly-Soft - true - - - - - camera - camera - proprietary - PockCam - true - - - - - camera - camera - proprietary - Polaroid DC700 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Polaroid Freescape/MPU-433158 - true - - - - - camera - camera - proprietary - Polaroid PDC 2300Z - true - - - - - camera - camera - proprietary - Praktica Slimpix - true - - - - - camera - camera - proprietary - Precision Mini Digital Camera - true - - - - - camera - camera - proprietary - Precision Mini, Model HA513A - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Prestigio 5504 DUO - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Prestigio 5505 DUO - true - - - - - camera - camera - proprietary - Pretec dc530 - true - - - - - camera - camera - proprietary - PureDigital Ritz Disposable - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Qualcomm (for Gigabyte) GSmart G1342 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Qualcomm (for Highscreen) Omega Prime S - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Qualcomm (for Nokia) 5530 Xpressmusic - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Qualcomm (for Nokia/Verizon) 6205 Balboa/Verizon Music Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Qualcomm (for OnePlus) One (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Qualcomm (for OnePlus) One (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Qualcomm (for PhiComm) C230w (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Qualcomm (for Smartfren) Andromax U - true - - - - - camera - camera - proprietary - QuickPix QP1 - true - - - - - camera - camera - proprietary - Radioshack Flatfoto - true - - - - - camera - camera - proprietary - RCA CDS1005 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Redmi 1S (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Redmi HM 1S (MTP) - true - - - - - camera - camera - proprietary - Request Ultra Slim - true - - - - - camera - camera - proprietary - Ricoh Capilo RX - true - - - - - camera - camera - proprietary - Ricoh Caplio 300G - true - - - - - camera - camera - proprietary - Ricoh Caplio G3 - true - - - - - camera - camera - proprietary - Ricoh Caplio G4 - true - - - - - camera - camera - proprietary - Ricoh Caplio GX - true - - - - - camera - camera - ptp - Ricoh Caplio GX (PTP mode) - true - - - - - camera - camera - proprietary - Ricoh Caplio GX 8 - true - - - - - camera - camera - ptp - Ricoh Caplio GX 8 (PTP mode) - true - - - - - camera - camera - proprietary - Ricoh Caplio R1 - true - - - - - camera - camera - proprietary - Ricoh Caplio R1v - true - - - - - camera - camera - ptp - Ricoh Caplio R1v (PTP mode) - true - - - - - camera - camera - proprietary - Ricoh Caplio R2 - true - - - - - camera - camera - proprietary - Ricoh Caplio R3 - true - - - - - camera - camera - ptp - Ricoh Caplio R3 (PTP mode) - true - - - - - camera - camera - proprietary - Ricoh Caplio R4 - true - - - - - camera - camera - proprietary - Ricoh Caplio R5 - true - - - - - camera - camera - ptp - Ricoh Caplio R5 (PTP mode) - true - - - - - camera - camera - proprietary - Ricoh Caplio RR30 - true - - - - - camera - camera - ptp - Ricoh Caplio RR750 (PTP mode) - true - - - - - camera - camera - proprietary - Ricoh Caplio RZ1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - RIM BlackBerry Storm/9650 - true - - - - - camera - camera - proprietary - Rollei dr5 - true - - - - - camera - camera - ptp - Rollei dr5 (PTP mode) - true - - - - - camera - camera - proprietary - Sakar 23070 Crayola Digital Cam - true - - - - - camera - camera - proprietary - Sakar 28290 and 28292 Digital C - true - - - - - camera - camera - proprietary - Sakar 92045 Spiderman - true - - - - - camera - camera - proprietary - Sakar clipshot no. 1169x - true - - - - - camera - camera - proprietary - Sakar Digital Keychain 11199 - true - - - - - camera - camera - proprietary - Sakar Digital no, 6637x - true - - - - - camera - camera - proprietary - Sakar Digital no, 67480 - true - - - - - camera - camera - proprietary - Sakar Digital no. 56379 Spyshot - true - - - - - camera - camera - proprietary - Sakar Digital no. 77379 - true - - - - - camera - camera - proprietary - Sakar Dora the Explorer no. 88067 - true - - - - - camera - camera - proprietary - Sakar Hello Kitty no. 94009 - true - - - - - camera - camera - proprietary - Sakar Kidz Cam 86379 - true - - - - - camera - camera - proprietary - Sakar Kidz-Cam no. 88379 - true - - - - - camera - camera - proprietary - Sakar Micro Digital 2428x - true - - - - - camera - camera - proprietary - Sakar Nickelodeon iCarly no. 88061 - true - - - - - camera - camera - proprietary - Sakar no. 1638x CyberPix - true - - - - - camera - camera - proprietary - Sakar no. 75379 - true - - - - - camera - camera - proprietary - Sakar no. 81890 - true - - - - - camera - camera - proprietary - Sakar no. 91379 - true - - - - - camera - camera - proprietary - Sakar no. 98379 - true - - - - - camera - camera - proprietary - Sakar Star Wars kit no. 92022 - true - - - - - camera - camera - proprietary - Sakar Sticker Wizard no. 59379 - true - - - - - camera - camera - ptp - Samsung EK-GC100 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung F250 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung Galaxy models (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung Galaxy models (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung Galaxy models Kies mode - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung GT-B2700 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung GT-B2710/Xcover 271 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung GT-S5230 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung GT-S8500 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung I550W Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung Jet S8000 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung Juke (SCH-U470) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung M7600 Beat/GT-S8300T/SGH-F490/S8300 - true - - - - - camera - camera - ptp - Samsung NX1 - true - - - - - camera - camera - ptp - Samsung NX1000 - true - - - - - camera - camera - ptp - Samsung S5620 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung SAMSUNG Trance - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung U600 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung Vibrant SGH-T959/Captivate/Media player mode - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung X830 Mobile Phone - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YH-820 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YH-920 (501d) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YH-920 (5022) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YH-925(-GS) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YH-925GS - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YH-999 Portable Media Center/SGH-A707/SGH-L760V/SGH-U900/Verizon Intensity/Fascinate - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YH-J70J - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-900 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-F2J - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-K3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-K5 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-M1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-P2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-P3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-Q1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-Q2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-Q3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-R0 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-R1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-R2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-S3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-S5 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-T10 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-T7J - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-T9 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-U2J (YP-U2JXB/XAA) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-U3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-U4 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-U5 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-Z3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Samsung YP-Z5 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa c150 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa c240/c250 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa c250 v2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa Clip - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa Clip v2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa Clip Zip - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa Clip+ - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa Connect - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa e200/e250/e260/e270/e280 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa e260/e280 v2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa Express - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa Fuze - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa Fuze v2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa Fuze+ - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa m200-tcc (MTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa m230/m240 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa m240/m250 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SanDisk Sansa View - true - - - - - camera - camera - ptp - Sanyo VPC-C5 (PTP mode) - true - - - - - camera - camera - proprietary - ScanHex SX-35a - true - - - - - camera - camera - proprietary - ScanHex SX-35b - true - - - - - camera - camera - proprietary - ScanHex SX-35c - true - - - - - camera - camera - proprietary - ScanHex SX-35d - true - - - - - camera - camera - proprietary - Scott APX 30 - true - - - - - camera - camera - ptp - Sea & Sea 2G (PTP mode) - true - - - - - camera - camera - proprietary - Sea & Sea 5000G - true - - - - - camera - camera - ptp - Sea & Sea 5000G (PTP mode) - true - - - - - camera - camera - proprietary - Shark 2-in-1 Mini - true - - - - - camera - camera - proprietary - Shark SDC-513 - true - - - - - camera - camera - proprietary - Shark SDC-519 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SHARP Corporation SBM203SH - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SHARP Corporation SH-06E - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SHARP Corporation SH930W - true - - - - - camera - camera - proprietary - Shift3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SigmaTel Inc. MTPMSCN Audio Player - true - - - - - camera - camera - proprietary - SiPix Blink 2 - true - - - - - camera - camera - proprietary - SiPix CAMeleon - true - - - - - camera - camera - proprietary - SiPix SC2100 - true - - - - - camera - camera - proprietary - SiPix Snap - true - - - - - camera - camera - proprietary - SiPix Stylecam - true - - - - - camera - camera - proprietary - SiPix Web2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sirius Stiletto - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sirius Stiletto 2 - true - - - - - camera - camera - proprietary - Skanhex SX-330z - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Slacker Inc. Slacker Portable Media Player - true - - - - - camera - camera - proprietary - SMaL Ultra-Pocket - true - - - - - camera - camera - proprietary - So. Show 301 - true - - - - - camera - camera - ptp - Sony Alpha-A3000 - true - - - - - camera - camera - ptp - Sony Alpha-A5000 (Control) - true - - - - - camera - camera - ptp - Sony Alpha-A5100 (Control) - true - - - - - camera - camera - ptp - Sony Alpha-A5100 (MTP) - true - - - - - camera - camera - ptp - Sony Alpha-A6000 (Control) - true - - - - - camera - camera - ptp - Sony Alpha-A6000 (MTP) - true - - - - - camera - camera - ptp - Sony Alpha-A77 M2 (Control) - true - - - - - camera - camera - ptp - Sony Alpha-A7r (Control) - true - - - - - camera - camera - ptp - Sony Alpha-A7S (Control) - true - - - - - camera - camera - ptp - Sony Alpha-A7S (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony DCR-SR75 - true - - - - - camera - camera - ptp - Sony DSC-A100 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-A900 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-F707V (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-F717 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-F828 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-H1 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-H2 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-H5 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-HX100V (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-HX200V (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-HX300 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-HX5V (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-HX60V (MTP) - true - - - - - camera - camera - ptp - Sony DSC-N2 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P10 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P100 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P120 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P200 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P30 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P31 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P32 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P41 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P43 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P5 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P50 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P51 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P52 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P71 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P72 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P73 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P92 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-P93 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-R1 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-RX1 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-RX100 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-RX100M2 - true - - - - - camera - camera - ptp - Sony DSC-S40 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-S60 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-S730 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-S75 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-S780 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-S85 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-T1 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-T10 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-T3 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-U10 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-U20 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-V1 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-W1 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-W12 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-W130 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-W200 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-W35 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-W510 (PTP mode) - true - - - - - camera - camera - ptp - Sony DSC-W55 (PTP mode) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY IS12S Xperia Acro HD MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY IS12S Xperia Acro HD MTP+UMS - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY IS12S Xperia Acro MTP+UMS+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT22i Xperia P MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT22i Xperia P MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT22i Xperia P MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT25i Xperia V MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT25i Xperia V MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT25i Xperia V MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT26i Xperia S MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT26i Xperia S MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT26i Xperia S MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT26w Xperia Acro HD IS12S MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT26w Xperia Acro HD IS12S MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT26w Xperia Acro HD SO-03D MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT26w Xperia Acro HD SO-03D MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT28at Xperia Ion MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT28at Xperia Ion MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT28at Xperia Ion MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT28at Xperia Ion MTP+UMS - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT28at Xperia Ion MTP+UMS+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT29i Xperia GX MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT29i Xperia GX MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT29i Xperia GX MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT30p Xperia T MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT30p Xperia T MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY LT30p Xperia T MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY MT27i Xperia Sola MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY MT27i Xperia Sola MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY MT27i Xperia Sola MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY MT27i Xperia Sola MTP+UMS - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY MT27i Xperia Sola MTP+UMS+ADB - true - - - - - camera - camera - ptp - Sony MVC-CD300 (PTP mode) - true - - - - - camera - camera - ptp - Sony MVC-CD500 (PTP mode) - true - - - - - camera - camera - ptp - Sony NEX-3N (PTP mode) - true - - - - - camera - camera - ptp - Sony NEX-6 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-A726/NWZ-A728/NWZ-A768 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-A815/NWZ-A818 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-A826/NWZ-A828/NWZ-A829 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-A845 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-B135 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-B142F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-B153F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-B163F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-B173F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-E344/E345 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-E354 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-E436F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-E445 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-E464 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-S516 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-S545 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-S615F/NWZ-S616F/NWZ-S618F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-S638F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-S716F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-S739F - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-S754 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-S765 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-W202 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-W252B - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-X1050B/NWZ-X1060B - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony NWZ-X1051/NWZ-X1061 - true - - - - - camera - camera - ptp - Sony PTP - true - - - - - camera - camera - ptp - Sony SLT-A35 (PTP mode) - true - - - - - camera - camera - ptp - Sony SLT-A350 (PTP mode) - true - - - - - camera - camera - ptp - Sony SLT-A55 (PTP mode) - true - - - - - camera - camera - ptp - Sony SLT-A57 - true - - - - - camera - camera - ptp - Sony SLT-A58 - true - - - - - camera - camera - ptp - Sony SLT-A58 (Control) - true - - - - - camera - camera - ptp - Sony SLT-A65V (PTP mode) - true - - - - - camera - camera - ptp - Sony SLT-A99v - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY SO-03D Xperia Acro HD MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY SO-03D Xperia Acro HD MTP+UMS - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY SO-03D Xperia Acro MTP+UMS+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY SO-05D Xperia SX MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY SO-05D Xperia SX MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY SO-05D Xperia SX MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony Sony Tablet P1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony Sony Tablet S - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Sony Sony Tablet S1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST15i Xperia U MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST21i Xperia Tipo MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST21i Xperia Tipo MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST21i Xperia Tipo MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST23i Xperia Miro MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST23i Xperia Miro MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST23i Xperia Miro MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST25i Xperia U MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST25i Xperia U MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST27i/ST27a Xperia go MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST27i/ST27a Xperia go MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST27i/ST27a Xperia go MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST27i/ST27a Xperia go MTP+UMS - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY ST27i/ST27a Xperia go MTP+UMS+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY WT19i Live Walkman MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia A MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia A MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia C MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia C MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia C MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia E MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia E MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia E MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia E3 MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia E3 MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia E3 MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY XPeria E4g MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY XPeria E4g MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY XPeria E4g MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia J MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia J MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia J MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia L MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia L MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia L MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia M MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia M MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia M MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia M2 Dual MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia M2 Dual MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia M2 Dual MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia M2 MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia M2 MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia M2 MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia SP MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia SP MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia SP MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Tablet Z MTP 1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Tablet Z MTP 2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Tablet Z MTP+ADB 1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Tablet Z MTP+ADB 2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Tablet Z MTP+CDROM 1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Tablet Z MTP+CDROM 2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z Ultra MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z Ultra MTP (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z Ultra MTP (ID3) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z Ultra MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z Ultra MTP+ADB (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z Ultra MTP+ADB (ID3) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z Ultra MTP+CDROM (ID3) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z1 Compact D5503 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z1 Compact D5503 MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z1 Compact MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z1 MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z1 MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z1 MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z2 MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z2 MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z2 MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z3 Compact MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z3 Compact MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z3 Compact MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z3 MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z3 MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia Z3 MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia ZL MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia ZL MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia ZL MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia ZR MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SONY Xperia ZR MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson c1605 Xperia Dual E MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson c1605 Xperia Dual E MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson C702 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson C902 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson C905 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson IS12S Xperia Acro MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson IS12S Xperia Acro MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson IS12S Xperia Acro MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson j108i (Cedar) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson j10i (Elm) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson j10i2 (Elm) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson K550i - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson K850i - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson LT15i Xperia Arc MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson LT15i Xperia arc S MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson MK16i Xperia MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson MK16i Xperia MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson MT11i Xperia Neo MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson MT11i Xperia Neo MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson R800/R88i Xperia Play MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson R800/R88i Xperia Play MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson SK17i Xperia Mini Pro MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson SK17i Xperia Mini Pro MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson ST15i Xperia Mini MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson ST15i Xperia Mini MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson ST17i Xperia Active MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson ST17i Xperia Active MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson ST17i Xperia Active MTP+CDROM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson ST18a Xperia Ray MTP - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson ST18i Xperia Ray MTP+ADB - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson T700 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson U5 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson U8i - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson W302 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson W595 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson W705/W715 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson W760i - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson W890i - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson W902 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson W910 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson W980 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson W995 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - SonyEricsson WT19i Live Walkman MTP+ADB - true - - - - - camera - camera - proprietary - Soundstar TDC-35 - true - - - - - camera - camera - proprietary - SpyPen Axys - true - - - - - camera - camera - proprietary - SpyPen Cleo - true - - - - - camera - camera - proprietary - SpyPen Luxo - true - - - - - camera - camera - proprietary - SpyPen Memo - true - - - - - camera - camera - proprietary - SpyPen Xion - true - - - - - camera - camera - proprietary - SQ chip camera - true - - - - - camera - camera - proprietary - StarCam CP086 - true - - - - - camera - camera - proprietary - STM USB Dual-mode camera - true - - - - - camera - camera - proprietary - Stop & Shop 87096 - true - - - - - camera - camera - proprietary - STV0680 - true - - - - - camera - camera - proprietary - Suprema Digital Keychain Camera - true - - - - - camera - camera - proprietary - SY-2107C - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - TCL Alcatel one touch 986+ - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Technika MP-709 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Tevion MD 81488 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Thomson / RCA Lyra HC308A - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Thomson / RCA Opal / Lyra MC4002 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Thomson EM28 Series - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Thomson Lyra MC5104B (M51 Series) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Thomson RCA H106 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Thomson scenium E308 - true - - - - - camera - camera - proprietary - Tiger Fast Flicks - true - - - - - camera - camera - proprietary - Timlex CP075 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - TomTom Rider 40 - true - - - - - camera - camera - proprietary - Topfield TF5000PVR - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Excite AT300 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Gigabeat - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Gigabeat MEGF-40 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Gigabeat MET401 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Gigabeat MEU201 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Gigabeat MEU202 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Gigabeat P10 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Gigabeat P20 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Gigabeat S - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Gigabeat T - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Gigabeat U - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Gigabeat V30 - true - - - - - camera - camera - proprietary - Toshiba PDR-M11 - true - - - - - camera - camera - proprietary - Toshiba PDR-M60 - true - - - - - camera - camera - proprietary - Toshiba PDR-M61 - true - - - - - camera - camera - proprietary - Toshiba PDR-M65 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Toshiba Thrive AT100/AT105 - true - - - - - camera - camera - proprietary - Traveler SX330z - true - - - - - camera - camera - proprietary - Traveler SX410z - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - TrekStor i.Beat Organix 2.0 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - TrekStor i.Beat Sweez FM - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - TrekStor Vibez 8/12GB - true - - - - - camera - camera - proprietary - Trust Familycam 300 - true - - - - - camera - camera - proprietary - Trust PowerC@m 350FS - true - - - - - camera - camera - proprietary - Trust PowerC@m 350FT - true - - - - - camera - camera - proprietary - Trust Spyc@m 100 - true - - - - - camera - camera - proprietary - Trust Spyc@m 500F FLASH - true - - - - - camera - camera - proprietary - Typhoon StyloCam - true - - - - - camera - camera - proprietary - UMAX AstraPen - true - - - - - camera - camera - proprietary - UMAX AstraPix 320s - true - - - - - - camera - camera - ptp - USB PTP Class Camera - true - - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Various Viewpia DR/bq Kepler - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Various Viewpia DR/bq Kepler Debugging - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Verizon Ellipsis 7 - true - - - - - camera - camera - proprietary - ViviCam3350 - true - - - - - camera - camera - proprietary - ViviCam5B - true - - - - - camera - camera - proprietary - Vivitar Freelance - true - - - - - camera - camera - proprietary - Vivitar Mini Digital Camera - true - - - - - camera - camera - proprietary - Vivitar Vivicam 55 - true - - - - - camera - camera - proprietary - Vivitar Vivicam3350B - true - - - - - camera - camera - proprietary - Vivitar Vivicam35 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Vizio (for Lenovo) LIFETAB S9714 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Vizio Unknown 1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Vizio VTAB1008 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Wacom Cintiq Companion Hybrid (MTP+ADB) - true - - - - - camera - camera - proprietary - Wild Planet Digital Spy Camera 70137 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Wyplay Wyplayer - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Xiaomi HM NOTE 1LTEW MIUI (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Xiaomi Hongmi (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Xiaomi Hongmi (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Xiaomi Mi-2 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Xiaomi Mi-2 (MTP+ADB) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Xiaomi Mi-2s (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Xiaomi Mi-3 (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Xiaomi Mi-3w (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Xiaomi MiPad (MTP) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - YiFang BQ Tesla - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Yota Phone 2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - Yota Phone 2 (ID2) - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - YU Yureka Vodafone smart turbo 4 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - ZiiLABS Zii EGG - true - - - - - camera - camera - proprietary - ZINA Mini Digital Keychain Camer - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - ZTE Grand X In - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - ZTE V5 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - ZTE V55 ID 1 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - ZTE V55 ID 2 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - ZTE V790/Blade 3 - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - ZTE V880E - true - - - - - portable_audio_player - portable_audio_player - user - mtp - audio/mpeg - ZTE V985 - true - - - - - diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb index 91c5ed211..623037bc3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb @@ -10,8 +10,6 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2" # They are release specific, so please regen when adding new releases SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \ - file://10-camera-libgphoto2-device.fdi \ - file://10-camera-libgphoto2.fdi \ file://40-libgphoto2.rules \ file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ " @@ -35,9 +33,6 @@ do_configure_append() { } do_install_append() { - install -d ${D}${datadir}/hal/fdi/information/20thirdparty - install -m 0644 ${WORKDIR}/*.fdi ${D}${datadir}/hal/fdi/information/20thirdparty/ - install -d ${D}${sysconfdir}/udev/rules.d/ install -m 0755 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ } @@ -48,7 +43,7 @@ RRECOMMENDS_${PN} = "libgphoto2-camlibs" FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" -FILES_${PN} += "${nonarch_base_libdir}/udev/* ${datadir}/hal" +FILES_${PN} += "${nonarch_base_libdir}/udev/*" FILES_${PN}-dbg += "${libdir}/*/*/.debug" FILES_${PN}-dev += "${libdir}/*/*/*.la" FILES_${PN}-doc += "${datadir}/libgphoto2_port/0.12.0/vcamera/README.txt" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi deleted file mode 100644 index 906043947..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi +++ /dev/null @@ -1,11 +0,0 @@ - - - - - tslib - - - tslib - - - diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch deleted file mode 100644 index 07754731d..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch +++ /dev/null @@ -1,20 +0,0 @@ -xorg-server-1.7.3/hw/xfree86/common/xf86Helper.c contains this code -causing a double free crash on chvt or exit: - - /* This should *really* be handled in drv->UnInit(dev) call instead, but - * if the driver forgets about it make sure we free it or at least crash - * with flying colors */ - if (pInp->private) - xfree(pInp->private); -Index: xf86-input-tslib-0.0.6/src/tslib.c -=================================================================== ---- xf86-input-tslib-0.0.6.orig/src/tslib.c -+++ xf86-input-tslib-0.0.6/src/tslib.c -@@ -435,6 +435,7 @@ xf86TslibUninit(InputDriverPtr drv, Inpu - xf86TslibControlProc(pInfo->dev, DEVICE_OFF); - ts_close(priv->ts); - xfree(pInfo->private); -+ pInfo->private = NULL; - xf86DeleteInput(pInfo, 0); - } - diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch deleted file mode 100644 index d16b4a53c..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fixes crash when a touchscreen event is received with xserver 1.12 and later: -X: symbol lookup error: /usr/lib/xorg/modules/input/tslib_drv.so: undefined symbol: xf86XInputSetScreen - -Upstream-Status: Pending - -Taken from Gentoo: -https://bugs.gentoo.org/show_bug.cgi?id=446432 - -diff -ur xf86-input-tslib-0.0.6.orig/src/tslib.c xf86-input-tslib-0.0.6/src/tslib.c ---- xf86-input-tslib-0.0.6.orig/src/tslib.c 2012-12-05 01:12:16.286597071 +0100 -+++ xf86-input-tslib-0.0.6/src/tslib.c 2012-12-05 01:11:02.686598595 +0100 -@@ -75,6 +75,19 @@ - #define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options)) - #endif - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 13 -+static void -+xf86XInputSetScreen(InputInfoPtr pInfo, -+ int screen_number, -+ int x, -+ int y) -+{ -+ if (miPointerGetScreen(pInfo->dev) != -+ screenInfo.screens[screen_number]) { -+ miPointerSetScreen(pInfo->dev, screen_number, x, y); -+ } -+} -+#endif - - enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 }; - diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch deleted file mode 100644 index 6a6d5b92c..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch +++ /dev/null @@ -1,196 +0,0 @@ -Upstream-Status: Pending - -Taken from debian: -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627075 - -Index: xf86-input-tslib-trunk/src/tslib.c -=================================================================== ---- xf86-input-tslib-trunk/src/tslib.c (revision 48) -+++ xf86-input-tslib-trunk/src/tslib.c (working copy) -@@ -69,6 +69,13 @@ - #define DEFAULT_HEIGHT 240 - #define DEFAULT_WIDTH 320 - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 -+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL) -+#else -+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options)) -+#endif -+ -+ - enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 }; - - enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 }; -@@ -106,7 +113,7 @@ - } - - static Bool --ConvertProc( LocalDevicePtr local, -+ConvertProc( InputInfoPtr local, - int first, - int num, - int v0, -@@ -135,7 +142,7 @@ - return t; - } - --static void ReadInput (LocalDevicePtr local) -+static void ReadInput (InputInfoPtr local) - { - struct ts_priv *priv = (struct ts_priv *) (local->private); - struct ts_sample samp; -@@ -382,7 +389,11 @@ - axiswidth - 1, /* max val */ - axiswidth, /* resolution */ - 0, /* min_res */ -- axiswidth); /* max_res */ -+ axiswidth /* max_res */ -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 -+ ,Absolute -+#endif -+ ); - - InitValuatorAxisStruct(device, 1, - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -@@ -392,7 +403,11 @@ - axisheight - 1, /* max val */ - axisheight, /* resolution */ - 0, /* min_res */ -- axisheight); /* max_res */ -+ axisheight /* max_res */ -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 -+ ,Absolute -+#endif -+ ); - - if (InitProximityClassDeviceStruct (device) == FALSE) { - ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n"); -@@ -434,7 +449,7 @@ - ErrorF("%s\n", __FUNCTION__); - xf86TslibControlProc(pInfo->dev, DEVICE_OFF); - ts_close(priv->ts); -- xfree(pInfo->private); -+ free(pInfo->private); - pInfo->private = NULL; - xf86DeleteInput(pInfo, 0); - } -@@ -444,47 +459,57 @@ - * - * called when the module subsection is found in XF86Config - */ -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 -+static int -+xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) -+#else - static InputInfoPtr - xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags) -+#endif - { - struct ts_priv *priv; - char *s; -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - InputInfoPtr pInfo; -+#endif - -- priv = xcalloc (1, sizeof (struct ts_priv)); -+ priv = calloc (1, sizeof (struct ts_priv)); - if (!priv) -- return NULL; -+ return BadValue; - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - if (!(pInfo = xf86AllocateInput(drv, 0))) { -- xfree(priv); -- return NULL; -+ free(priv); -+ return BadValue; - } - - /* Initialise the InputInfoRec. */ - pInfo->name = dev->identifier; -- pInfo->type_name = XI_TOUCHSCREEN; - pInfo->flags = - XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE | - XI86_SEND_DRAG_EVENTS; -- pInfo->device_control = xf86TslibControlProc; -- pInfo->read_input = ReadInput; - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - pInfo->motion_history_proc = xf86GetMotionEvents; - pInfo->history_size = 0; - #endif -- pInfo->control_proc = NULL; -+ pInfo->conf_idev = dev; - pInfo->close_proc = NULL; -- pInfo->switch_mode = NULL; - pInfo->conversion_proc = ConvertProc; - pInfo->reverse_conversion_proc = NULL; -- pInfo->dev = NULL; - pInfo->private_flags = 0; - pInfo->always_core_feedback = 0; -- pInfo->conf_idev = dev; -+#endif -+ -+ pInfo->type_name = XI_TOUCHSCREEN; -+ pInfo->control_proc = NULL; -+ pInfo->read_input = ReadInput; -+ pInfo->device_control = xf86TslibControlProc; -+ pInfo->switch_mode = NULL; - pInfo->private = priv; -+ pInfo->dev = NULL; - - /* Collect the options, and process the common options. */ -- xf86CollectInputOptions(pInfo, NULL, NULL); -+ COLLECT_INPUT_OPTIONS(pInfo, NULL); - xf86ProcessCommonOptions(pInfo, pInfo->options); - - priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 ); -@@ -510,23 +535,31 @@ - priv->rotate = TSLIB_ROTATE_NONE; - } - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - s = xf86CheckStrOption(dev->commonOptions, "path", NULL); -+#else -+ s = xf86CheckStrOption(pInfo->options, "path", NULL); -+#endif - if (!s) -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - s = xf86CheckStrOption(dev->commonOptions, "Device", NULL); -+#else -+ s = xf86CheckStrOption(pInfo->options, "Device", NULL); -+#endif - - priv->ts = ts_open(s, 1); -- xfree(s); -+ free(s); - - if (!priv->ts) { - ErrorF("ts_open failed (device=%s)\n",s); - xf86DeleteInput(pInfo, 0); -- return NULL; -+ return BadValue; - } - - if (ts_config(priv->ts)) { - ErrorF("ts_config failed\n"); - xf86DeleteInput(pInfo, 0); -- return NULL; -+ return BadValue; - } - - pInfo->fd = ts_fd(priv->ts); -@@ -536,11 +569,13 @@ - priv->state = BUTTON_EMULATION_OFF; - } - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - /* Mark the device configured */ - pInfo->flags |= XI86_CONFIGURED; -+#endif - - /* Return the configured device */ -- return (pInfo); -+ return Success; - } - - _X_EXPORT InputDriverRec TSLIB = { diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch deleted file mode 100644 index a1f6ba8f9..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From Grazvydas Ignotas - -At least xserver 1.7.4 crashes on XGetPointerControl request because of xf86-input-tslib: - -Program received signal SIGSEGV, Segmentation fault. -#0 0x000355e0 in ProcGetPointerControl (client=0x4a2e58) at devices.c:2122 -#1 0x00062fa8 in Dispatch () at dispatch.c:439 -#2 0x00022444 in main (argc=4, argv=0xbeebedc4, envp=0xbeebedd8) at main.c:285 - -This happens because ptrfeed field is not set in device structure from tslib. -To fix this, call InitPtrFeedbackClassDeviceStruct() during DEVICE_INIT to get necessary setup done (as done in other input drivers). - ---- -diff -ur xf86-input-tslib-0.0.6/src/tslib.c xf86-input-tslib-0.0.6_/src/tslib.c ---- xf86-input-tslib-0.0.6/src/tslib.c 2010-02-09 12:23:22.000000000 +0200 -+++ xf86-input-tslib-0.0.6_/src/tslib.c 2010-02-09 12:37:33.000000000 +0200 -@@ -103,8 +103,6 @@ - static void - PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl) - { -- ErrorF("%s\n", __FUNCTION__); -- return; - } - - static Bool -@@ -406,6 +404,8 @@ - xf86MotionHistoryAllocate(pInfo); - #endif - -+ if (!InitPtrFeedbackClassDeviceStruct(device, PointerControlProc)) -+ return !Success; - break; - - case DEVICE_ON: diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb deleted file mode 100644 index 6a3689a2e..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb +++ /dev/null @@ -1,35 +0,0 @@ -require recipes-graphics/xorg-driver/xorg-driver-input.inc -SUMMARY = "X.Org X server -- tslib input driver" -DEPENDS += "tslib" -RRECOMMENDS_${PN} += "tslib-calibrate" -RSUGGESTS_${PN} += "hal" - -# derived from xf86-input-void, that's why I kept MIT-X, but it's not clear, see COPYING -LIC_FILES_CHKSUM = "file://src/tslib.c;endline=28;md5=bd62eaef222dcf5cd59e490a12bd795e \ - file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94" - -PR = "${INC_PR}.1" - -SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \ - file://double-free-crash.patch \ - file://10-x11-input-tslib.fdi \ - file://xserver-174-XGetPointerControl.patch \ - file://99-xf86-input-tslib.rules \ - file://xf86-input-tslib-port-ABI-12-r48.patch \ - file://xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch \ -" - -SRC_URI[md5sum] = "b7a4d2f11637ee3fcf432e044b1d017f" -SRC_URI[sha256sum] = "5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105" - -do_configure_prepend() { - rm -rf ${S}/m4/ || true -} -do_install_append() { - install -d ${D}/${datadir}/hal/fdi/policy/20thirdparty - install -m 0644 ${WORKDIR}/10-x11-input-tslib.fdi ${D}/${datadir}/hal/fdi/policy/20thirdparty - install -d ${D}${nonarch_base_libdir}/udev/rules.d - install -m 0644 ${WORKDIR}/99-xf86-input-tslib.rules ${D}${nonarch_base_libdir}/udev/rules.d/ -} - -FILES_${PN} += "${datadir}/hal ${nonarch_base_libdir}/udev" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.7.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.7.bb new file mode 100644 index 000000000..1f63047c7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.7.bb @@ -0,0 +1,20 @@ +require recipes-graphics/xorg-driver/xorg-driver-input.inc +SUMMARY = "X.Org X server -- tslib input driver" +DEPENDS += "tslib" +RRECOMMENDS_${PN} += "tslib-calibrate" + +LIC_FILES_CHKSUM = "file://COPYING;md5=f1524518264f7776a9707c19c8affbbf" + +SRC_URI = "https://github.com/merge/xf86-input-tslib/releases/download/${PV}/xf86-input-tslib-${PV}.tar.xz \ + file://99-xf86-input-tslib.rules \ +" + +SRC_URI[md5sum] = "c5ffb03bccccfa1c4ba11079fef0036e" +SRC_URI[sha256sum] = "1439a9efa50eb481e6a0ab5319ab0765d457732e7da64e3c15f3c0cd13b44297" + +do_install_append() { + install -d ${D}${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-xf86-input-tslib.rules ${D}${nonarch_base_libdir}/udev/rules.d/ +} + +FILES_${PN} += "${nonarch_base_libdir}/udev" diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb new file mode 100644 index 000000000..845041cc4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb @@ -0,0 +1,64 @@ +require ${BPN}.inc + +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:" + +inherit meson native + +DEPENDS += " \ + meson-native \ + glib-2.0-native \ + lcms-native \ +" + +SRC_URI += " \ + file://0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch \ + file://Makefile;subdir=${BPN}-${PV} \ +" + +do_configure() { + # we expect meson to fail - but before it extracts project's version in log file + meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON} > /dev/null 2>&1 || true + + # extract and split version + version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'` + major=`echo $version | cut -d. -f1` + minor=`echo $version | cut -d. -f2` + micro=`echo $version | cut -d. -f3` + echo "Project version: $major.$minor.$micro" + + # extract project name + proj_name=`grep 'Project name:' ${B}/meson-logs/meson-log.txt | sed 's|Project name: ||'` + + # create cd-version.h + mkdir -p ${B}/colord + sed ${S}/lib/colord/cd-version.h.in \ + -e 's:@CD_MAJOR_VERSION_PRIVATE@:1:g' \ + -e 's:@CD_MINOR_VERSION_PRIVATE@:4:g' \ + -e 's:@CD_MICRO_VERSION_PRIVATE@:4:g' \ + > ${B}/colord/cd-version.h + + # create config.h based on target build and add what's necessary only + localedir=`echo ${datadir}/locale | sed 's:${prefix}/::g'` + echo "#define LOCALEDIR \"$localedir\"" >> ${B}/config.h + echo "#define GETTEXT_PACKAGE \"colord\"" >> ${B}/config.h + echo "#define PACKAGE_NAME \"$proj_name\"" >> ${B}/config.h + echo "#define PACKAGE_VERSION \"$version\"" >> ${B}/config.h +} + +do_compile() { + oe_runmake -C${S} DESTDIR=${B} +} + +do_install() { + version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'` + major=`echo $version | cut -d. -f1` + + install -d ${D}${libdir} + install -m 755 ${B}/libcolord.so ${D}${libdir}/libcolord.so.$version + ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so" + ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so.$major" + + install -d ${D}${bindir} + install -m 755 ${B}/cd_create_profile ${D}${bindir}/ + install -m 755 ${B}/cd_idt8 ${D}${bindir}/ +} diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-openembedded/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch new file mode 100644 index 000000000..278b90e07 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch @@ -0,0 +1,166 @@ +From cbb8f5c05fce1d56ae2e5fa9f57fc49c47bed5ab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 12 May 2019 21:58:02 +0200 +Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev + dependeny +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We do not have udev-native so it is a dependeny we cannot satisfy + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller +--- + lib/colord/cd-edid.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ + lib/colord/cd-icc.c | 62 ------------------------------------------- + 2 files changed, 63 insertions(+), 62 deletions(-) + +diff --git a/lib/colord/cd-edid.c b/lib/colord/cd-edid.c +index a5e2328..dec509a 100644 +--- a/lib/colord/cd-edid.c ++++ b/lib/colord/cd-edid.c +@@ -687,3 +687,66 @@ cd_edid_new (void) + edid = g_object_new (CD_TYPE_EDID, NULL); + return CD_EDID (edid); + } ++ ++/** ++ * cd_icc_create_from_edid_data: ++ * @icc: A valid #CdIcc ++ * @edid: EDID data ++ * @error: A #GError, or %NULL ++ * ++ * Creates an ICC profile from EDID data. ++ * ++ * Return value: %TRUE for success ++ * ++ * Since: 1.1.2 ++ **/ ++gboolean ++cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error) ++{ ++ CdIccPrivate *priv = GET_PRIVATE (icc); ++ const gchar *data; ++ ++ /* not loaded */ ++ if (priv->lcms_profile != NULL) { ++ g_set_error_literal (error, ++ CD_ICC_ERROR, ++ CD_ICC_ERROR_FAILED_TO_CREATE, ++ "already loaded or generated"); ++ return FALSE; ++ } ++ ++ /* create from parsed object */ ++ if (!cd_icc_create_from_edid (icc, ++ cd_edid_get_gamma (edid), ++ cd_edid_get_red (edid), ++ cd_edid_get_green (edid), ++ cd_edid_get_blue (edid), ++ cd_edid_get_white (edid), ++ error)) { ++ return FALSE; ++ } ++ ++ /* set copyright */ ++ cd_icc_set_copyright (icc, NULL, ++ /* deliberately not translated */ ++ "This profile is free of known copyright restrictions."); ++ ++ /* set 'ICC meta Tag for Monitor Profiles' data */ ++ data = cd_edid_get_checksum (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data); ++ data = cd_edid_get_monitor_name (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data); ++ data = cd_edid_get_serial_number (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data); ++ data = cd_edid_get_pnp_id (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data); ++ data = cd_edid_get_vendor_name (edid); ++ if (data != NULL) ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data); ++ return TRUE; ++} ++ +diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c +index f231814..2c8fe77 100644 +--- a/lib/colord/cd-icc.c ++++ b/lib/colord/cd-icc.c +@@ -3094,68 +3094,6 @@ out: + return ret; + } + +-/** +- * cd_icc_create_from_edid_data: +- * @icc: A valid #CdIcc +- * @edid: EDID data +- * @error: A #GError, or %NULL +- * +- * Creates an ICC profile from EDID data. +- * +- * Return value: %TRUE for success +- * +- * Since: 1.1.2 +- **/ +-gboolean +-cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error) +-{ +- CdIccPrivate *priv = GET_PRIVATE (icc); +- const gchar *data; +- +- /* not loaded */ +- if (priv->lcms_profile != NULL) { +- g_set_error_literal (error, +- CD_ICC_ERROR, +- CD_ICC_ERROR_FAILED_TO_CREATE, +- "already loaded or generated"); +- return FALSE; +- } +- +- /* create from parsed object */ +- if (!cd_icc_create_from_edid (icc, +- cd_edid_get_gamma (edid), +- cd_edid_get_red (edid), +- cd_edid_get_green (edid), +- cd_edid_get_blue (edid), +- cd_edid_get_white (edid), +- error)) { +- return FALSE; +- } +- +- /* set copyright */ +- cd_icc_set_copyright (icc, NULL, +- /* deliberately not translated */ +- "This profile is free of known copyright restrictions."); +- +- /* set 'ICC meta Tag for Monitor Profiles' data */ +- data = cd_edid_get_checksum (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data); +- data = cd_edid_get_monitor_name (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data); +- data = cd_edid_get_serial_number (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data); +- data = cd_edid_get_pnp_id (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data); +- data = cd_edid_get_vendor_name (edid); +- if (data != NULL) +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data); +- return TRUE; +-} +- + /** + * cd_icc_create_from_edid: + * @icc: A valid #CdIcc +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord-native/Makefile b/meta-openembedded/meta-oe/recipes-support/colord/colord-native/Makefile new file mode 100644 index 000000000..1e29e4f67 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord-native/Makefile @@ -0,0 +1,48 @@ +# For native build cd_idt8, cd_create_profile and a tiny version of libcolord.so +# only. By reducing the library to what's necessary, we avoid dependencies on +# naitve udev and libgudev + +CFLAGS+=$(shell pkg-config-native --cflags gio-2.0) +CFLAGS+=$(shell pkg-config-native --cflags lcms2) +CFLAGS+=-std=c99 -I./lib -I./lib/colord -I$(DESTDIR) -DCD_COMPILATION + +LDFLAGS+=$(shell pkg-config-native --libs gio-2.0) +LDFLAGS+=$(shell pkg-config-native --libs lcms2) +LDFLAGS+=-lm + +all: cd_idt8 cd_create_profile + +LIBSOURCES = \ + lib/colord/cd-it8.c \ + lib/colord/cd-color.c \ + lib/colord/cd-spectrum.c \ + lib/colord/cd-math.c \ + lib/colord/cd-interp-akima.c \ + lib/colord/cd-context-lcms.c \ + lib/colord/cd-interp.c \ + lib/colord/cd-interp-linear.c \ + lib/colord/cd-it8-utils.c \ + lib/colord/cd-enum.c \ + lib/colord/cd-icc.c \ + lib/colord/cd-icc-utils.c \ + lib/colord/cd-dom.c + +libcolord.so: $(LIBSOURCES) + $(CC) $(CFLAGS) -L$(DESTDIR) -fPIC -shared -Wl,-soname,$@ $^ -o $(DESTDIR)/$@ $(LDFLAGS) + +cd_idt8.o: client/cd-it8.c + $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@ + +cd_idt8: libcolord.so cd_idt8.o + $(CC) $(DESTDIR)/cd_idt8.o -o $(DESTDIR)/$@ -L$(DESTDIR) -lcolord $(LDFLAGS) + +cd_create_profile.o: client/cd-create-profile.c + $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@ + +cd_create_profile: libcolord.so cd_create_profile.o + $(CC) $(DESTDIR)/cd_create_profile.o -o $(DESTDIR)/$@ -L$(DESTDIR) -lcolord $(LDFLAGS) + +.PHONY: clean + +clean: + rm -f $(DESTDIR)/libcolord.so $(DESTDIR)/*.o $(DESTDIR)/cd_idt8 $(DESTDIR)/cd_create_profile diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb new file mode 100644 index 000000000..aa5d1d129 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb @@ -0,0 +1,45 @@ +require ${BPN}.inc + +inherit meson gobject-introspection gsettings gettext bash-completion systemd distro_features_check useradd + +# polkit and gobject-introspection are mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +DEPENDS += " \ + ${BPN}-native \ + glib-2.0 \ + lcms \ + sqlite3 \ + libgusb \ + libgudev \ + polkit \ +" + +SRC_URI += " \ + file://0001-Run-native-cd_idt8-cd_create_profile.patch \ +" + +EXTRA_OEMESON = " \ + -Dman=false \ + -Ddocs=false \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" + +SYSTEMD_SERVICE_${PN} = "colord.service" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${datadir}/glib-2.0 \ + ${datadir}/color \ + ${systemd_user_unitdir} \ + ${libdir}/tmpfiles.d \ + ${libdir}/colord-plugins \ + ${libdir}/colord-sensors \ +" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord" diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord.inc b/meta-openembedded/meta-oe/recipes-support/colord/colord.inc new file mode 100644 index 000000000..7497fed51 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord.inc @@ -0,0 +1,13 @@ +SUMMARY = "Making color management just work" +HOMEPAGE = "https://www.freedesktop.org/software/colord/" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \ +" + +PV = "1.4.4" +SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8" +SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5" + diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch b/meta-openembedded/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch new file mode 100644 index 000000000..4b52aa337 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch @@ -0,0 +1,59 @@ +From 5aad8831c0fb71940d6c4f982b0b30ffb6ae33b3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 12 May 2019 22:47:05 +0200 +Subject: [PATCH] Run native cd_idt8/cd_create_profile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller +--- + data/cmf/meson.build | 2 +- + data/illuminant/meson.build | 2 +- + data/profiles/meson.build | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/cmf/meson.build b/data/cmf/meson.build +index a693cd7..1ae3613 100644 +--- a/data/cmf/meson.build ++++ b/data/cmf/meson.build +@@ -2,7 +2,7 @@ foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ] + custom_target(arg, + input: arg + '.csv', + output: arg + '.cmf', +- command: [ cd_idt8, 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ], ++ command: [ 'cd_idt8', 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ], + install: true, + install_dir: join_paths(datadir, 'colord', 'cmf') + ) +diff --git a/data/illuminant/meson.build b/data/illuminant/meson.build +index f8dfa07..ad7dced 100644 +--- a/data/illuminant/meson.build ++++ b/data/illuminant/meson.build +@@ -24,7 +24,7 @@ foreach arg: generated_spectra + custom_target(arg, + input: arg + '.csv', + output: arg + '.sp', +- command: [ cd_idt8, 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ], ++ command: [ 'cd_idt8', 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ], + install: true, + install_dir: join_paths(datadir, 'colord', 'illuminant') + ) +diff --git a/data/profiles/meson.build b/data/profiles/meson.build +index 591b97d..2cef011 100644 +--- a/data/profiles/meson.build ++++ b/data/profiles/meson.build +@@ -59,7 +59,7 @@ foreach arg: icc_profiles + generated_icc = custom_target(arg + '.icc', + input: xml_i18n, + output: arg + '.icc', +- command: [ cd_create_profile, '--output=@OUTPUT@', '@INPUT@' ], ++ command: [ 'cd_create_profile', '--output=@OUTPUT@', '@INPUT@' ], + install: true, + install_dir: join_paths(datadir, 'color', 'icc', 'colord'), + ) +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index e6e0eaef8..b53ba4647 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" S = "${WORKDIR}/git" -inherit cmake python3native systemd distutils3-base +inherit cmake python3native systemd DEPENDS = " \ flex-native bison-native libaio \ @@ -25,10 +25,13 @@ EXTRA_OECMAKE = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ " -PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND" +PACKAGECONFIG ??= "usb_backend network_backend" -PACKAGECONFIG[USB_BACKEND] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2" -PACKAGECONFIG[NETWORK_BACKEND] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2" +PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'distutils3-base', '', d)} PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch deleted file mode 100644 index 61a7ac0a6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f Mon Sep 17 00:00:00 2001 -From: Christian Grothoff -Date: Fri, 2 Aug 2019 15:43:44 +0200 -Subject: trying to fix #5806 - -Upstream-Status: Backport from 0.9.67 [https://git.gnunet.org/libmicrohttpd.git/commit/?id=b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f] - ---- - src/microhttpd/daemon.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c -index bf01ba9b..a8fc98c6 100644 ---- a/src/microhttpd/daemon.c -+++ b/src/microhttpd/daemon.c -@@ -2536,7 +2536,12 @@ internal_add_connection (struct MHD_Daemon *daemon, - else - { - #ifdef HTTPS_SUPPORT -- gnutls_init_flags_t flags; -+#if (GNUTLS_VERSION_NUMBER+0 >= 0x030500) -+ gnutls_init_flags_t -+#else -+ unsigned int -+#endif -+ flags; - - flags = GNUTLS_SERVER; - #if (GNUTLS_VERSION_NUMBER+0 >= 0x030402) --- -cgit v1.2.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb deleted file mode 100644 index 6b5417004..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb +++ /dev/null @@ -1,31 +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 \ - file://fix-build-with-older-gnutls.patch \ -" -SRC_URI[md5sum] = "ce4050e75cc40d68506e2b403e1a76f9" -SRC_URI[sha256sum] = "4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b" - -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.67.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.bb new file mode 100644 index 000000000..c400462e0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.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] = "e28e04e3d3eca62f5754efb844d17812" +SRC_URI[sha256sum] = "7e1f852723d099d4827d7ebde4d02dd00fd8da62149526fdb9fae058c5a60495" + +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/opencv/opencv_4.1.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.1.0.bb index 77b5dd60c..5e89db097 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -64,6 +64,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ -DCMAKE_SKIP_RPATH=ON \ -DOPENCV_ICV_HASH=${IPP_MD5} \ -DIPPROOT=${WORKDIR}/ippicv_lnx \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb deleted file mode 100644 index bce89bec8..000000000 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.3.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -DESCRIPTION = "Runtime libraries for parsing and creating MIME mail" -SECTION = "libs" -DEPENDS = "glib-2.0 zlib" - -inherit gnomebase autotools gobject-introspection - -SRC_URI += "file://iconv-detect.h \ - file://nodolt.patch" - -SRC_URI[archive.md5sum] = "69ae21a0b1df966a7d39a9431856ac81" -SRC_URI[archive.sha256sum] = "6a0875eeb552ab447dd54853a68ced62217d863631048737dd97eaa2713e7311" - -EXTRA_OECONF_remove = "--disable-schemas-install" - -export ac_cv_have_iconv_detect_h="yes" -do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}" - -# we do not need GNOME 1 gnome-config support -do_install_append () { - rm -f ${D}${libdir}/gmimeConf.sh -} diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.4.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.4.bb new file mode 100644 index 000000000..dcdaed5a2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/gmime_3.2.4.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DESCRIPTION = "Runtime libraries for parsing and creating MIME mail" +SECTION = "libs" +DEPENDS = "glib-2.0 zlib" + +inherit gnomebase autotools gobject-introspection + +SRC_URI += "file://iconv-detect.h \ + file://nodolt.patch" + +SRC_URI[archive.md5sum] = "b6b4e9fdc8f3336551d23872c83b539a" +SRC_URI[archive.sha256sum] = "249ea7c0e080b067aa9669162c36b181b402f6cf6cebc4999d838c6f1e81d024" + +EXTRA_OECONF_remove = "--disable-schemas-install" + +export ac_cv_have_iconv_detect_h="yes" +do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}" + +# we do not need GNOME 1 gnome-config support +do_install_append () { + rm -f ${D}${libdir}/gmimeConf.sh +} diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Support-of-arch-riscv64-by-Manuel-A.-Fernandez-Monte.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Support-of-arch-riscv64-by-Manuel-A.-Fernandez-Monte.patch deleted file mode 100644 index 72d89d09b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Support-of-arch-riscv64-by-Manuel-A.-Fernandez-Monte.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ed04c97abe015a226269de391e36c4d251292725 Mon Sep 17 00:00:00 2001 -From: Francis ANDRE -Date: Sun, 6 May 2018 12:28:25 +0200 -Subject: [PATCH] Support of arch riscv64 by Manuel A. Fernandez Montecelo - - ---- - Foundation/include/Poco/Platform.h | 6 +++++- - Foundation/src/utils.h | 1 + - 2 files changed, 6 insertions(+), 1 deletion(-) - ---- a/Foundation/include/Poco/Platform.h -+++ b/Foundation/include/Poco/Platform.h -@@ -134,6 +134,7 @@ - #define POCO_ARCH_NIOS2 0x0e - #define POCO_ARCH_AARCH64 0x0f - #define POCO_ARCH_ARM64 0x0f // same as POCO_ARCH_AARCH64 -+#define POCO_ARCH_RISCV64 0x10 - - - #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) -@@ -224,6 +225,9 @@ - #elif defined(__AARCH64EB__) - #define POCO_ARCH POCO_ARCH_AARCH64 - #define POCO_ARCH_BIG_ENDIAN 1 -+#elif defined(__riscv) && (__riscv_xlen == 64) -+ #define POCO_ARCH POCO_ARCH_RISCV64 -+ #define POCO_ARCH_LITTLE_ENDIAN 1 - #endif - - ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -63,6 +63,7 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || \ -+ defined(__riscv) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch new file mode 100644 index 000000000..c0de32daf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch @@ -0,0 +1,28 @@ +From 589a5442a841b156a1890bc2d26e7a5103e2f672 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 1 Nov 2019 17:53:50 -0700 +Subject: [PATCH] riscv: Enable double operations when using double float abi + +Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/2825] +Signed-off-by: Khem Raj +--- + Foundation/src/utils.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h +index 69cea1aca..ff7a5c9ce 100644 +--- a/Foundation/src/utils.h ++++ b/Foundation/src/utils.h +@@ -63,7 +63,8 @@ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ + defined(__AARCH64EL__) || \ +- defined(nios2) || defined(__nios2) || defined(__nios2__) ++ defined(nios2) || defined(__nios2) || defined(__nios2__) || \ ++ (defined(__riscv) && defined(__riscv_float_abi_double)) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.0.bb deleted file mode 100644 index 70b251034..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.0.bb +++ /dev/null @@ -1,100 +0,0 @@ -SUMMARY = "Modern, powerful open source cross-platform C++ class libraries" -DESCRIPTION = "Modern, powerful open source C++ class libraries and frameworks for building network- and internet-based applications that run on desktop, server, mobile and embedded systems." -HOMEPAGE = "http://pocoproject.org/" -SECTION = "libs" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" - -# These dependencies are required by Foundation -DEPENDS = "libpcre zlib" - -SRC_URI = " \ - git://github.com/pocoproject/poco.git;branch=poco-${PV} \ - file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \ - file://0001-Support-of-arch-riscv64-by-Manuel-A.-Fernandez-Monte.patch \ - file://run-ptest \ - " -SRCREV = "daf00da73ab917e4d4581e3aa00c0ee61e0cc58b" - -S = "${WORKDIR}/git" - -inherit cmake ptest - -# By default the most commonly used poco components are built -# Foundation is built anyway and doesn't need to be listed explicitly -# these don't have dependencies outside oe-core -PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto Data DataSQLite Zip Encodings Redis" - -PACKAGECONFIG[XML] = "-DENABLE_XML=ON -DEXPAT_LIBRARY:STRING=expat,-DENABLE_XML=OFF,expat" -PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF" -PACKAGECONFIG[MongoDB] = "-DENABLE_MONGODB=ON,-DENABLE_MONGODB=OFF" -PACKAGECONFIG[PDF] = "-DENABLE_PDF=ON,-DENABLE_PDF=OFF,zlib" -PACKAGECONFIG[Util] = "-DENABLE_UTIL=ON,-DENABLE_UTIL=OFF" -PACKAGECONFIG[Net] = "-DENABLE_NET=ON,-DENABLE_NET=OFF" -PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_NETSSL=OFF,openssl" -PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_CRYPTO=OFF,openssl" -PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" -PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" -PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" -PACKAGECONFIG[Encodings] = "-DENABLE_ENCODINGS=ON,-DENABLE_ENCODINGS=OFF" -PACKAGECONFIG[Redis] = "-DENABLE_REDIS=ON,-DENABLE_REDIS=OFF" - -# Additional components not build by default, -# they might have dependencies not included in oe-core -# or they don't work on all architectures -PACKAGECONFIG[mod_poco] = "-DENABLE_APACHECONNECTOR=ON,-DENABLE_APACHECONNECTOR=OFF,apr apache2" -PACKAGECONFIG[CppParser] = "-DENABLE_CPPPARSER=ON,-DENABLE_CPPPARSER=OFF" -PACKAGECONFIG[DataMySQL] = "-DENABLE_DATA_MYSQL=ON -DMYSQL_LIB:STRING=mysqlclient_r,-DENABLE_DATA_MYSQL=OFF,mariadb" -PACKAGECONFIG[DataODBC] = "-DENABLE_DATA_ODBC=ON,-DENABLE_DATA_ODBC=OFF,libiodbc" -PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OFF" -PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF" -PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF" - -EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ - -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \ - ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}" - -# For the native build we want to use the bundled version -EXTRA_OECMAKE_append_class-native = " -DPOCO_UNBUNDLED=OFF" - -# do not use rpath -EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON" - -python populate_packages_prepend () { - poco_libdir = d.expand('${libdir}') - pn = d.getVar("PN") - packages = [] - testrunners = [] - - def hook(f, pkg, file_regex, output_pattern, modulename): - packages.append(pkg) - testrunners.append(modulename) - - do_split_packages(d, poco_libdir, '^libPoco(.*)\.so\..*$', - 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) - - d.setVar("RRECOMMENDS_%s" % pn, " ".join(packages)) - d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) -} - -do_install_ptest () { - cp -rf ${B}/bin/ ${D}${PTEST_PATH} - cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} - cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ - find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; - echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners" -} - -PACKAGES_DYNAMIC = "poco-.*" - -# "poco" is a metapackage which pulls in all Poco components -ALLOW_EMPTY_${PN} = "1" - -# cppunit is only built if tests are enabled -PACKAGES =+ "${PN}-cppunit" -FILES_${PN}-cppunit += "${libdir}/libCppUnit.so*" -ALLOW_EMPTY_${PN}-cppunit = "1" - -RDEPENDS_${PN}-ptest += "${PN}-cppunit" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb new file mode 100644 index 000000000..c854481de --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb @@ -0,0 +1,100 @@ +SUMMARY = "Modern, powerful open source cross-platform C++ class libraries" +DESCRIPTION = "Modern, powerful open source C++ class libraries and frameworks for building network- and internet-based applications that run on desktop, server, mobile and embedded systems." +HOMEPAGE = "http://pocoproject.org/" +SECTION = "libs" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" + +# These dependencies are required by Foundation +DEPENDS = "libpcre zlib" + +SRC_URI = " \ + git://github.com/pocoproject/poco.git;branch=poco-${PV} \ + file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \ + file://0001-riscv-Enable-double-operations-when-using-double-flo.patch \ + file://run-ptest \ + " +SRCREV = "b95393dcc3640807838e8323b4e600e54d2e8116" + +S = "${WORKDIR}/git" + +inherit cmake ptest + +# By default the most commonly used poco components are built +# Foundation is built anyway and doesn't need to be listed explicitly +# these don't have dependencies outside oe-core +PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto Data DataSQLite Zip Encodings Redis" + +PACKAGECONFIG[XML] = "-DENABLE_XML=ON -DEXPAT_LIBRARY:STRING=expat,-DENABLE_XML=OFF,expat" +PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF" +PACKAGECONFIG[MongoDB] = "-DENABLE_MONGODB=ON,-DENABLE_MONGODB=OFF" +PACKAGECONFIG[PDF] = "-DENABLE_PDF=ON,-DENABLE_PDF=OFF,zlib" +PACKAGECONFIG[Util] = "-DENABLE_UTIL=ON,-DENABLE_UTIL=OFF" +PACKAGECONFIG[Net] = "-DENABLE_NET=ON,-DENABLE_NET=OFF" +PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_NETSSL=OFF,openssl" +PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_CRYPTO=OFF,openssl" +PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" +PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" +PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" +PACKAGECONFIG[Encodings] = "-DENABLE_ENCODINGS=ON,-DENABLE_ENCODINGS=OFF" +PACKAGECONFIG[Redis] = "-DENABLE_REDIS=ON,-DENABLE_REDIS=OFF" + +# Additional components not build by default, +# they might have dependencies not included in oe-core +# or they don't work on all architectures +PACKAGECONFIG[mod_poco] = "-DENABLE_APACHECONNECTOR=ON,-DENABLE_APACHECONNECTOR=OFF,apr apache2" +PACKAGECONFIG[CppParser] = "-DENABLE_CPPPARSER=ON,-DENABLE_CPPPARSER=OFF" +PACKAGECONFIG[DataMySQL] = "-DENABLE_DATA_MYSQL=ON -DMYSQL_LIB:STRING=mysqlclient_r,-DENABLE_DATA_MYSQL=OFF,mariadb" +PACKAGECONFIG[DataODBC] = "-DENABLE_DATA_ODBC=ON,-DENABLE_DATA_ODBC=OFF,libiodbc" +PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OFF" +PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF" +PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ + -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}" + +# For the native build we want to use the bundled version +EXTRA_OECMAKE_append_class-native = " -DPOCO_UNBUNDLED=OFF" + +# do not use rpath +EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON" + +python populate_packages_prepend () { + poco_libdir = d.expand('${libdir}') + pn = d.getVar("PN") + packages = [] + testrunners = [] + + def hook(f, pkg, file_regex, output_pattern, modulename): + packages.append(pkg) + testrunners.append(modulename) + + do_split_packages(d, poco_libdir, '^libPoco(.*)\.so\..*$', + 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) + + d.setVar("RRECOMMENDS_%s" % pn, " ".join(packages)) + d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) +} + +do_install_ptest () { + cp -rf ${B}/bin/ ${D}${PTEST_PATH} + cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} + cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ + find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; + echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners" +} + +PACKAGES_DYNAMIC = "poco-.*" + +# "poco" is a metapackage which pulls in all Poco components +ALLOW_EMPTY_${PN} = "1" + +# cppunit is only built if tests are enabled +PACKAGES =+ "${PN}-cppunit" +FILES_${PN}-cppunit += "${libdir}/libCppUnit.so*" +ALLOW_EMPTY_${PN}-cppunit = "1" + +RDEPENDS_${PN}-ptest += "${PN}-cppunit" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.0.bb deleted file mode 100644 index 338af1d87..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.0.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -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[md5sum] = "8ff9964d1fcc9c334a9c66f6f426ab9c" -SRC_URI[sha256sum] = "4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" -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" - -# 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_0.82.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.82.0.bb new file mode 100644 index 000000000..37f859353 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.82.0.bb @@ -0,0 +1,50 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +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[md5sum] = "4d6106c2382c5e66072e0b355acc3640" +SRC_URI[sha256sum] = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" +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" + +# 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/syslog-ng/files/syslog-ng-tmp.conf b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng-tmp.conf new file mode 100644 index 000000000..32a795321 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng-tmp.conf @@ -0,0 +1 @@ +d /var/run/syslog-ng 0755 root root diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd index 9e910caa1..965abf722 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd @@ -1,11 +1,16 @@ -@version: 3.15 +@version: 3.19 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) # Revised, and rewrited by me (SZALAY Attila ) +# +# Move to 3.19 +# Only change is to add dns_cache(no) to options to suppress initialization warning. +# +# Joe Slater # First, set some global options. -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); +options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no); owner("root"); group("adm"); perm(0640); stats_freq(0); bad_hostname("^gconfd$"); }; diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit index fb183ee17..2b39b8c1f 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit @@ -1,11 +1,16 @@ -@version: 3.15 +@version: 3.19 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) # Revised, and rewrited by me (SZALAY Attila ) +# +# Move to 3.19 +# Only change is to add dns_cache(no) to options to suppress initialization warning. +# +# Joe Slater # First, set some global options. -options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); +options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no); owner("root"); group("adm"); perm(0640); stats_freq(0); bad_hostname("^gconfd$"); }; 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 b00cb91ee..4c22d4b0f 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 @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=24c0c5cb2c83d9f2ab725481e4df5240" # util-linux added to get libuuid DEPENDS = "libpcre flex glib-2.0 openssl util-linux" +# We expect the recipe to add anything specific for that version to these defaults. +# SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ file://syslog-ng.conf.systemd \ file://syslog-ng.conf.sysvinit \ @@ -74,8 +76,12 @@ do_install_append() { install -d ${D}/${sysconfdir}/${BPN} install -d ${D}/${sysconfdir}/init.d install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog + install -d ${D}/${sysconfdir}/default/volatiles/ install -m 755 ${WORKDIR}/volatiles.03_syslog-ng ${D}/${sysconfdir}/default/volatiles/03_syslog-ng + install -d ${D}/${sysconfdir}/tmpfiles.d/ + install -m 755 ${WORKDIR}/syslog-ng-tmp.conf ${D}/${sysconfdir}/tmpfiles.d/syslog-ng.conf + install -d ${D}/${localstatedir}/lib/${BPN} # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb index 4eecf6b6a..852343c23 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb @@ -1,15 +1,13 @@ require syslog-ng.inc -SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ - file://syslog-ng.conf.systemd \ - file://syslog-ng.conf.sysvinit \ - file://initscript \ - file://volatiles.03_syslog-ng \ - file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \ +# We only want to add stuff we need to the defaults provided in syslog-ng.inc. +# +SRC_URI += " \ file://fix-config-libnet.patch \ file://fix-invalid-ownership.patch \ file://syslog-ng.service-the-syslog-ng-service.patch \ file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \ + file://syslog-ng-tmp.conf \ " SRC_URI[md5sum] = "aa79bc13d9fd925aa5fb9516e87aacd3" diff --git a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb new file mode 100644 index 000000000..89ab565ce --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Unicode Character Database" +HOMEPAGE = "https://unicode.org/ucd/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://unicode.org.license.html;beginline=42;endline=85;md5=67619d0c52706853c0256514e7fd04cd" + +SRC_URI = " \ + https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd \ + https://www.unicode.org/license.html;name=license;subdir=${BP};downloadfilename=unicode.org.license.html \ +" +SRC_URI[ucd.md5sum] = "430cbdac2615451571dd69a976dd08f6" +SRC_URI[ucd.sha256sum] = "25ba51a0d4c6fa41047b7a5e5733068d4a734588f055f61e85f450097834a0a6" + +SRC_URI[license.md5sum] = "f03bafb623258f85ff2032c1ce567b7c" +SRC_URI[license.sha256sum] = "983225207de8a707d0903a8d70fb7a4b28c5e0f64f2366e84a6192a2d618fed4" + +inherit allarch + +do_configure[noexec] = "1" + +do_install() { + install -d ${D}${datadir}/unicode + cp -rf ${WORKDIR}/ucd ${D}${datadir}/unicode +} + +FILES_${PN} = "${datadir}/unicode/ucd" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2.inc b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2.inc new file mode 100644 index 000000000..42629c261 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "HTTP/2 State-Machine based protocol implementation" +HOMEPAGE = "https://github.com/python-hyper/hyper-h2" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=b6b2f6bbe76528af543242d606c14851" + +SRC_URI[md5sum] = "950b5a62a2a608dc4547a01edf99aa8f" +SRC_URI[sha256sum] = "b8a32bd282594424c0ac55845377eea13fa54fe4a8db012f3a198ed923dc3ab4" + +inherit pypi diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2_3.1.1.bb b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2_3.1.1.bb new file mode 100644 index 000000000..b84129742 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python-h2_3.1.1.bb @@ -0,0 +1,3 @@ +require python-h2.inc + +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_3.1.1.bb b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_3.1.1.bb new file mode 100644 index 000000000..7230a27e8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_3.1.1.bb @@ -0,0 +1,3 @@ +require python-h2.inc + +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack.inc b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack.inc new file mode 100644 index 000000000..eccfa8c56 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "Pure-Python HPACK header compression" +HOMEPAGE = "https://github.com/python-hyper/hpack" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=5bf1c68e73fbaec2b1687b7e71514393" + +SRC_URI[md5sum] = "556b0ae66180f54c2ce8029a0952088b" +SRC_URI[sha256sum] = "8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2" + +inherit pypi diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack_3.0.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack_3.0.0.bb new file mode 100644 index 000000000..faaeb8555 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python-hpack_3.0.0.bb @@ -0,0 +1,3 @@ +require python-hpack.inc + +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python3-hpack_3.0.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python3-hpack_3.0.0.bb new file mode 100644 index 000000000..e196c55b3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hpack/python3-hpack_3.0.0.bb @@ -0,0 +1,3 @@ +require python-hpack.inc + +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe.inc b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe.inc new file mode 100644 index 000000000..0066bf8e6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "HTTP/2 framing layer for Python" +HOMEPAGE = "https://github.com/python-hyper/hyperframe" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=5bf1c68e73fbaec2b1687b7e71514393" + +SRC_URI[md5sum] = "6919183242feb26d8bce3b4cba81defd" +SRC_URI[sha256sum] = "a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f" + +inherit pypi diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe_5.2.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe_5.2.0.bb new file mode 100644 index 000000000..4f0c9977a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python-hyperframe_5.2.0.bb @@ -0,0 +1,3 @@ +require python-hyperframe.inc + +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_5.2.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_5.2.0.bb new file mode 100644 index 000000000..f10fb6df1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-hyperframe/python3-hyperframe_5.2.0.bb @@ -0,0 +1,3 @@ +require python-hyperframe.inc + +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority.inc b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority.inc new file mode 100644 index 000000000..aa93819bc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "A pure-Python implementation of the HTTP/2 priority tree" +HOMEPAGE = "https://github.com/python-hyper/priority" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae57d8a09fc8b6b164d7357339619045" + +SRC_URI[md5sum] = "4f1ff52f7fa448e9d9cb46337ae86d1e" +SRC_URI[sha256sum] = "6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe" + +inherit pypi diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority_1.3.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority_1.3.0.bb new file mode 100644 index 000000000..cbe262576 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python-priority_1.3.0.bb @@ -0,0 +1,3 @@ +require python-priority.inc + +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-priority/python3-priority_1.3.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python3-priority_1.3.0.bb new file mode 100644 index 000000000..fe756b56b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python3-priority_1.3.0.bb @@ -0,0 +1,3 @@ +require python-priority.inc + +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 42f416346..bb05de1f5 100644 --- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -77,7 +77,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-pint python3-coverage python3-iso8601 python3-ndg-httpsclient python3-yappi python3-twofish \ python3-speaklater python3-smbus python3-djangorestframework python3-msgpack python3-jsonpointer \ python3-flask-script python3-cassandra-driver python3-cython python3-ujson python3-aws-iot-device-sdk-python \ - python3-pytest-runner python3-pyiface python3-flask-login python3-markupsafe python3-setuptools-scm \ + python3-pytest-runner python3-pyiface python3-docutils python3-flask-login python3-markupsafe python3-setuptools-scm \ python3-semver python3-sdnotify python3-flask-user python3-tornado python3-jsonpatch python3-pexpect \ python3-progress python3-jsonschema python3-xstatic python3-pyroute2 python3-idna python3-sqlalchemy \ python3-urllib3 python3-flask-mail python3-asn1crypto python3-pyinotify python3-intervals python3-pyperclip \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc index 1b5f7160f..84502affe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc @@ -1,10 +1,10 @@ DESCRIPTION = "DNS toolkit for Python" HOMEPAGE = "http://www.dnspython.org/" LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b9d855ee0d7bea17c8b0994d37985e1e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" -SRC_URI[md5sum] = "05d33ffb5d8f35ae0474bb952778a344" -SRC_URI[sha256sum] = "40f563e1f7a7b80dc5a4e76ad75c23da53d62f1e15e6e517293b04e1f84ead7c" +SRC_URI[md5sum] = "bc9ca3b3a82164667d5730ec6d5248a2" +SRC_URI[sha256sum] = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01" PYPI_PACKAGE_EXT = "zip" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.15.0.bb deleted file mode 100644 index 9dbcd0ffb..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.15.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-dnspython.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.16.0.bb new file mode 100644 index 000000000..9dbcd0ffb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.16.0.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-dnspython.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.14rc2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.14rc2.bb deleted file mode 100644 index 68436a1a5..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.14rc2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Text processing system for documentation" -HOMEPAGE = "http://docutils.sourceforge.net" -SECTION = "devel/python" -LICENSE = "PSF & BSD-2-Clause & GPLv3" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=35a23d42b615470583563132872c97d6" - -DEPENDS = "python" - -SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz" -SRC_URI[md5sum] = "2f4bee6451958252f7bec71f18b05be3" -SRC_URI[sha256sum] = "3caee0bcb2a49fdf24fcfa70849a60abb7a181aa68b030f7cb7494096181830c" - -S = "${WORKDIR}/docutils-${PV}" - -inherit distutils - -BBCLASSEXTEND = "native" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.15.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.15.2.bb new file mode 100644 index 000000000..d26e81908 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.15.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Text processing system for documentation" +HOMEPAGE = "http://docutils.sourceforge.net" +SECTION = "devel/python" +LICENSE = "PSF & BSD-2-Clause & GPLv3" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106" + +inherit pypi setuptools + +PYPI_PACKAGE = "docutils" + +SRC_URI[md5sum] = "e26a308d8000b0bed7416a633217c676" +SRC_URI[sha256sum] = "a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99" + +BBCLASSEXTEND = "native" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-engineio.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-engineio.inc index f24da1284..134713064 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-engineio.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-engineio.inc @@ -9,5 +9,5 @@ inherit pypi PYPI_PACKAGE = "python-engineio" -SRC_URI[md5sum] = "11a4f18f5b08a36d07d3c0ff85e7c047" -SRC_URI[sha256sum] = "2a4c874aea686e79f8ea9efc30748110df581df6d577d18bb5eaa1a8f2199d12" +SRC_URI[md5sum] = "bec3b06a112a7f09a0a9c92b627282fe" +SRC_URI[sha256sum] = "9c9a6035b4b5e5a225f426f846afa14cf627f7571d1ae02167cb703fefd134b7" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.10.0.bb new file mode 100644 index 000000000..7dd6ec0e0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.10.0.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-engineio.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.9.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.9.3.bb deleted file mode 100644 index 7dd6ec0e0..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-engineio_3.9.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-engineio.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc index 989d1e5f6..953094ba7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/gvalkov/python-evdev" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" -SRC_URI[md5sum] = "c7e855ae9f97f869a59e75b29f05ce74" -SRC_URI[sha256sum] = "57edafc469a414f58b51af1bfb9ee2babb9f626dd2df530d71c1176871850aa1" +SRC_URI[md5sum] = "53e440943dfa2514f95b3c448d6a36cb" +SRC_URI[sha256sum] = "b03f5e1be5b4a5327494a981b831d251a142b09e8778eda1a8b53eba91100166" do_compile_prepend() { rm -rf ${S}/evdev/ecodes.c diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb deleted file mode 100644 index 63541363e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-evdev.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_1.2.0.bb new file mode 100644 index 000000000..63541363e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_1.2.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-evdev.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-future.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-future.inc index 224756180..c0a2b39ba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-future.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-future.inc @@ -1,10 +1,10 @@ DESCRIPTION = "Clean single-source support for Python 3 and 2" HOMEPAGE = "https://python-future.org" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3f457538b297bd0ef86564b8ac216ad7" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a253924061f8ecc41ad7a2ba1560e8e7" -SRC_URI[md5sum] = "3e8e88a2bda48d54b1da7634d04760d7" -SRC_URI[sha256sum] = "e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb" +SRC_URI[md5sum] = "e4579c836b9c025872efe230f6270349" +SRC_URI[sha256sum] = "b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d" PYPI_PACKAGE_HASH = "99abde815842bc6e97d5a7806ad51236630da14ca2f3b1fce94c0bb94d3d" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.16.0.bb deleted file mode 100644 index d95e1ba77..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.16.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-future.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.18.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.18.2.bb new file mode 100644 index 000000000..d95e1ba77 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.18.2.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-future.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-intervals.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-intervals.inc index a915e09f9..4489aa59d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-intervals.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-intervals.inc @@ -9,7 +9,7 @@ PYPI_PACKAGE := "python-intervals" inherit pypi -SRC_URI[md5sum] = "a35dd44269fdb134bf19cfd80cb2c120" -SRC_URI[sha256sum] = "a8a15b7c2fadb8465310f44aa96e384828b35a29de38ac74738cd665924cb8ac" +SRC_URI[md5sum] = "8955317ff4e42590c90ba6247b1caaed" +SRC_URI[sha256sum] = "0d26746eaed0be78a61dd289bb7a10721b08770bb3e807614835f490d514f2a5" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.10.0.bb new file mode 100644 index 000000000..3c2a33bbc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.10.0.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-intervals.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.5.4.bb deleted file mode 100644 index 3c2a33bbc..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-intervals_1.5.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-intervals.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc index 359b18012..324d4cf10 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc @@ -4,8 +4,8 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[md5sum] = "fb554e9c8f9aa76e333a03d470a5cf52" -SRC_URI[sha256sum] = "b9c40e9750f3d77e6e4d441d8b0266cf555e7cdabdcff33c4fd06366ca761ef8" +SRC_URI[md5sum] = "05d66f2eb7ce2c2d702e86bac24bf9e4" +SRC_URI[sha256sum] = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.21.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.21.bb new file mode 100644 index 000000000..fa46d89b5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.21.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-isort.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.4.bb deleted file mode 100644 index fa46d89b5..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-isort.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc index a0e802ca7..b10f00bba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc @@ -5,10 +5,10 @@ DESCRIPTION = "python-javaobj is a python library that provides functions\ representation is a standard data interchange format in Java world." HOMEPAGE = "https://github.com/tcalmant/python-javaobj" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://javaobj.py;beginline=21;endline=33;md5=8b504419ce78f8133b21b4d4a89ef7e9" +LIC_FILES_CHKSUM = "file://setup.py;beginline=15;endline=27;md5=af9ce26ac2de1b7436eb08c9308b4a1e" -SRC_URI[md5sum] = "f669bb8099380e3dd84db3d542aa5b68" -SRC_URI[sha256sum] = "b8b0d310fd97e1c7914d7911ee9d3f4b3d84d2a674aa95a4b0da3d8f155fc1bb" +SRC_URI[md5sum] = "1c6189a0d9aef51d74bfc52cd2953991" +SRC_URI[sha256sum] = "a57469e4f0d0eeba7482ad9839595db6e99ca4ac6630a4c8064dda75a2182549" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb deleted file mode 100644 index ed34740e8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-javaobj-py3.inc -inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.3.0.bb new file mode 100644 index 000000000..ed34740e8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.3.0.bb @@ -0,0 +1,2 @@ +require python-javaobj-py3.inc +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc index b88afce0e..bbbd66ce6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc @@ -2,9 +2,11 @@ SUMMARY = "A fast and thorough lazy object proxy" HOMEPAGE = "https://python-lazy-object-proxy.readthedocs.io/" LICENSE = "BSD-2-Clause" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ec680df42d8ad56427a83308817658cc" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9c5c2c74370826468065c5702b8a1fcf" -SRC_URI[md5sum] = "e128152b76eb5b9ba759504936139fd0" -SRC_URI[sha256sum] = "eb91be369f945f10d3a49f5f9be8b3d0b93a4c2be8f8a5b83b0571b8123e0a7a" +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI[md5sum] = "5c64c06affcd2a7c6ddc848af4280cca" +SRC_URI[sha256sum] = "f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.3.1.bb deleted file mode 100644 index df4d60bff..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.3.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-lazy-object-proxy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.4.3.bb new file mode 100644 index 000000000..df4d60bff --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.4.3.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-lazy-object-proxy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-parse.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-parse.inc index fa55a93c5..ccd5a9377 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-parse.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-parse.inc @@ -1,10 +1,10 @@ SUMMARY = "Parse strings using a specification based on the Python format() syntax" HOMEPAGE = "https://github.com/r1chardj0n3s/parse" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://parse.py;beginline=1273;endline=1291;md5=5147afdd9b3615290ad8733f0137a1a1" +LIC_FILES_CHKSUM = "file://parse.py;beginline=1317;endline=1337;md5=fa03bae3f51a2db25e239e869c647437" -SRC_URI[md5sum] = "fa69ab2fe846f9b183411391f7c6897b" -SRC_URI[sha256sum] = "c3cdf6206f22aeebfa00e5b954fcfea13d1b2dc271c75806b6025b94fb490939" +SRC_URI[md5sum] = "8fc634769f1d841f14a52dd731ca447a" +SRC_URI[sha256sum] = "a5fca7000c6588d77bc65c28f3f21bfce03b5e44daa8f9f07c17fe364990d717" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.12.1.bb new file mode 100644 index 000000000..d31ccc72a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.12.1.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-parse.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.8.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.8.4.bb deleted file mode 100644 index d31ccc72a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.8.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-parse.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc index c25e5a080..c5ba99d4f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/mcmtroffaes/pathlib2" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=042856c23a3e903b33bf361ea1cbe29a" -SRC_URI[md5sum] = "96da6398b3ea944417b84ccb25b171aa" -SRC_URI[sha256sum] = "446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8" +SRC_URI[md5sum] = "f2bd0a363eb0f8fa0556f35c1d9e66fb" +SRC_URI[sha256sum] = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868" RDEPENDS_${PN} += "${PYTHON_PN}-six" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.4.bb deleted file mode 100644 index e4bf78913..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-pathlib2.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.5.bb new file mode 100644 index 000000000..e4bf78913 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.5.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-pathlib2.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-periphery.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-periphery.inc index 539c3579c..ea43e5fa7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-periphery.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-periphery.inc @@ -2,6 +2,6 @@ DESCRIPTION = "A pure Python 2/3 library for peripheral I/O (GPIO, LED, PWM, SPI HOMEPAGE = "http://pythonhosted.org/python-periphery/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=063846af82b555d48822cf43dc6db6af" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=19f978bd6c8afe3fa9e408b71330512f" -PYPI_PACKAGE = "python-periphery" \ No newline at end of file +PYPI_PACKAGE = "python-periphery" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_1.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_1.1.1.bb deleted file mode 100644 index 6ae7fed81..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_1.1.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit pypi setuptools -require python-periphery.inc - -SRC_URI[sha256sum] = "fe8f351934edce72cd919b4eb070878ebff551db5e21aea61e0f446101f0a79f" \ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_2.0.0.bb new file mode 100644 index 000000000..7069f3fdd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-periphery_2.0.0.bb @@ -0,0 +1,4 @@ +inherit pypi setuptools +require python-periphery.inc + +SRC_URI[sha256sum] = "2df05528a7668db4fb3faaff516b34ed99e9009ed9610a4efe3ea6c0ea8a3aab" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pint.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pint.inc index 2bc8e4ab6..0900d91d7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pint.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pint.inc @@ -9,7 +9,7 @@ PYPI_PACKAGE := "Pint" inherit pypi -SRC_URI[md5sum] = "e1f80f3f8fc4e61f68ad3912db26b3a8" -SRC_URI[sha256sum] = "afcf31443a478c32bbac4b00337ee9026a13d0e2ac83d30c79151462513bb0d4" +SRC_URI[md5sum] = "d0681cb7cfaca9fc68ce7edab0d08d88" +SRC_URI[sha256sum] = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.8.1.bb deleted file mode 100644 index 480f08872..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.8.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-pint.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.9.bb new file mode 100644 index 000000000..480f08872 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pint_0.9.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-pint.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc index 9f00615c4..d59ba2cc5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://github.com/verigak/progress/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=aef5566ac4fede9815eccf124c281317" -SRC_URI[md5sum] = "057981e2f09029288f5255b1ea3ab64d" -SRC_URI[sha256sum] = "5e2f9da88ed8236a76fffbee3ceefd259589cf42dfbc2cec2877102189fae58a" +SRC_URI[md5sum] = "408df0e3db0ad4b74f19f6beec814ae4" +SRC_URI[sha256sum] = "69ecedd1d1bbe71bf6313d88d1e6c4d2957b7f1d4f71312c211257f7dae64372" RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.4.bb deleted file mode 100644 index 80608627a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-progress.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.5.bb new file mode 100644 index 000000000..80608627a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.5.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-progress.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc index ef1b05639..91aa7bb19 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc @@ -2,8 +2,8 @@ SUMMARY = "Library for building powerful interactive command lines in Python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" -SRC_URI[md5sum] = "8db8b8e40e91bc6dce133d8d5727a717" -SRC_URI[sha256sum] = "ff58ce8bb82c11c43416dd3eec7701dcbe8c576e2d7649f1d2b9d21a2fd93808" +SRC_URI[md5sum] = "5016c523e603cd7119644fbc0f00ce53" +SRC_URI[sha256sum] = "f15af68f66e664eaa559d4ac8a928111eebd5feda0c11738b5998045224829db" PYPI_PACKAGE = "prompt_toolkit" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.10.bb new file mode 100644 index 000000000..527c905a8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.10.bb @@ -0,0 +1,6 @@ +inherit pypi setuptools +require python-prompt-toolkit.inc + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.4.bb deleted file mode 100644 index 527c905a8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_2.0.4.bb +++ /dev/null @@ -1,6 +0,0 @@ -inherit pypi setuptools -require python-prompt-toolkit.inc - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-subprocess \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc index 1722875ab..d1d53e125 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc @@ -3,5 +3,5 @@ HOMEPAGE = "https://github.com/wjakob/pybind11" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=beb87117af69fd10fbf9fb14c22a2e62" -SRC_URI[md5sum] = "5b9611041e4ea66b2b919239e3bacd65" -SRC_URI[sha256sum] = "87ff3ae777d9326349af5272974581270b2a0909b2392dc0cc57eb28ce23bcc3" +SRC_URI[md5sum] = "23fdca8191b16ce3e7f38fb9e4252b2d" +SRC_URI[sha256sum] = "72e6def53fb491f7f4e92692029d2e7bb5a0783314f20d80222735ff10a75758" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.3.bb deleted file mode 100644 index e56743002..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-pybind11.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.4.3.bb new file mode 100644 index 000000000..e56743002 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.4.3.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-pybind11.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc index c4969f966..113e811b1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc @@ -3,10 +3,10 @@ DESCRIPTION = "PyCryptodome is a self-contained Python package of low-level\ cryptographic primitives." HOMEPAGE = "http://www.pycryptodome.org" LICENSE = "PD & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=775fe77831c03bf82f35abc0e230d4c1" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba" -SRC_URI[md5sum] = "a2587b6381b0ef4eb960cea1e7507d04" -SRC_URI[sha256sum] = "c5dd29e9f1b733e74311bf95d0e544e91bd1d14bc0366e8f443562d8d9920b7d" +SRC_URI[md5sum] = "97ee98c95f350927bcc0e937976f17ee" +SRC_URI[sha256sum] = "dbeb08ad850056747aa7d5f33273b7ce0b9a77910604a1be7b7a6f2ef076213f" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb deleted file mode 100644 index c7701eb9f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pycryptodome.inc -inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.9.0.bb new file mode 100644 index 000000000..c7701eb9f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.9.0.bb @@ -0,0 +1,2 @@ +require python-pycryptodome.inc +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc index d2d41d51d..85d9588a8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc @@ -7,5 +7,5 @@ LIC_FILES_CHKSUM = "file://README.md;md5=500b884e9dcd5f677a53cbbee8ace939" inherit pypi -SRC_URI[md5sum] = "c71307d6c7096fdbde0813018dfa0092" -SRC_URI[sha256sum] = "d656ef7e07a8aa539ce0a4883a683341037b6fc1c329bf55b63bffbf2cce9582" +SRC_URI[md5sum] = "dc744289858001925c75d21e26f1260f" +SRC_URI[sha256sum] = "bff4654b113dac6c2231e486e11dcb23281ddc0742a5404467303fe7638829ef" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb deleted file mode 100644 index d26beb794..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-pyexpect.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.19.bb new file mode 100644 index 000000000..d26beb794 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.19.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-pyexpect.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc index 2365379aa..2a53574e2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc @@ -7,7 +7,7 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-pyserial \ " -SRC_URI[md5sum] = "ee4c23ca5c35d3091d550a63540811a3" -SRC_URI[sha256sum] = "b54d49d66a9d93c1ef9c72ca01264414cb2de177baac116c12d5cce0c380160c" +SRC_URI[md5sum] = "159673cfb56c72ceafc30fe91eedd847" +SRC_URI[sha256sum] = "cc180d1b30c85a2bbca62c15fef1b871db048cdcfa80959968356d97bd3ff08e" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb deleted file mode 100644 index d77e0f385..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit setuptools -require python-pyfirmata.inc - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.1.0.bb new file mode 100644 index 000000000..d77e0f385 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.1.0.bb @@ -0,0 +1,3 @@ +inherit setuptools +require python-pyfirmata.inc + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc index 3d36f9608..5592eaf3d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc @@ -21,3 +21,5 @@ FILES_${PN}-tests+= " \ ${PYTHON_SITEPACKAGES_DIR}/simplejson/tests \ ${PYTHON_SITEPACKAGES_DIR}/simplejson/tool.py* \ " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb deleted file mode 100644 index ce4dfdc74..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-dnspython.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb new file mode 100644 index 000000000..ce4dfdc74 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-dnspython.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-docutils_0.15.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-docutils_0.15.2.bb new file mode 100644 index 000000000..321f55572 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-docutils_0.15.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Text processing system for documentation" +HOMEPAGE = "http://docutils.sourceforge.net" +SECTION = "devel/python" +LICENSE = "PSF & BSD-2-Clause & GPLv3" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "docutils" + +SRC_URI[md5sum] = "e26a308d8000b0bed7416a633217c676" +SRC_URI[sha256sum] = "a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99" + +BBCLASSEXTEND = "native" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.10.0.bb new file mode 100644 index 000000000..028d1104a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.10.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-engineio.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.9.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.9.3.bb deleted file mode 100644 index 028d1104a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_3.9.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-engineio.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb deleted file mode 100644 index 3a92b6ec9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-evdev.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.2.0.bb new file mode 100644 index 000000000..3a92b6ec9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.2.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-evdev.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.16.0.bb deleted file mode 100644 index f059186bf..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.16.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-future.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.18.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.18.2.bb new file mode 100644 index 000000000..f059186bf --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-future_0.18.2.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-future.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb new file mode 100644 index 000000000..8cbe1090f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-intervals.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.5.4.bb deleted file mode 100644 index 8cbe1090f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.5.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-intervals.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb new file mode 100644 index 000000000..755b3e2f2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-isort.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb deleted file mode 100644 index 755b3e2f2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-isort.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb deleted file mode 100644 index 0ec23ba99..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-javaobj-py3.inc -inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.3.0.bb new file mode 100644 index 000000000..0ec23ba99 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.3.0.bb @@ -0,0 +1,2 @@ +require python-javaobj-py3.inc +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.3.1.bb deleted file mode 100644 index 150e12fd4..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.3.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-lazy-object-proxy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.4.3.bb new file mode 100644 index 000000000..150e12fd4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.4.3.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-lazy-object-proxy.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.12.1.bb new file mode 100644 index 000000000..b1242545c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.12.1.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-parse.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.8.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.8.4.bb deleted file mode 100644 index b1242545c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.8.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-parse.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.4.bb deleted file mode 100644 index 66f71e57a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-pathlib2.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.5.bb new file mode 100644 index 000000000..66f71e57a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.5.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-pathlib2.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_1.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_1.1.1.bb deleted file mode 100644 index ba9a95dbf..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_1.1.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit pypi setuptools3 -require python-periphery.inc - -SRC_URI[sha256sum] = "fe8f351934edce72cd919b4eb070878ebff551db5e21aea61e0f446101f0a79f" \ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.0.0.bb new file mode 100644 index 000000000..d0c8bed26 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.0.0.bb @@ -0,0 +1,4 @@ +inherit pypi setuptools3 +require python-periphery.inc + +SRC_URI[sha256sum] = "2df05528a7668db4fb3faaff516b34ed99e9009ed9610a4efe3ea6c0ea8a3aab" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch index d4372696f..35aee4214 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch @@ -1,4 +1,4 @@ -From 9f3073bf6a7c7c51bb49d25f65c8f75cc704a5ee Mon Sep 17 00:00:00 2001 +From 862a981ce462cd83a99e3db9faeeda1f8c64983f Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 18 Mar 2019 23:23:55 -0400 Subject: [PATCH] explicitly set compile options @@ -10,18 +10,19 @@ explicitly set build_ext options for oe-core's Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia + --- setup.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/setup.cfg b/setup.cfg -index 3ab2e127..e92615f3 100644 +index 1c6ebc84..1ccc3d69 100644 --- a/setup.cfg +++ b/setup.cfg -@@ -4,3 +4,15 @@ test=pytest - [flake8] - extend-ignore = E203, W503 - max-line-length = 88 +@@ -13,3 +13,15 @@ multi_line_output = 3 + + [tool:pytest] + addopts = -rs + +[build_ext] +disable-platform-guessing = 1 @@ -34,6 +35,3 @@ index 3ab2e127..e92615f3 100644 +disable-webp = 1 +disable-webpmux = 1 +disable-imagequant = 1 --- -2.20.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.1.bb deleted file mode 100644 index 1d9106648..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.1.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Python Imaging Library (Fork). Pillow is the friendly PIL fork by Alex \ -Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \ -Contributors." -HOMEPAGE = "https://pillow.readthedocs.io" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=55c0f320370091249c1755c0d2b48e89" - -SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=6.1.x \ - file://0001-support-cross-compiling.patch \ - file://0001-explicitly-set-compile-options.patch \ -" -SRCREV ?= "aaca672173413883fbcefd659f04d74fe44fb5d5" - - -inherit setuptools3 - -DEPENDS += " \ - zlib \ - jpeg \ - tiff \ - freetype \ - lcms \ - openjpeg \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-numbers \ -" - -CVE_PRODUCT = "pillow" - -S = "${WORKDIR}/git" - -RPROVIDES_${PN} += "python3-imaging" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.2.1.bb new file mode 100644 index 000000000..a383a3ff9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_6.2.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "Python Imaging Library (Fork). Pillow is the friendly PIL fork by Alex \ +Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \ +Contributors." +HOMEPAGE = "https://pillow.readthedocs.io" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=55c0f320370091249c1755c0d2b48e89" + +SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=6.2.x \ + file://0001-support-cross-compiling.patch \ + file://0001-explicitly-set-compile-options.patch \ +" +SRCREV ?= "6e0f07bbe38def22d36ee176b2efd9ea74b453a6" + + +inherit setuptools3 + +DEPENDS += " \ + zlib \ + jpeg \ + tiff \ + freetype \ + lcms \ + openjpeg \ +" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-numbers \ +" + +CVE_PRODUCT = "pillow" + +S = "${WORKDIR}/git" + +RPROVIDES_${PN} += "python3-imaging" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.8.1.bb deleted file mode 100644 index f793ac4ac..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.8.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-pint.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.9.bb new file mode 100644 index 000000000..f793ac4ac --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.9.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pint.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.4.bb deleted file mode 100644 index 45e264213..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-progress.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.5.bb new file mode 100644 index 000000000..45e264213 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.5.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-progress.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.10.bb new file mode 100644 index 000000000..0e99917c2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.10.bb @@ -0,0 +1,7 @@ +inherit pypi setuptools3 +require python-prompt-toolkit.inc + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-shell \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.4.bb deleted file mode 100644 index 0e99917c2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_2.0.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -inherit pypi setuptools3 -require python-prompt-toolkit.inc - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-shell \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.3.bb deleted file mode 100644 index 355e28460..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-pybind11.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.4.3.bb new file mode 100644 index 000000000..355e28460 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.4.3.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-pybind11.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb deleted file mode 100644 index 0c062dddf..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pycryptodome.inc -inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.9.0.bb new file mode 100644 index 000000000..0c062dddf --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.9.0.bb @@ -0,0 +1,2 @@ +require python-pycryptodome.inc +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb deleted file mode 100644 index bfd584041..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-pyexpect.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.19.bb new file mode 100644 index 000000000..bfd584041 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.19.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pyexpect.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb deleted file mode 100644 index 25af1b5c0..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit setuptools3 -require python-pyfirmata.inc - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb new file mode 100644 index 000000000..25af1b5c0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb @@ -0,0 +1,3 @@ +inherit setuptools3 +require python-pyfirmata.inc + -- cgit v1.2.3